Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[mjansen] 73003: [SDK] Fix our Delayload notify hook for MSVC x64

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu Oct 20 21:08:17 2016 New Revision: 73003 URL: http://svn.reactos.org/svn/reactos?rev=73003&view=rev Log: [SDK] Fix our Delayload notify hook for MSVC x64 Modified: trunk/reactos/sdk/lib/delayimp/delayimp.c Modified: trunk/reactos/sdk/lib/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/delayimp/delayimp.… ============================================================================== --- trunk/reactos/sdk/lib/delayimp/delayimp.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/delayimp/delayimp.c [iso-8859-1] Thu Oct 20 21:08:17 2016 @@ -28,8 +28,15 @@ extern PfnDliHook __pfnDliFailureHook2Default = NULL; /* Tell the linker to use the fallback symbols */ +#if defined (_M_IX86) #pragma comment(linker, "/alternatename:___pfnDliNotifyHook2=___pfnDliNotifyHook2Default") #pragma comment(linker, "/alternatename:___pfnDliFailureHook2=___pfnDliFailureHook2Default") +#elif defined (_M_IA64) || defined (_M_AMD64) +#pragma comment(linker, "/alternatename:__pfnDliNotifyHook2=__pfnDliNotifyHook2Default") +#pragma comment(linker, "/alternatename:__pfnDliFailureHook2=__pfnDliFailureHook2Default") +#else +#error Unsupported platform, please find the correct decoration for your arch! +#endif #endif

8 years, 2 months

[mjansen] 73002: [APPHELP_APITEST] This should not be here.

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu Oct 20 21:03:38 2016 New Revision: 73002 URL: http://svn.reactos.org/svn/reactos?rev=73002&view=rev Log: [APPHELP_APITEST] This should not be here. Modified: trunk/rostests/apitests/apphelp/data.c Modified: trunk/rostests/apitests/apphelp/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?r… ============================================================================== --- trunk/rostests/apitests/apphelp/data.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/data.c [iso-8859-1] Thu Oct 20 21:03:38 2016 @@ -65,9 +65,7 @@ 0, /* SizeOfUninitializedData */ 0x1000, /* AddressOfEntryPoint */ 0x1000, /* BaseOfCode */ -#ifndef _WIN64 0, /* BaseOfData */ -#endif 0x400000, /* ImageBase */ 0x1000, /* SectionAlignment */ 0x200, /* FileAlignment */

8 years, 2 months

[hbelusca] 73001: [KS]: Fix annotations, etc.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Oct 20 20:44:02 2016 New Revision: 73001 URL: http://svn.reactos.org/svn/reactos?rev=73001&view=rev Log: [KS]: Fix annotations, etc. Modified: trunk/reactos/sdk/include/psdk/ks.h Modified: trunk/reactos/sdk/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ks.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] Thu Oct 20 20:44:02 2016 @@ -2803,13 +2803,12 @@ #ifndef _NTOS_ -__drv_maxIRQL(DISPATCH_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) KSDDKAPI PKSGATE NTAPI KsPinGetAndGate( - __in PKSPIN Pin -); + _In_ PKSPIN Pin); _IRQL_requires_max_(HIGH_LEVEL) static @@ -4762,30 +4761,27 @@ _In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp); -__drv_maxIRQL(DISPATCH_LEVEL) -KSDDKAPI -void +_IRQL_requires_max_(DISPATCH_LEVEL) +KSDDKAPI +VOID NTAPI KsPinAttemptProcessing( - __in PKSPIN Pin, - __in BOOLEAN Asynchronous - ); - -__drv_maxIRQL(PASSIVE_LEVEL) -KSDDKAPI -void + _In_ PKSPIN Pin, + _In_ BOOLEAN Asynchronous); + +_IRQL_requires_max_(PASSIVE_LEVEL) +KSDDKAPI +VOID NTAPI KsPinAcquireProcessingMutex( - __in PKSPIN Pin - ); - -__drv_maxIRQL(PASSIVE_LEVEL) -KSDDKAPI -void + _In_ PKSPIN Pin); + +_IRQL_requires_max_(PASSIVE_LEVEL) +KSDDKAPI +VOID NTAPI KsPinReleaseProcessingMutex( - __in PKSPIN Pin - ); + _In_ PKSPIN Pin); _IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI

8 years, 2 months

[janderwald] 73000: [PSDK] - add missing definition

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Oct 20 20:29:30 2016 New Revision: 73000 URL: http://svn.reactos.org/svn/reactos?rev=73000&view=rev Log: [PSDK] - add missing definition Modified: trunk/reactos/sdk/include/psdk/ks.h Modified: trunk/reactos/sdk/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ks.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] Thu Oct 20 20:29:30 2016 @@ -1499,6 +1499,14 @@ ULONG Revision; } KSCOMPONENTID, *PKSCOMPONENTID; +#define DEFINE_KSPROPERTY_ITEM_GENERAL_COMPONENTID(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_GENERAL_COMPONENTID,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(KSCOMPONENTID),\ + NULL, NULL, 0, NULL, NULL, 0) + /* =============================================================== Properties */ @@ -2795,6 +2803,14 @@ #ifndef _NTOS_ +__drv_maxIRQL(DISPATCH_LEVEL) +KSDDKAPI +PKSGATE +NTAPI +KsPinGetAndGate( + __in PKSPIN Pin +); + _IRQL_requires_max_(HIGH_LEVEL) static __inline @@ -4745,6 +4761,31 @@ KsDispatchSetSecurity( _In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp); + +__drv_maxIRQL(DISPATCH_LEVEL) +KSDDKAPI +void +NTAPI +KsPinAttemptProcessing( + __in PKSPIN Pin, + __in BOOLEAN Asynchronous + ); + +__drv_maxIRQL(PASSIVE_LEVEL) +KSDDKAPI +void +NTAPI +KsPinAcquireProcessingMutex( + __in PKSPIN Pin + ); + +__drv_maxIRQL(PASSIVE_LEVEL) +KSDDKAPI +void +NTAPI +KsPinReleaseProcessingMutex( + __in PKSPIN Pin + ); _IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI

8 years, 2 months

[janderwald] 72999: [KS] - implement support for KSPROPSETID_General

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Oct 20 20:02:43 2016 New Revision: 72999 URL: http://svn.reactos.org/svn/reactos?rev=72999&view=rev Log: [KS] - implement support for KSPROPSETID_General Modified: trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/pin.c trunk/reactos/drivers/ksfilter/ks/precomp.h trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Thu Oct 20 20:02:43 2016 @@ -45,6 +45,7 @@ const GUID IID_IKsFilter = {0x3ef6ee44L, 0x0D41, 0x11d2, {0xbe, 0xDA, 0x00, 0xc0, 0x4f, 0x8e, 0xF4, 0x57}}; const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_General = {0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; VOID IKsFilter_RemoveFilterFromFilterFactory( @@ -53,10 +54,11 @@ NTSTATUS NTAPI FilterTopologyPropertyHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI FilterPinPropertyHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - +NTSTATUS NTAPI FilterGeneralComponentIdHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); DEFINE_KSPROPERTY_TOPOLOGYSET(IKsFilterTopologySet, FilterTopologyPropertyHandler); DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(IKsFilterPinSet, FilterPinPropertyHandler, FilterPinPropertyHandler, FilterPinPropertyHandler); +DEFINE_KSPROPERTY_GENEREAL_COMPONENTID(IKsFilterGeneralSet, FilterGeneralComponentIdHandler); KSPROPERTY_SET FilterPropertySet[] = { @@ -71,6 +73,13 @@ &KSPROPSETID_Pin, sizeof(IKsFilterPinSet) / sizeof(KSPROPERTY_ITEM), (const KSPROPERTY_ITEM*)&IKsFilterPinSet, + 0, + NULL + }, + { + &KSPROPSETID_General, + sizeof(IKsFilterGeneralSet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&IKsFilterGeneralSet, 0, NULL } @@ -906,6 +915,39 @@ } +NTSTATUS +NTAPI +FilterGeneralComponentIdHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + PIO_STACK_LOCATION IoStack; + IKsFilterImpl * This; + + /* get filter implementation */ + This = (IKsFilterImpl*)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + /* sanity check */ + ASSERT(This); + + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(KSCOMPONENTID)); + + if (This->Filter.Descriptor->ComponentId != NULL) + { + RtlMoveMemory(Data, This->Filter.Descriptor->ComponentId, sizeof(KSCOMPONENTID)); + Irp->IoStatus.Information = sizeof(KSCOMPONENTID); + return STATUS_SUCCESS; + } + else + { + /* not valid */ + return STATUS_NOT_FOUND; + } + +} NTSTATUS NTAPI @@ -977,6 +1019,7 @@ UNICODE_STRING GuidString; PKSPROPERTY Property; ULONG SetCount = 0; + //PKSP_NODE NodeProperty; /* obtain filter from object header */ Status = IKsFilter_GetFilterFromIrp(Irp, &Filter); @@ -1024,8 +1067,20 @@ { const KSPROPERTY_SET *PropertySet = NULL; ULONG PropertyItemSize = 0; - +#if 0 /* check if the driver supports method sets */ + if (Property->Flags & KSPROPERTY_TYPE_TOPOLOGY) + { + NodeProperty = (PKSP_NODE)Property; + if (FilterInstance->Descriptor->NodeDescriptors[NodeProperty->NodeId].AutomationTable != NULL) + { + SetCount = FilterInstance->Descriptor->NodeDescriptors[NodeProperty->NodeId].AutomationTable->PropertySetsCount; + PropertySet = FilterInstance->Descriptor->NodeDescriptors[NodeProperty->NodeId].AutomationTable->PropertySets; + PropertyItemSize = 0; + } + + } else +#endif if (FilterInstance->Descriptor->AutomationTable->PropertySetsCount) { SetCount = FilterInstance->Descriptor->AutomationTable->PropertySetsCount; @@ -1267,7 +1322,7 @@ /* setup filter property sets */ AutomationTable.PropertyItemSize = sizeof(KSPROPERTY_ITEM); - AutomationTable.PropertySetsCount = 2; + AutomationTable.PropertySetsCount = 3; AutomationTable.PropertySets = FilterPropertySet; /* merge filter automation table */ Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Thu Oct 20 20:02:43 2016 @@ -1466,7 +1466,7 @@ { PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); - DPRINT("KsStreamPointerUnlock StreamPointer %pEject %lu\n", StreamPointer, Eject); + DPRINT1("KsStreamPointerUnlock StreamPointer %pEject %lu\n", StreamPointer, Eject); Pointer->Irp = NULL; } @@ -1483,7 +1483,7 @@ IN ULONG OutUsed, IN BOOLEAN Eject) { - DPRINT("KsStreamPointerAdvanceOffsets InUsed %lu OutUsed %lu Eject %lu\n", InUsed, OutUsed, Eject); + DPRINT1("KsStreamPointerAdvanceOffsets InUsed %lu OutUsed %lu Eject %lu\n", InUsed, OutUsed, Eject); DbgBreakPoint(); UNIMPLEMENTED } @@ -2636,8 +2636,8 @@ { /* failed to create pin, release resources */ IKsFilter_RemovePin(Filter->lpVtbl->GetStruct(Filter), &This->Pin); + KsFreeObjectBag((KSOBJECT_BAG)This->Pin.Bag); KsFreeObjectHeader((KSOBJECT_HEADER)This->ObjectHeader); - KsFreeObjectBag((KSOBJECT_BAG)This->Pin.Bag); FreeItem(This); /* return failure code */ Modified: trunk/reactos/drivers/ksfilter/ks/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/precom… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/precomp.h [iso-8859-1] Thu Oct 20 20:02:43 2016 @@ -33,6 +33,11 @@ DEFINE_KSPROPERTY_ITEM_PIN_CONSTRAINEDDATARANGES(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_PROPOSEDATAFORMAT(PropGeneral)\ } +#define DEFINE_KSPROPERTY_GENEREAL_COMPONENTID(PinSet,\ + PropGeneral)\ +DEFINE_KSPROPERTY_TABLE(PinSet) {\ +DEFINE_KSPROPERTY_ITEM_GENERAL_COMPONENTID(PropGeneral)\ +} #define DEFINE_KSPROPERTY_CONNECTIONSET(PinSet,\ PropStateHandler, PropDataFormatHandler, PropAllocatorFraming)\ Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Thu Oct 20 20:02:43 2016 @@ -30,6 +30,8 @@ OUT PKSPROPERTY_ITEM *PropertyItem) { ULONG Index, ItemIndex; + PULONG Flags; + PKSPROPERTY_DESCRIPTION Description; for(Index = 0; Index < PropertySetCount; Index++) { @@ -39,46 +41,16 @@ { for(ItemIndex = 0; ItemIndex < PropertySet[Index].PropertiesCount; ItemIndex++) { + + /* store property set */ + *Set = (PKSPROPERTY_SET)&PropertySet[Index]; + *PropertyItem = (PKSPROPERTY_ITEM)&PropertySet[Index].PropertyItem[ItemIndex]; + + if (PropertySet[Index].PropertyItem[ItemIndex].PropertyId == Property->Id) { - if (PropertySet[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) - { - /* too small input buffer */ - IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinProperty; - return STATUS_INVALID_PARAMETER; - } - - if (PropertySet[Index].PropertyItem[ItemIndex].MinData > OutputBufferLength) - { - /* too small output buffer */ - IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinData; - return STATUS_MORE_ENTRIES; - } - - /* store property set */ - *Set = (PKSPROPERTY_SET)&PropertySet[Index]; - *PropertyItem = (PKSPROPERTY_ITEM)&PropertySet[Index].PropertyItem[ItemIndex]; - - if (Property->Flags & KSPROPERTY_TYPE_SET) - { - /* store property handler */ - *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].SetPropertyHandler; - return STATUS_SUCCESS; - } - - if (Property->Flags & KSPROPERTY_TYPE_GET) - { - /* store property handler */ - *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].GetPropertyHandler; - return STATUS_SUCCESS; - } - - if (Property->Flags & KSPROPERTY_TYPE_BASICSUPPORT) { - PULONG Flags; - PKSPROPERTY_DESCRIPTION Description; - if (sizeof(ULONG) > OutputBufferLength) { /* too small buffer */ @@ -123,6 +95,37 @@ } return STATUS_SUCCESS; } + + if (PropertySet[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) + { + /* too small input buffer */ + IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinProperty; + return STATUS_INVALID_PARAMETER; + } + + if (PropertySet[Index].PropertyItem[ItemIndex].MinData > OutputBufferLength) + { + /* too small output buffer */ + IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinData; + return STATUS_MORE_ENTRIES; + } + + + if (Property->Flags & KSPROPERTY_TYPE_SET) + { + /* store property handler */ + *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].SetPropertyHandler; + return STATUS_SUCCESS; + } + + if (Property->Flags & KSPROPERTY_TYPE_GET) + { + /* store property handler */ + *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].GetPropertyHandler; + return STATUS_SUCCESS; + } + + } } }

8 years, 2 months

[hbelusca] 72998: [CMD]: Documentation improvement: we actually support two types of filename completions, windows-cmd like (the default one), and "bash-style" one (that is available through a comp...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Oct 20 16:51:07 2016 New Revision: 72998 URL: http://svn.reactos.org/svn/reactos?rev=72998&view=rev Log: [CMD]: Documentation improvement: we actually support two types of filename completions, windows-cmd like (the default one), and "bash-style" one (that is available through a compile switch). I prefer calling it "bash-style" over "unix-style" because this style of completion looks like the one from the GNU ReadLine library, that is used by Bash, which is not exclusive to unix per se... Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sq-AL.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/tr-TR.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/lang/zh-TW.rc trunk/reactos/base/shell/cmd/readme.txt Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/cs-CZ.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -69,7 +69,7 @@ STRING_CMD_HELP2 "\nFeatures available:" STRING_CMD_HELP3 " [aliases]" STRING_CMD_HELP4 " [history]" - STRING_CMD_HELP5 " [unix filename completion]" + STRING_CMD_HELP5 " [Bash filename completion]" STRING_CMD_HELP6 " [directory stack]" STRING_CMD_HELP7 " [redirections and piping]" STRING_CMD_HELP8 "Starts a new instance of the ReactOS command line interpreter.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -66,7 +66,7 @@ STRING_CMD_HELP2 "\nVerfÃ¼gbare Funktionen:" STRING_CMD_HELP3 " [Aliase]" STRING_CMD_HELP4 " [Verlauf]" - STRING_CMD_HELP5 " [Unix Dateinamen-VervollstÃ¤ndigung]" + STRING_CMD_HELP5 " [Bash Dateinamen-VervollstÃ¤ndigung]" STRING_CMD_HELP6 " [Verzeichnis-Stack]" STRING_CMD_HELP7 " [Weiterleitung und Piping]" STRING_CMD_HELP8 "Startet eine neue Instanz der ReactOS-Eingabeaufforderung.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -69,7 +69,7 @@ STRING_CMD_HELP2 "\nÎÎ¹Î±Î¸ÎÏÎ¹Î¼Î± ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬:" STRING_CMD_HELP3 " [aliases]" STRING_CMD_HELP4 " [Î¹ÏÏÎ¿ÏÎ¹ÎºÏ]" - STRING_CMD_HELP5 " [unix filename completion]" + STRING_CMD_HELP5 " [Bash filename completion]" STRING_CMD_HELP6 " [directory stack]" STRING_CMD_HELP7 " [redirections and piping]" STRING_CMD_HELP8 "Starts a new instance of the ReactOS command line interpreter.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -64,7 +64,7 @@ STRING_CMD_HELP2 "\nFeatures available:" STRING_CMD_HELP3 " [aliases]" STRING_CMD_HELP4 " [history]" - STRING_CMD_HELP5 " [unix filename completion]" + STRING_CMD_HELP5 " [Bash filename completion]" STRING_CMD_HELP6 " [directory stack]" STRING_CMD_HELP7 " [redirections and piping]" STRING_CMD_HELP8 "Starts a new instance of the ReactOS command line interpreter.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -66,7 +66,7 @@ STRING_CMD_HELP2 "\nCaracterÃsticas disponibles:" STRING_CMD_HELP3 " [alias]" STRING_CMD_HELP4 " [historia]" - STRING_CMD_HELP5 " [Completador de nombres de archivos unix]" + STRING_CMD_HELP5 " [Completador de nombres de archivos Bash]" STRING_CMD_HELP6 " [Pila de directorios]" STRING_CMD_HELP7 " [Redirecciones y tÃºneles]" STRING_CMD_HELP8 "Comienza una nueva sesion del interprete de comandos de ReactOS.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -68,7 +68,7 @@ STRING_CMD_HELP2 "\nFonctions disponibles :" STRING_CMD_HELP3 " [alias]" STRING_CMD_HELP4 " [historique]" - STRING_CMD_HELP5 " [complÃ©tion des noms de fichiers faÃ§on unix]" + STRING_CMD_HELP5 " [complÃ©tion des noms de fichiers faÃ§on Bash]" STRING_CMD_HELP6 " [pile de rÃ©pertoires]" STRING_CMD_HELP7 " [redirections et canaux]" STRING_CMD_HELP8 "DÃ©marre une nouvelle instance de l'interprÃ©teur de commandes de ReactOS.\n\n\ @@ -193,7 +193,7 @@ STRING_DIR_HELP3 " Le lecteur %c n'a pas de nom de volume\n" STRING_DIR_HELP4 " Le numÃ©ro de sÃ©rie du volume est %04X-%04X\n" STRING_DIR_HELP5 "\n Total de fichiers listÃ©s :\n%16i Fichier(s)% 14s octets\n" - STRING_DIR_HELP6 "%16i Rep(s)% 15s octets libres\n" + STRING_DIR_HELP6 "%16i RÃ©p(s)% 15s octets libres\n" STRING_DIR_HELP7 "\n RÃ©pertoire de %s\n\n" STRING_DIR_HELP8 "%16i Fichier(s)% 14s octets\n" STRING_DIRSTACK_HELP1 "Stocke le rÃ©pertoire courant pour utilisation avec la commande POPD,\n\ Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -64,7 +64,7 @@ STRING_CMD_HELP2 "\nElÃ©rhetÃµ lehetÃµsÃ©gek:" STRING_CMD_HELP3 " [aliasok]" STRING_CMD_HELP4 " [elÃµzmÃ©nyek]" - STRING_CMD_HELP5 " [unix tÃpusÃº Ã¡llomÃ¡nynÃ©v kiegÃ©szÃtÃ©s]" + STRING_CMD_HELP5 " [Bash tÃpusÃº Ã¡llomÃ¡nynÃ©v kiegÃ©szÃtÃ©s]" STRING_CMD_HELP6 " [mappa tÃ¡r]" STRING_CMD_HELP7 " [Ã¡tirÃ¡nyÃtÃ¡sok Ã©s csÃµvezetÃ©kek]" STRING_CMD_HELP8 "ElindÃt egy Ãºj ReactOS parancssor Ã©rtelmezÃµ.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -66,7 +66,7 @@ STRING_CMD_HELP2 "\nFitur yang tersedia:" STRING_CMD_HELP3 " [alias]" STRING_CMD_HELP4 " [histori]" - STRING_CMD_HELP5 " [pelengkapan nama file unix]" + STRING_CMD_HELP5 " [pelengkapan nama file Bash]" STRING_CMD_HELP6 " [tumpukan direktori]" STRING_CMD_HELP7 " [pengalihan dan piping]" STRING_CMD_HELP8 "Memulai instan baru dari interpreter baris perintah ReactOS.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -63,7 +63,7 @@ STRING_CMD_HELP2 "\nFunzioni disponibili:" STRING_CMD_HELP3 " [alias]" STRING_CMD_HELP4 " [storia]" - STRING_CMD_HELP5 " [completamento automatico dei nomi dei file]" + STRING_CMD_HELP5 " [completamento automatico dei nomi dei file Bash]" STRING_CMD_HELP6 " [cartelle]" STRING_CMD_HELP7 " [ridirezione e piping]" STRING_CMD_HELP8 "Attiva un altro interprete dei comandi ReactOS.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -64,7 +64,7 @@ STRING_CMD_HELP2 "\nå©ç¨ã§ããæ©è½:" STRING_CMD_HELP3 " [ã¨ã¤ãªã¢ã¹]" STRING_CMD_HELP4 " [ãã¹ããª]" - STRING_CMD_HELP5 " [UNIX ãã¡ã¤ã«åè£å®]" + STRING_CMD_HELP5 " [Bash ãã¡ã¤ã«åè£å®]" STRING_CMD_HELP6 " [ãã£ã¬ã¯ããª ã¹ã¿ãã¯]" STRING_CMD_HELP7 " [ãªãã¤ã¬ã¯ãã¨ãã¤ã]" STRING_CMD_HELP8 "ReactOS ã³ãã³ã ã©ã¤ã³ ã¤ã³ã¿ã¼ããªã¿ã®æ°ããã¤ã³ã¹ã¿ã³ã¹ãéå§ãã¾ãã\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -64,7 +64,7 @@ STRING_CMD_HELP2 "\nFunksjoner tilgjengelig:" STRING_CMD_HELP3 " [aliaser]" STRING_CMD_HELP4 " [historikk]" - STRING_CMD_HELP5 " [unix filnavnfullfÃ¸ring]" + STRING_CMD_HELP5 " [Bash filnavnfullfÃ¸ring]" STRING_CMD_HELP6 " [mappeliste]" STRING_CMD_HELP7 " [omadressering og datakanaler]" STRING_CMD_HELP8 "Start et nytt eksempel av ReactOS kommandotolk.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -73,7 +73,7 @@ STRING_CMD_HELP2 "\nDostÄpne opcje:" STRING_CMD_HELP3 " [aliasy]" STRING_CMD_HELP4 " [historia]" - STRING_CMD_HELP5 " [dopeÅnianie nazw unixa]" + STRING_CMD_HELP5 " [dopeÅnianie nazw Bash]" STRING_CMD_HELP6 " [stos katalogu]" STRING_CMD_HELP7 " [przekierowania i potoki]" STRING_CMD_HELP8 "Uruchamia nowe okno konsoli ReactOS (interpreter linii poleceÅ).\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -70,7 +70,7 @@ STRING_CMD_HELP2 "\nFuncÈionalitÄÈile disponibile:" STRING_CMD_HELP3 " [alias]" STRING_CMD_HELP4 " [istoric]" - STRING_CMD_HELP5 " [completarea numelui de fiÈier unix]" + STRING_CMD_HELP5 " [completarea numelui de fiÈier Bash]" STRING_CMD_HELP6 " [stiva de directoare]" STRING_CMD_HELP7 " [redirecÈionÄri Èi conectÄri]" STRING_CMD_HELP8 "Deschide o nouÄ instanÈÄ a interpretorului de comenzi ReactOS.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -66,7 +66,7 @@ STRING_CMD_HELP2 "\nÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸:" STRING_CMD_HELP3 " [Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ]" STRING_CMD_HELP4 " [Ð¸ÑÑÐ¾ÑÐ¸Ñ]" - STRING_CMD_HELP5 " [Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐ½ ÑÐ°Ð¹Ð»Ð¾Ð² unix]" + STRING_CMD_HELP5 " [Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐ½ ÑÐ°Ð¹Ð»Ð¾Ð² Bash]" STRING_CMD_HELP6 " [ÑÑÐµÐº Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ð¹]" STRING_CMD_HELP7 " [Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¸ piping]" STRING_CMD_HELP8 "ÐÐ°Ð¿ÑÑÐº Ð½Ð¾Ð²Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ Ð¸Ð½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾ÑÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´ ReactOS.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -70,7 +70,7 @@ STRING_CMD_HELP2 "\nFeatures available:" STRING_CMD_HELP3 " [aliases]" STRING_CMD_HELP4 " [history]" - STRING_CMD_HELP5 " [unix filename completion]" + STRING_CMD_HELP5 " [Bash filename completion]" STRING_CMD_HELP6 " [directory stack]" STRING_CMD_HELP7 " [redirections and piping]" STRING_CMD_HELP8 "Starts a new instance of the ReactOS command line interpreter.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -68,7 +68,7 @@ STRING_CMD_HELP2 "\nTiparet nÃ« dispozicion:" STRING_CMD_HELP3 " [pseudonimet]" STRING_CMD_HELP4 " [historia]" - STRING_CMD_HELP5 " [PÃ«rfundimi i dokumentave tÃ« sistemit unix]" + STRING_CMD_HELP5 " [PÃ«rfundimi i dokumentave tÃ« sistemit Bash]" STRING_CMD_HELP6 " [raftet e skedave]" STRING_CMD_HELP7 " [drejtimi i ri dhe udherrefyesi]" STRING_CMD_HELP8 "Fillon njÃ« shembull tÃ« ri tÃ« pÃ«rkthyesit sÃ« Komandave tÃ« ReactOS.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -64,7 +64,7 @@ STRING_CMD_HELP2 "\nFunksjoner som Ã¤r tillgÃ¤ngliga:" STRING_CMD_HELP3 " [alias:er]" STRING_CMD_HELP4 " [historik]" - STRING_CMD_HELP5 " [unix filnamnsavslutning]" + STRING_CMD_HELP5 " [Bash filnamnsavslutning]" STRING_CMD_HELP6 " [mapplista]" STRING_CMD_HELP7 " [omadressering och datakanaler]" STRING_CMD_HELP8 "Start ett ny instans av ReactOS kommandotolk.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/tr-TR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -66,7 +66,7 @@ STRING_CMD_HELP2 "\nKullanÄ±labilir husÃ»siyetler:" STRING_CMD_HELP3 " [baÅka adlar]" STRING_CMD_HELP4 " [geÃ§miÅ]" - STRING_CMD_HELP5 " [Unix kÃ¼tÃ¼k adÄ± bÃ¼tÃ¼nlemesi]" + STRING_CMD_HELP5 " [Bash kÃ¼tÃ¼k adÄ± bÃ¼tÃ¼nlemesi]" STRING_CMD_HELP6 " [dizin yÄ±ÄÄ±nÄ±]" STRING_CMD_HELP7 " [yÃ¶nlendirmeler ve borulama]" STRING_CMD_HELP8 "ReactOS komut yatacÄ± yorumlayÄ±cÄ±sÄ±nÄ±n yeni bir Ã¶rneÄini baÅlatÄ±r.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -72,7 +72,7 @@ STRING_CMD_HELP2 "\nÐÐ¾ÑÑÑÐ¿Ð½i Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑi:" STRING_CMD_HELP3 " [Ð¿ÑÐµÐ²Ð´Ð¾Ð½iÐ¼Ð¸]" STRING_CMD_HELP4 " [iÑÑÐ¾ÑiÑ]" - STRING_CMD_HELP5 " [Ð·Ð°Ð²Ð°ÑÑÐµÐ½Ð½Ñ iÐ¼ÐµÐ½ ÑÐ°Ð¹Ð»iÐ² unix]" + STRING_CMD_HELP5 " [Ð·Ð°Ð²Ð°ÑÑÐµÐ½Ð½Ñ iÐ¼ÐµÐ½ ÑÐ°Ð¹Ð»iÐ² Bash]" STRING_CMD_HELP6 " [ÑÑÐµÐº Ð´Ð¸ÑÐµÐºÑÐ¾ÑiÐ¹]" STRING_CMD_HELP7 " [Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð½Ñ ÑÐ° piping]" STRING_CMD_HELP8 "ÐÐ°Ð¿ÑÑÐº Ð½Ð¾Ð²Ð¾Ñ ÐºÐ¾Ð¿iÑ iÐ½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾ÑÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´ ReactOS.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -64,7 +64,7 @@ STRING_CMD_HELP2 "\nå¯ç¨åè½ï¼" STRING_CMD_HELP3 " [å«å]" STRING_CMD_HELP4 " [åå²]" - STRING_CMD_HELP5 " [Unix æä»¶åèªå¨å®æ]" + STRING_CMD_HELP5 " [Bash æä»¶åèªå¨å®æ]" STRING_CMD_HELP6 " [ç®å½æ ]" STRING_CMD_HELP7 " [éå®ååç®¡é]" STRING_CMD_HELP8 "å¯å¨ä¸ä¸ªæ°ç ReactOS å½ä»¤è¡è§£éå¨çæ°å®ä¾ã\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-TW.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -64,7 +64,7 @@ STRING_CMD_HELP2 "\nå¯ç¨åè½ï¼" STRING_CMD_HELP3 " [å¥å]" STRING_CMD_HELP4 " [æ·å²]" - STRING_CMD_HELP5 " [Unix æªåèªåå®æ]" + STRING_CMD_HELP5 " [Bash æªåèªåå®æ]" STRING_CMD_HELP6 " [ç®éæ£§]" STRING_CMD_HELP7 " [éå®ååç®¡é]" STRING_CMD_HELP8 "ååä¸åæ°ç ReactOS å½ä»¤åç´è¯å¨çæ°ä¾é ã\n\n\ Modified: trunk/reactos/base/shell/cmd/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme.txt?… ============================================================================== --- trunk/reactos/base/shell/cmd/readme.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/readme.txt [iso-8859-1] Thu Oct 20 16:51:07 2016 @@ -22,7 +22,7 @@ - batch file processing. - input/output redirection and piping. - alias support. - - filename completion (use TAB), both unix and windows style. + - filename completion (use TAB), both Bash and Windows-CMD style. Credits

8 years, 2 months

[hbelusca] 72997: [KERNEL32]: Mark Get/SetEnvironmentVariableA/W as hotpatchable since it's needed for Clink 0.4.8 (<rant>btw, if GCC was able to set exported stdcall functions as hotpatchable at a...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 19 22:26:04 2016 New Revision: 72997 URL: http://svn.reactos.org/svn/reactos?rev=72997&view=rev Log: [KERNEL32]: Mark Get/SetEnvironmentVariableA/W as hotpatchable since it's needed for Clink 0.4.8 (<rant>btw, if GCC was able to set exported stdcall functions as hotpatchable at a global level, as MSVC does, those "DECLSPEC_HOTPATCH" hacks would not be necessary! </rant>) Modified: trunk/reactos/dll/win32/kernel32/client/environ.c Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Wed Oct 19 22:26:04 2016 @@ -24,6 +24,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetEnvironmentVariableA(IN LPCSTR lpName, IN LPSTR lpBuffer, IN DWORD nSize) @@ -158,6 +159,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetEnvironmentVariableW(IN LPCWSTR lpName, IN LPWSTR lpBuffer, IN DWORD nSize) @@ -212,6 +214,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetEnvironmentVariableA(IN LPCSTR lpName, IN LPCSTR lpValue) { @@ -252,6 +255,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetEnvironmentVariableW(IN LPCWSTR lpName, IN LPCWSTR lpValue) {

8 years, 2 months

[hbelusca] 72996: [MODE] - Localization of output based on a patch by Lee Schroeder, but where I haven't modified yet the output localization of errors. - Dynamically underline the headers of the d...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 19 17:04:29 2016 New Revision: 72996 URL: http://svn.reactos.org/svn/reactos?rev=72996&view=rev Log: [MODE] - Localization of output based on a patch by Lee Schroeder, but where I haven't modified yet the output localization of errors. - Dynamically underline the headers of the device status reports (by me). CORE-12178 Added: trunk/reactos/base/applications/cmdutils/mode/lang/ trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/mode/resource.h (with props) Modified: trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt trunk/reactos/base/applications/cmdutils/mode/mode.c trunk/reactos/base/applications/cmdutils/mode/mode.rc Modified: trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt [iso-8859-1] Wed Oct 19 17:04:29 2016 @@ -1,6 +1,9 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) add_executable(mode mode.c mode.rc) set_module_type(mode win32cui UNICODE) +target_link_libraries(mode conutils ${PSEH_LIB}) add_importlibs(mode user32 msvcrt kernel32) set_target_properties(mode PROPERTIES SUFFIX ".com") add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc [iso-8859-1] Wed Oct 19 17:04:29 2016 @@ -0,0 +1,67 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Configure System Devices.\n\n\ +Device Status: MODE [device] [/STATUS]\n\ +Serial port: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\ + [to=on|off] [xon=on|off] [odsr=on|off]\n\ + [octs=on|off] [dtr=on|off|hs]\n\ + [rts=on|off|hs|tg] [idsr=on|off]\n\ +Redirect printing: MODE LPTn[:]=COMm[:]\n\ +Select code page: MODE CON[:] CP SELECT=yyy\n\ +Code page status: MODE CON[:] CP [/STATUS]\n\ +Display mode: MODE CON[:] [COLS=c] [LINES=n]\n\ +Typematic rate: MODE CON[:] [RATE=r DELAY=d]\n" + + IDS_QUERY_SERIAL_FOUND " Found serial device - %s\n" + IDS_QUERY_PRINTER_FOUND " Found printer device - %s\n" + IDS_QUERY_PARALLEL_FOUND " Found parallel device - %s\n" + IDS_QUERY_DOSDEV_FOUND " Found DOS device - %s\n" + // IDS_QUERY_MISC_FOUND " Found other device - %s\n" + + // IDS_QUERY_DEVICE_FOUND " Found %s device - %s\n" + // IDS_SERIAL "serial" + // IDS_PRINTER "parallel" + // IDS_OTHER "other" +END + +STRINGTABLE +BEGIN + IDS_DEVICE_STATUS_HEADER "Status for device %s:" + + IDS_COM_STATUS_BAUD " Baud: %ld\n" + IDS_COM_STATUS_PARITY " Parity: %s\n" + IDS_COM_STATUS_DATA_BITS " Data Bits: %d\n" + IDS_COM_STATUS_STOP_BITS " Stop Bits: %s\n" + IDS_COM_STATUS_TIMEOUT " Timeout: %s\n" + IDS_COM_STATUS_XON_XOFF " XON/XOFF: %s\n" + IDS_COM_STATUS_CTS_HANDSHAKING " CTS handshaking: %s\n" + IDS_COM_STATUS_DSR_HANDSHAKING " DSR handshaking: %s\n" + IDS_COM_STATUS_DSR_SENSITIVITY " DSR sensitivity: %s\n" + IDS_COM_STATUS_DTR_CIRCUIT " DTR circuit: %s\n" + IDS_COM_STATUS_RTS_CIRCUIT " RTS circuit: %s\n" + + IDS_CONSOLE_STATUS_LINES " Lines: %d\n" + IDS_CONSOLE_STATUS_COLS " Columns: %d\n" + IDS_CONSOLE_KBD_DELAY " Keyboard delay: %ld\n" + IDS_CONSOLE_KBD_RATE " Keyboard rate: %ld\n" + IDS_CONSOLE_CODEPAGE " Code page: %d\n" + + IDS_PRINTER_OUTPUT_NOT_REROUTED " Printer output is not being rerouted.\n" + IDS_PRINTER_OUTPUT_REROUTED_SERIAL " Printer output is being rerouted to serial port %s.\n" +END + +STRINGTABLE +BEGIN + IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n" + IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) returned unrecognised form %s.\n" + IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "ERROR: Invalid parameter - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Illegal device name - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device COM%d:\n" + IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device COM%d:\n" + IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n" + IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n" + IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n" +END Propchange: trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] Wed Oct 19 17:04:29 2016 @@ -35,35 +35,44 @@ #include <winuser.h> #include <wincon.h> +#include <conutils.h> + +#include "resource.h" + #define MAX_PORTNAME_LEN 20 #define MAX_COMPORT_NUM 10 #define ASSERT(a) -const WCHAR* const usage_strings[] = -{ - L"Device Status: MODE [device] [/STATUS]", - L"Select code page: MODE CON[:] CP SELECT=yyy", - L"Code page status: MODE CON[:] CP [/STATUS]", - L"Display mode: MODE CON[:] [COLS=c] [LINES=n]", - L"Typematic rate: MODE CON[:] [RATE=r DELAY=d]", - L"Redirect printing: MODE LPTn[:]=COMm[:]", - L"Serial port: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n" \ - L" [to=on|off] [xon=on|off] [odsr=on|off]\n" \ - L" [octs=on|off] [dtr=on|off|hs]\n" \ - L" [rts=on|off|hs|tg] [idsr=on|off]", -}; - -void Usage(void) -{ - UINT i; - - wprintf(L"\nConfigures system devices.\n\n"); - for (i = 0; i < ARRAYSIZE(usage_strings); i++) - { - wprintf(L"%s\n", usage_strings[i]); - } - wprintf(L"\n"); +/*** For fixes, see also network/net/main.c ***/ +// VOID PrintPadding(...) +INT +__cdecl +UnderlinedResPrintf( + IN PCON_STREAM Stream, + IN UINT uID, + ...) +{ + INT Len; + va_list args; + +#define MAX_BUFFER_SIZE 4096 + INT i; + WCHAR szMsgBuffer[MAX_BUFFER_SIZE]; + + va_start(args, uID); + Len = ConResPrintfV(Stream, uID, args); + va_end(args); + + ConPuts(Stream, L"\n"); + for (i = 0; i < Len; i++) + szMsgBuffer[i] = L'-'; + szMsgBuffer[Len] = UNICODE_NULL; + + // FIXME: Use ConStreamWrite instead. + ConPuts(Stream, szMsgBuffer); + + return Len; } int QueryDevices(VOID) @@ -79,26 +88,30 @@ { if (wcsstr(ptr, L"COM")) { - wprintf(L" Found serial device - %s\n", ptr); + ConResPrintf(StdOut, IDS_QUERY_SERIAL_FOUND, ptr); } else if (wcsstr(ptr, L"PRN")) { - wprintf(L" Found printer device - %s\n", ptr); + ConResPrintf(StdOut, IDS_QUERY_PRINTER_FOUND, ptr); } else if (wcsstr(ptr, L"LPT")) { - wprintf(L" Found parallel device - %s\n", ptr); + ConResPrintf(StdOut, IDS_QUERY_PARALLEL_FOUND, ptr); + } + else if (wcsstr(ptr, L"AUX") || wcsstr(ptr, L"NUL")) + { + ConResPrintf(StdOut, IDS_QUERY_DOSDEV_FOUND, ptr); } else { - // wprintf(L" Found other device - %s\n", ptr); + // ConResPrintf(StdOut, IDS_QUERY_MISC_FOUND, ptr); } ptr += (wcslen(ptr) + 1); } } else { - wprintf(L" ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); + wprintf(L"ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); } return 1; } @@ -109,21 +122,21 @@ WCHAR szPortName[MAX_PORTNAME_LEN]; swprintf(szPortName, L"LPT%d", nPortNum); - wprintf(L"\nStatus for device LPT%d:\n", nPortNum); - wprintf(L"-----------------------\n"); + + ConPuts(StdOut, L"\n"); + UnderlinedResPrintf(StdOut, IDS_DEVICE_STATUS_HEADER, szPortName); + ConPuts(StdOut, L"\n"); + if (QueryDosDeviceW(szPortName, buffer, ARRAYSIZE(buffer))) { WCHAR* ptr = wcsrchr(buffer, L'\\'); if (ptr != NULL) { if (_wcsicmp(szPortName, ++ptr) == 0) - { - wprintf(L" Printer output is not being rerouted.\n"); - } + ConResPuts(StdOut, IDS_PRINTER_OUTPUT_NOT_REROUTED); else - { - wprintf(L" Printer output is being rerouted to serial port %s\n", ptr); - } + ConResPrintf(StdOut, IDS_PRINTER_OUTPUT_REROUTED_SERIAL, ptr); + return 0; } else @@ -133,8 +146,9 @@ } else { - wprintf(L" ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError()); - } + wprintf(L"ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError()); + } + return 1; } @@ -193,30 +207,34 @@ CONSOLE_SCREEN_BUFFER_INFO csbi; DWORD dwKbdDelay, dwKbdSpeed; - wprintf(L"\nStatus for device CON:\n"); - wprintf(L"-----------------------\n"); + ConPuts(StdOut, L"\n"); + UnderlinedResPrintf(StdOut, IDS_DEVICE_STATUS_HEADER, L"CON"); + ConPuts(StdOut, L"\n"); + if (GetConsoleScreenBufferInfo(hConOut, &csbi)) { - wprintf(L" Lines: %d\n", csbi.dwSize.Y); - wprintf(L" Columns: %d\n", csbi.dwSize.X); + ConResPrintf(StdOut, IDS_CONSOLE_STATUS_LINES, csbi.dwSize.Y); + ConResPrintf(StdOut, IDS_CONSOLE_STATUS_COLS , csbi.dwSize.X); } if (SystemParametersInfoW(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) { - wprintf(L" Keyboard delay: %ld\n", dwKbdDelay); + ConResPrintf(StdOut, IDS_CONSOLE_KBD_DELAY, dwKbdDelay); } if (SystemParametersInfoW(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) { - wprintf(L" Keyboard rate: %ld\n", dwKbdSpeed); - } - wprintf(L" Code page: %d\n", GetConsoleOutputCP()); + ConResPrintf(StdOut, IDS_CONSOLE_KBD_RATE, dwKbdSpeed); + } + ConResPrintf(StdOut, IDS_CONSOLE_CODEPAGE, GetConsoleOutputCP()); return 0; } int ShowConsoleCPStatus(VOID) { - wprintf(L"\nStatus for device CON:\n"); - wprintf(L"-----------------------\n"); - wprintf(L" Code page: %d\n", GetConsoleOutputCP()); + ConPuts(StdOut, L"\n"); + UnderlinedResPrintf(StdOut, IDS_DEVICE_STATUS_HEADER, L"CON"); + ConPuts(StdOut, L"\n"); + + ConResPrintf(StdOut, IDS_CONSOLE_CODEPAGE, GetConsoleOutputCP()); return 0; } @@ -567,6 +585,7 @@ DCB dcb; COMMTIMEOUTS CommTimeouts; + WCHAR szPortName[MAX_PORTNAME_LEN]; if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) { @@ -582,21 +601,30 @@ wprintf(L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits); dcb.StopBits = 0; } - wprintf(L"\nStatus for device COM%d:\n", nPortNum); - wprintf(L"-----------------------\n"); - wprintf(L" Baud: %ld\n", dcb.BaudRate); - wprintf(L" Parity: %s\n", parity_strings[dcb.Parity]); - wprintf(L" Data Bits: %d\n", dcb.ByteSize); - wprintf(L" Stop Bits: %s\n", stopbit_strings[dcb.StopBits]); - wprintf(L" Timeout: %s\n", - (CommTimeouts.ReadTotalTimeoutConstant != 0) || - (CommTimeouts.WriteTotalTimeoutConstant != 0) ? L"ON" : L"OFF"); - wprintf(L" XON/XOFF: %s\n", dcb.fOutX ? L"ON" : L"OFF"); - wprintf(L" CTS handshaking: %s\n", dcb.fOutxCtsFlow ? L"ON" : L"OFF"); - wprintf(L" DSR handshaking: %s\n", dcb.fOutxDsrFlow ? L"ON" : L"OFF"); - wprintf(L" DSR sensitivity: %s\n", dcb.fDsrSensitivity ? L"ON" : L"OFF"); - wprintf(L" DTR circuit: %s\n", control_strings[dcb.fDtrControl]); - wprintf(L" RTS circuit: %s\n", control_strings[dcb.fRtsControl]); + + swprintf(szPortName, L"COM%d", nPortNum); + + ConPuts(StdOut, L"\n"); + UnderlinedResPrintf(StdOut, IDS_DEVICE_STATUS_HEADER, szPortName); + ConPuts(StdOut, L"\n"); + + ConResPrintf(StdOut, IDS_COM_STATUS_BAUD, dcb.BaudRate); + ConResPrintf(StdOut, IDS_COM_STATUS_PARITY, parity_strings[dcb.Parity]); + ConResPrintf(StdOut, IDS_COM_STATUS_DATA_BITS, dcb.ByteSize); + ConResPrintf(StdOut, IDS_COM_STATUS_STOP_BITS, stopbit_strings[dcb.StopBits]); + ConResPrintf(StdOut, IDS_COM_STATUS_TIMEOUT, + control_strings[(CommTimeouts.ReadTotalTimeoutConstant != 0) || + (CommTimeouts.WriteTotalTimeoutConstant != 0) ? 1 : 0]); + ConResPrintf(StdOut, IDS_COM_STATUS_XON_XOFF, + control_strings[dcb.fOutX ? 1 : 0]); + ConResPrintf(StdOut, IDS_COM_STATUS_CTS_HANDSHAKING, + control_strings[dcb.fOutxCtsFlow ? 1 : 0]); + ConResPrintf(StdOut, IDS_COM_STATUS_DSR_HANDSHAKING, + control_strings[dcb.fOutxDsrFlow ? 1 : 0]); + ConResPrintf(StdOut, IDS_COM_STATUS_DSR_SENSITIVITY, + control_strings[dcb.fDsrSensitivity ? 1 : 0]); + ConResPrintf(StdOut, IDS_COM_STATUS_DTR_CIRCUIT, control_strings[dcb.fDtrControl]); + ConResPrintf(StdOut, IDS_COM_STATUS_RTS_CIRCUIT, control_strings[dcb.fRtsControl]); return 0; } @@ -1079,6 +1107,9 @@ PCWSTR ArgStr, argStr; INT nPortNum; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); /* * MODE.COM has a very peculiar way of parsing its arguments, @@ -1130,7 +1161,7 @@ if (wcsstr(argStr, L"/?") || wcsstr(argStr, L"-?")) { - Usage(); + ConResPuts(StdOut, IDS_USAGE); goto Quit; } else if (_wcsnicmp(argStr, L"/STA", 4) == 0) Modified: trunk/reactos/base/applications/cmdutils/mode/mode.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.rc [iso-8859-1] Wed Oct 19 17:04:29 2016 @@ -1,5 +1,17 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Mode Utility" #define REACTOS_STR_INTERNAL_NAME "mode" #define REACTOS_STR_ORIGINAL_FILENAME "mode.com" #include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Added: trunk/reactos/base/applications/cmdutils/mode/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/mode/resource.h [iso-8859-1] Wed Oct 19 17:04:29 2016 @@ -0,0 +1,47 @@ +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDS_USAGE 0 + +#define IDS_QUERY_SERIAL_FOUND 1 +#define IDS_QUERY_PRINTER_FOUND 2 +#define IDS_QUERY_PARALLEL_FOUND 3 +// #define IDS_QUERY_MISC_FOUND 4 +#define IDS_QUERY_DOSDEV_FOUND 4 +// #define IDS_QUERY_DEVICE_FOUND 1 +// #define IDS_SERIAL 2 +// #define IDS_PRINTER 3 +// #define IDS_OTHER 4 + +#define IDS_DEVICE_STATUS_HEADER 5 +#define IDS_COM_STATUS_BAUD 6 +#define IDS_COM_STATUS_PARITY 7 +#define IDS_COM_STATUS_DATA_BITS 8 +#define IDS_COM_STATUS_STOP_BITS 9 +#define IDS_COM_STATUS_TIMEOUT 10 +#define IDS_COM_STATUS_XON_XOFF 11 +#define IDS_COM_STATUS_CTS_HANDSHAKING 12 +#define IDS_COM_STATUS_DSR_HANDSHAKING 13 +#define IDS_COM_STATUS_DSR_SENSITIVITY 14 +#define IDS_COM_STATUS_DTR_CIRCUIT 15 +#define IDS_COM_STATUS_RTS_CIRCUIT 16 +#define IDS_CONSOLE_STATUS_LINES 17 +#define IDS_CONSOLE_STATUS_COLS 18 +#define IDS_CONSOLE_KBD_DELAY 19 +#define IDS_CONSOLE_KBD_RATE 20 +#define IDS_CONSOLE_CODEPAGE 21 +#define IDS_PRINTER_OUTPUT_NOT_REROUTED 22 +#define IDS_PRINTER_OUTPUT_REROUTED_SERIAL 23 + +#define IDS_ERROR_QUERY_DEVICES 24 +#define IDS_ERROR_QUERY_DEVICES_FORM 25 +#define IDS_ERROR_SET_PARALLEL_STATE 26 +#define IDS_ERROR_INVALID_PARAMETER 27 +#define IDS_ERROR_ILLEGAL_DEVICE_NAME 28 +#define IDS_ERROR_STATUS_GET_DEVICE 29 +#define IDS_ERROR_STATUS_SET_DEVICE 30 +#define IDS_ERROR_INVALID_PARITY_BITS 31 +#define IDS_ERROR_INVALID_STOP_BITS 32 +#define IDS_ERROR_NO_MEMORY 33 + +#endif /* RESOURCE_H */ Propchange: trunk/reactos/base/applications/cmdutils/mode/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 2 months

[hbelusca] 72995: [MODE] - Rearrange ResizeTextConsole so that it correctly computes the Top & Bottom parts of the window size rectangle; - Fix its return type; - Display an error if we failed resi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 19 15:04:42 2016 New Revision: 72995 URL: http://svn.reactos.org/svn/reactos?rev=72995&view=rev Log: [MODE] - Rearrange ResizeTextConsole so that it correctly computes the Top & Bottom parts of the window size rectangle; - Fix its return type; - Display an error if we failed resizing the console; - Clear the screen before resizing the console, as the real MODE.COM does. - Fix a parsing error in SetConsoleStateOld and in SetConsoleCPState. Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] Wed Oct 19 15:04:42 2016 @@ -220,19 +220,38 @@ return 0; } +static VOID +ClearScreen( + IN HANDLE hConOut, + IN PCONSOLE_SCREEN_BUFFER_INFO pcsbi) +{ + COORD coPos; + DWORD dwWritten; + + coPos.X = 0; + coPos.Y = 0; + FillConsoleOutputAttribute(hConOut, pcsbi->wAttributes, + pcsbi->dwSize.X * pcsbi->dwSize.Y, + coPos, &dwWritten); + FillConsoleOutputCharacterW(hConOut, L' ', + pcsbi->dwSize.X * pcsbi->dwSize.Y, + coPos, &dwWritten); + SetConsoleCursorPosition(hConOut, coPos); +} + /* * See, or adjust if needed, subsystems/mvdm/ntvdm/console/video.c!ResizeTextConsole() * for more information. */ -static VOID +static BOOL ResizeTextConsole( - HANDLE hConOut, - PCONSOLE_SCREEN_BUFFER_INFO pcsbi, // FIXME - PCOORD Resolution) + IN HANDLE hConOut, + IN OUT PCONSOLE_SCREEN_BUFFER_INFO pcsbi, + IN COORD Resolution) { BOOL Success; + SHORT Width, Height; SMALL_RECT ConRect; - SHORT oldWidth, oldHeight; /* * Use this trick to effectively resize the console buffer and window, @@ -243,61 +262,65 @@ * than the current console screen buffer size. */ - - // /* Retrieve the latest console information */ - // GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleInfo); - - oldWidth = pcsbi->srWindow.Right - pcsbi->srWindow.Left + 1; - oldHeight = pcsbi->srWindow.Bottom - pcsbi->srWindow.Top + 1; - - /* - * If the current console window is too large to hold the full contents - * of the new screen buffer, resize it first. - */ - if (oldWidth > Resolution->X || oldHeight > Resolution->Y) - { - // - // NOTE: This is not a problem if we move the window back to (0,0) - // because when we resize the screen buffer, the window will move back - // to where the cursor is. Or, if the screen buffer is not resized, - // when we readjust again the window, we will move back to a correct - // position. This is what we wanted after all... - // - - ConRect.Left = ConRect.Top = 0; - ConRect.Right = ConRect.Left + min(oldWidth , Resolution->X) - 1; - ConRect.Bottom = ConRect.Top + min(oldHeight, Resolution->Y) - 1; - - Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); - if (!Success) wprintf(L"(resize) SetConsoleWindowInfo(1) failed with error %d\n", GetLastError()); - } - - /* Resize the screen buffer if needed */ - if (Resolution->X != pcsbi->dwSize.X || Resolution->Y != pcsbi->dwSize.Y) - { + /* Resize the screen buffer only if needed */ + if (Resolution.X != pcsbi->dwSize.X || Resolution.Y != pcsbi->dwSize.Y) + { + Width = pcsbi->srWindow.Right - pcsbi->srWindow.Left + 1; + Height = pcsbi->srWindow.Bottom - pcsbi->srWindow.Top + 1; + /* + * If the current console window is too large for + * the new screen buffer, resize it first. + */ + if (Width > Resolution.X || Height > Resolution.Y) + { + /* + * NOTE: This is not a problem if we move the window back to (0,0) + * because when we resize the screen buffer, the window will move back + * to where the cursor is. Or, if the screen buffer is not resized, + * when we readjust again the window, we will move back to a correct + * position. This is what we wanted after all... + */ + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + min(Width , Resolution.X) - 1; + ConRect.Bottom = ConRect.Top + min(Height, Resolution.Y) - 1; + + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + if (!Success) return FALSE; + } + + /* + * Now resize the screen buffer. + * * SetConsoleScreenBufferSize automatically takes into account the current * cursor position when it computes starting which row it should copy text - * when resizing the sceenbuffer, and scrolls the console window such that + * when resizing the screen buffer, and scrolls the console window such that * the cursor is placed in it again. We therefore do not need to care about * the cursor position and do the maths ourselves. */ - Success = SetConsoleScreenBufferSize(hConOut, *Resolution); - if (!Success) wprintf(L"(resize) SetConsoleScreenBufferSize failed with error %d\n", GetLastError()); + Success = SetConsoleScreenBufferSize(hConOut, Resolution); + if (!Success) return FALSE; /* * Setting a new screen buffer size can change other information, - * so update the saved console information. + * so update the console screen buffer information. */ GetConsoleScreenBufferInfo(hConOut, pcsbi); } + /* Always resize the console window within the permitted maximum size */ + Width = min(Resolution.X, pcsbi->dwMaximumWindowSize.X); + Height = min(Resolution.Y, pcsbi->dwMaximumWindowSize.Y); ConRect.Left = 0; - ConRect.Right = ConRect.Left + Resolution->X - 1; - ConRect.Bottom = max(pcsbi->dwCursorPosition.Y, Resolution->Y - 1); - ConRect.Top = ConRect.Bottom - Resolution->Y + 1; + ConRect.Right = ConRect.Left + Width - 1; + ConRect.Bottom = max(pcsbi->dwCursorPosition.Y, Height - 1); + ConRect.Top = ConRect.Bottom - Height + 1; SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + + /* Update the console screen buffer information */ + GetConsoleScreenBufferInfo(hConOut, pcsbi); + return TRUE; } int SetConsoleStateOld(IN PCWSTR ArgStr) @@ -335,16 +358,14 @@ Resolution.Y = (SHORT)value; /* This should be the end of the string */ - if (*argStr) argStr++; while (*argStr == L' ') argStr++; if (*argStr) goto invalid_parameter; Quit: - /* - * See, or adjust if needed, subsystems/mvdm/ntvdm/console/video.c!ResizeTextConsole() - * for more information. - */ - ResizeTextConsole(hConOut, &ConsoleScreenBufferInfo, &Resolution); + ClearScreen(hConOut, &csbi); + if (!ResizeTextConsole(hConOut, &csbi, Resolution)) + wprintf(L"The screen cannot be set to the number of lines and columns specified.\n"); + return 0; invalid_parameter: @@ -428,11 +449,9 @@ if (dispMode) { - /* - * See, or adjust if needed, subsystems/mvdm/ntvdm/console/video.c!ResizeTextConsole() - * for more information. - */ - ResizeTextConsole(hConOut, &ConsoleScreenBufferInfo, &Resolution); + ClearScreen(hConOut, &csbi); + if (!ResizeTextConsole(hConOut, &csbi, Resolution)) + wprintf(L"The screen cannot be set to the number of lines and columns specified.\n"); } else if (kbdMode) { @@ -443,7 +462,9 @@ * dwKbdDelay = (dwKbdDelay % 4); */ SystemParametersInfoW(SPI_SETKEYBOARDDELAY, dwKbdDelay, NULL, 0); + // "Invalid keyboard delay." SystemParametersInfoW(SPI_SETKEYBOARDSPEED, dwKbdSpeed, NULL, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + // "Invalid keyboard rate." } return 0; @@ -460,8 +481,13 @@ argStr = ParseNumber(argStr, &CodePage); if (!argStr) goto invalid_parameter; + /* This should be the end of the string */ + while (*argStr == L' ') argStr++; + if (*argStr) goto invalid_parameter; + SetConsoleCP(CodePage); SetConsoleOutputCP(CodePage); + // "The code page specified is not valid." ShowConsoleCPStatus(); } else @@ -819,9 +845,9 @@ /* Unsupported */ return FALSE; } + if (*argStr) argStr++; /* This should be the end of the string */ - if (*argStr) argStr++; while (*argStr == L' ') argStr++; if (*argStr) return FALSE;

8 years, 2 months

[hbelusca] 72994: [MODE]: Code style changes + remove unused parameter for ResizeTextConsole.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 19 15:00:32 2016 New Revision: 72994 URL: http://svn.reactos.org/svn/reactos?rev=72994&view=rev Log: [MODE]: Code style changes + remove unused parameter for ResizeTextConsole. Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] Wed Oct 19 15:00:32 2016 @@ -189,16 +189,16 @@ int ShowConsoleStatus(VOID) { - HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; + HANDLE hConOut = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO csbi; DWORD dwKbdDelay, dwKbdSpeed; wprintf(L"\nStatus for device CON:\n"); wprintf(L"-----------------------\n"); - if (GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) - { - wprintf(L" Lines: %d\n", ConsoleScreenBufferInfo.dwSize.Y); - wprintf(L" Columns: %d\n", ConsoleScreenBufferInfo.dwSize.X); + if (GetConsoleScreenBufferInfo(hConOut, &csbi)) + { + wprintf(L" Lines: %d\n", csbi.dwSize.Y); + wprintf(L" Columns: %d\n", csbi.dwSize.X); } if (SystemParametersInfoW(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) { @@ -226,10 +226,9 @@ */ static VOID ResizeTextConsole( - HANDLE hConsoleOutput, + HANDLE hConOut, PCONSOLE_SCREEN_BUFFER_INFO pcsbi, // FIXME - PCOORD Resolution, - PSMALL_RECT WindowSize OPTIONAL) + PCOORD Resolution) { BOOL Success; SMALL_RECT ConRect; @@ -269,7 +268,7 @@ ConRect.Right = ConRect.Left + min(oldWidth , Resolution->X) - 1; ConRect.Bottom = ConRect.Top + min(oldHeight, Resolution->Y) - 1; - Success = SetConsoleWindowInfo(hConsoleOutput, TRUE, &ConRect); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); if (!Success) wprintf(L"(resize) SetConsoleWindowInfo(1) failed with error %d\n", GetLastError()); } @@ -283,58 +282,46 @@ * the cursor is placed in it again. We therefore do not need to care about * the cursor position and do the maths ourselves. */ - Success = SetConsoleScreenBufferSize(hConsoleOutput, *Resolution); + Success = SetConsoleScreenBufferSize(hConOut, *Resolution); if (!Success) wprintf(L"(resize) SetConsoleScreenBufferSize failed with error %d\n", GetLastError()); /* * Setting a new screen buffer size can change other information, * so update the saved console information. */ - GetConsoleScreenBufferInfo(hConsoleOutput, pcsbi); - } - - if (!WindowSize) - { - ConRect.Left = 0; - ConRect.Right = ConRect.Left + Resolution->X - 1; - ConRect.Bottom = max(pcsbi->dwCursorPosition.Y, Resolution->Y - 1); - ConRect.Top = ConRect.Bottom - Resolution->Y + 1; - - // NOTE: We may take pcsbi->dwMaximumWindowSize into account - } - else - { - ConRect.Left = ConRect.Top = 0; - ConRect.Right = ConRect.Left + WindowSize->Right - WindowSize->Left; - ConRect.Bottom = ConRect.Top + WindowSize->Bottom - WindowSize->Top ; - } - - Success = SetConsoleWindowInfo(hConsoleOutput, TRUE, &ConRect); - if (!Success) wprintf(L"(resize) SetConsoleWindowInfo(2) failed with error %d\n", GetLastError()); + GetConsoleScreenBufferInfo(hConOut, pcsbi); + } + + ConRect.Left = 0; + ConRect.Right = ConRect.Left + Resolution->X - 1; + ConRect.Bottom = max(pcsbi->dwCursorPosition.Y, Resolution->Y - 1); + ConRect.Top = ConRect.Bottom - Resolution->Y + 1; + + SetConsoleWindowInfo(hConOut, TRUE, &ConRect); } int SetConsoleStateOld(IN PCWSTR ArgStr) { PCWSTR argStr = ArgStr; - HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; - COORD dwSize; + HANDLE hConOut = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO csbi; + COORD Resolution; DWORD value; - if (!GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) + if (!GetConsoleScreenBufferInfo(hConOut, &csbi)) { // TODO: Error message? return 0; } - dwSize = ConsoleScreenBufferInfo.dwSize; + Resolution = csbi.dwSize; /* Parse the column number (only MANDATORY argument) */ value = 0; argStr = ParseNumber(argStr, &value); if (!argStr) goto invalid_parameter; - dwSize.X = (SHORT)value; + Resolution.X = (SHORT)value; /* Parse the line number (OPTIONAL argument) */ while (*argStr == L' ') argStr++; @@ -345,7 +332,7 @@ value = 0; argStr = ParseNumber(argStr, &value); if (!argStr) goto invalid_parameter; - dwSize.Y = (SHORT)value; + Resolution.Y = (SHORT)value; /* This should be the end of the string */ if (*argStr) argStr++; @@ -357,8 +344,7 @@ * See, or adjust if needed, subsystems/mvdm/ntvdm/console/video.c!ResizeTextConsole() * for more information. */ - ResizeTextConsole(hConsoleOutput, &ConsoleScreenBufferInfo, - &dwSize, NULL); + ResizeTextConsole(hConOut, &ConsoleScreenBufferInfo, &Resolution); return 0; invalid_parameter: @@ -371,13 +357,13 @@ PCWSTR argStr = ArgStr; BOOL dispMode = FALSE, kbdMode = FALSE; - HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; - COORD dwSize; + HANDLE hConOut = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO csbi; + COORD Resolution; DWORD dwKbdDelay, dwKbdSpeed; DWORD value; - if (!GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) + if (!GetConsoleScreenBufferInfo(hConOut, &csbi)) { // TODO: Error message? return 0; @@ -393,7 +379,7 @@ return 0; } - dwSize = ConsoleScreenBufferInfo.dwSize; + Resolution = csbi.dwSize; while (argStr && *argStr) { @@ -407,7 +393,7 @@ value = 0; argStr = ParseNumber(argStr+5, &value); if (!argStr) goto invalid_parameter; - dwSize.X = (SHORT)value; + Resolution.X = (SHORT)value; } else if (!kbdMode && _wcsnicmp(argStr, L"LINES=", 6) == 0) { @@ -416,7 +402,7 @@ value = 0; argStr = ParseNumber(argStr+6, &value); if (!argStr) goto invalid_parameter; - dwSize.Y = (SHORT)value; + Resolution.Y = (SHORT)value; } else if (!dispMode && _wcsnicmp(argStr, L"RATE=", 5) == 0) { @@ -446,8 +432,7 @@ * See, or adjust if needed, subsystems/mvdm/ntvdm/console/video.c!ResizeTextConsole() * for more information. */ - ResizeTextConsole(hConsoleOutput, &ConsoleScreenBufferInfo, - &dwSize, NULL); + ResizeTextConsole(hConOut, &ConsoleScreenBufferInfo, &Resolution); } else if (kbdMode) {

8 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2016