Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[tfaber] 72963: [PSDK] - ksmedia.h requires ks.h to be included first. Based on a patch by Lee Schroeder. CORE-6783
by tfaber＠svn.reactos.org 13 Oct '16

13 Oct '16

Author: tfaber Date: Thu Oct 13 09:21:57 2016 New Revision: 72963 URL: http://svn.reactos.org/svn/reactos?rev=72963&view=rev Log: [PSDK] - ksmedia.h requires ks.h to be included first. Based on a patch by Lee Schroeder. CORE-6783 Modified: trunk/reactos/base/services/audiosrv/pnp.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c trunk/reactos/sdk/include/psdk/ksmedia.h trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h trunk/rostests/winetests/amstream/amstream.c trunk/rostests/winetests/dsound/ds3d8.c trunk/rostests/winetests/dsound/dsound.c trunk/rostests/winetests/dsound/dsound8.c Modified: trunk/reactos/base/services/audiosrv/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/pnp.c [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -12,6 +12,7 @@ #include <winuser.h> #include <mmsystem.h> #include <setupapi.h> +#include <ks.h> #include <ksmedia.h> static HDEVNOTIFY device_notification_handle = NULL; Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -14,6 +14,7 @@ #include <winuser.h> #include <mmddk.h> #include <mmebuddy.h> +#include <ks.h> #include <ksmedia.h> #include <interface.h> #include <devioctl.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -8,6 +8,7 @@ #include <math.h> #include <setupapi.h> #include <ndk/umtypes.h> +#include <ks.h> #include <ksmedia.h> #include "interface.h" Modified: trunk/reactos/sdk/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ksmedia.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -5,10 +5,12 @@ Please see COPYING in the top level directory for license information. */ +#ifndef _KS_ +#error ks.h needs to be included before ksmedia.h +#endif /* _KS_ */ + #ifndef KSMEDIA_H #define KSMEDIA_H - -#include <ks.h> /* KS CATEGORIES Modified: trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/sound/mmix… ============================================================================== --- trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -5,6 +5,7 @@ #include <windef.h> #define NOBITMAP #include <mmreg.h> +#include <ks.h> #include <ksmedia.h> #include <mmsystem.h> Modified: trunk/rostests/winetests/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/amstre… ============================================================================== --- trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -30,6 +30,7 @@ #include <vfwmsgs.h> #include <objbase.h> #include <mmreg.h> +#include <ks.h> #include <ksmedia.h> #include <initguid.h> #include <amstream.h> Modified: trunk/rostests/winetests/dsound/ds3d8.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/ds3d8.c?… ============================================================================== --- trunk/rostests/winetests/dsound/ds3d8.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dsound/ds3d8.c [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -35,7 +35,7 @@ #include <wingdi.h> #include <mmreg.h> #include <dsound.h> -//#include "ks.h" +#include <ks.h> #include <ksmedia.h> #include "dsound_test.h" Modified: trunk/rostests/winetests/dsound/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/dsound.c… ============================================================================== --- trunk/rostests/winetests/dsound/dsound.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dsound/dsound.c [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -38,7 +38,7 @@ #include <dsound.h> #include <dsconf.h> //#include "initguid.h" -//#include "ks.h" +#include <ks.h> #include <ksmedia.h> #include "dsound_test.h" Modified: trunk/rostests/winetests/dsound/dsound8.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/dsound8.… ============================================================================== --- trunk/rostests/winetests/dsound/dsound8.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dsound/dsound8.c [iso-8859-1] Thu Oct 13 09:21:57 2016 @@ -39,7 +39,7 @@ #include <mmreg.h> #include <dsound.h> #include <dsconf.h> -//#include "ks.h" +#include <ks.h> #include <ksmedia.h> #include <initguid.h> #include <mmdeviceapi.h>

1 0

[tfaber] 72962: [PSDK] - Add some KS definitions. Patch by Lee Schroeder CORE-6783
by tfaber＠svn.reactos.org 13 Oct '16

13 Oct '16

Author: tfaber Date: Thu Oct 13 08:53:11 2016 New Revision: 72962 URL: http://svn.reactos.org/svn/reactos?rev=72962&view=rev Log: [PSDK] - Add some KS definitions. Patch by Lee Schroeder CORE-6783 Modified: trunk/reactos/sdk/include/psdk/ks.h trunk/reactos/sdk/include/psdk/ksmedia.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 13 08:53:11 2016 @@ -114,6 +114,11 @@ 0xd833f8f8L, 0x7894, 0x11d1, {0xb0, 0x69, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02} DEFINE_GUIDSTRUCT("d833f8f8-7894-11d1-b069-00a0c9062802", KSMEMORY_TYPE_KERNEL_PAGED); #define KSMEMORY_TYPE_KERNEL_PAGED DEFINE_GUIDNAMED(KSMEMORY_TYPE_KERNEL_PAGED) + +#define STATIC_KSDATAFORMAT_SUBTYPE_NONE \ + 0xe436eb8eL, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70} +DEFINE_GUIDSTRUCT("e436eb8e-524f-11ce-9f53-0020af0ba770", KSDATAFORMAT_SUBTYPE_NONE); +#define KSDATAFORMAT_SUBTYPE_NONE DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_NONE) /* =============================================================== I/O Control Codes Modified: trunk/reactos/sdk/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ksmedia.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] Thu Oct 13 08:53:11 2016 @@ -235,6 +235,21 @@ #define STATIC_KSCATEGORY_DRM_DESCRAMBLE STATIC_KSNODETYPE_DRM_DESCRAMBLE #define KSCATEGORY_DRM_DESCRAMBLE KSNODETYPE_DRM_DESCRAMBLE +#define STATIC_KSDATAFORMAT_SPECIFIER_ANALOGVIDEO \ + 0x0482DDE0L, 0x7817, 0x11CF, {0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65} +DEFINE_GUIDSTRUCT("0482DDE0-7817-11CF-8A03-00AA006ECB65", KSDATAFORMAT_SPECIFIER_ANALOGVIDEO); +#define KSDATAFORMAT_SPECIFIER_ANALOGVIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_ANALOGVIDEO) + +#define STATIC_KSDATAFORMAT_TYPE_ANALOGVIDEO \ + 0x0482DDE1L, 0x7817, 0x11CF, {0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65} +DEFINE_GUIDSTRUCT("0482DDE1-7817-11CF-8A03-00AA006ECB65", KSDATAFORMAT_TYPE_ANALOGVIDEO); +#define KSDATAFORMAT_TYPE_ANALOGVIDEO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_ANALOGVIDEO) + +#define STATIC_PINNAME_VIDEO_ANALOGVIDEOIN \ + 0xFB6C4283L, 0x0353, 0x11D1, {0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA} +DEFINE_GUIDSTRUCT("FB6C4283-0353-11D1-905F-0000C0CC16BA", PINNAME_VIDEO_ANALOGVIDEOIN); +#define PINNAME_VIDEO_ANALOGVIDEOIN DEFINE_GUIDNAMED(PINNAME_VIDEO_ANALOGVIDEOIN) + /* Nodes */ @@ -551,6 +566,13 @@ //#endif +typedef enum { + KSPROPERTY_ALLOCATOR_CONTROL_HONOR_COUNT, + KSPROPERTY_ALLOCATOR_CONTROL_SURFACE_SIZE, + KSPROPERTY_ALLOCATOR_CONTROL_CAPTURE_CAPS, + KSPROPERTY_ALLOCATOR_CONTROL_CAPTURE_INTERLEAVE +} KSPROPERTY_ALLOCATOR_CONTROL; + typedef struct { KSDATARANGE DataRange; ULONG MaximumChannels; @@ -559,6 +581,276 @@ ULONG MinimumSampleFrequency; ULONG MaximumSampleFrequency; } KSDATARANGE_AUDIO, *PKSDATARANGE_AUDIO; + +typedef struct tagKS_AnalogVideoInfo { + RECT rcSource; + RECT rcTarget; + DWORD dwActiveWidth; + DWORD dwActiveHeight; + REFERENCE_TIME AvgTimePerFrame; +} KS_ANALOGVIDEOINFO, *PKS_ANALOGVIDEOINFO; + +typedef struct tagKS_DATARANGE_ANALOGVIDEO { + KSDATARANGE DataRange; + KS_ANALOGVIDEOINFO AnalogVideoInfo; +} KS_DATARANGE_ANALOGVIDEO, *PKS_DATARANGE_ANALOGVIDEO; + +typedef enum { + KS_TUNER_TUNING_EXACT = 1, + KS_TUNER_TUNING_FINE, + KS_TUNER_TUNING_COARSE, +} KS_TUNER_TUNING_FLAGS; + +typedef enum { + KS_TUNER_STRATEGY_PLL = 0x01, + KS_TUNER_STRATEGY_SIGNAL_STRENGTH = 0x02, + KS_TUNER_STRATEGY_DRIVER_TUNES = 0x04, +} KS_TUNER_STRATEGY; + +typedef struct { + KSPROPERTY Property; + ULONG ModesSupported; + KSPIN_MEDIUM VideoMedium; + KSPIN_MEDIUM TVAudioMedium; + KSPIN_MEDIUM RadioAudioMedium; +} KSPROPERTY_TUNER_CAPS_S, *PKSPROPERTY_TUNER_CAPS_S; + +typedef struct { + KSPROPERTY Property; + KSPIN_MEDIUM IFMedium; +} KSPROPERTY_TUNER_IF_MEDIUM_S, *PKSPROPERTY_TUNER_IF_MEDIUM_S; + +typedef struct { + KSPROPERTY Property; + ULONG Mode; +} KSPROPERTY_TUNER_MODE_S, *PKSPROPERTY_TUNER_MODE_S; + +typedef struct { + KSPROPERTY Property; + ULONG Frequency; + ULONG LastFrequency; + ULONG TuningFlags; + ULONG VideoSubChannel; + ULONG AudioSubChannel; + ULONG Channel; + ULONG Country; +} KSPROPERTY_TUNER_FREQUENCY_S, *PKSPROPERTY_TUNER_FREQUENCY_S; + +typedef struct { + KSPROPERTY Property; + ULONG Standard; +} KSPROPERTY_TUNER_STANDARD_S, *PKSPROPERTY_TUNER_STANDARD_S; + +typedef struct { + KSPROPERTY Property; + ULONG InputIndex; +} KSPROPERTY_TUNER_INPUT_S, *PKSPROPERTY_TUNER_INPUT_S; + +typedef struct { + KSPROPERTY Property; + ULONG CurrentFrequency; + ULONG PLLOffset; + ULONG SignalStrength; + ULONG Busy; +} KSPROPERTY_TUNER_STATUS_S, *PKSPROPERTY_TUNER_STATUS_S; + +typedef enum { + KSEVENT_TUNER_CHANGED, + KSEVENT_TUNER_INITIATE_SCAN +} KSEVENT_TUNER; + +typedef enum { + KS_AnalogVideo_None = 0x00000000, + KS_AnalogVideo_NTSC_M = 0x00000001, + KS_AnalogVideo_NTSC_M_J = 0x00000002, + KS_AnalogVideo_NTSC_433 = 0x00000004, + KS_AnalogVideo_PAL_B = 0x00000010, + KS_AnalogVideo_PAL_D = 0x00000020, + KS_AnalogVideo_PAL_G = 0x00000040, + KS_AnalogVideo_PAL_H = 0x00000080, + KS_AnalogVideo_PAL_I = 0x00000100, + KS_AnalogVideo_PAL_M = 0x00000200, + KS_AnalogVideo_PAL_N = 0x00000400, + KS_AnalogVideo_PAL_60 = 0x00000800, + KS_AnalogVideo_SECAM_B = 0x00001000, + KS_AnalogVideo_SECAM_D = 0x00002000, + KS_AnalogVideo_SECAM_G = 0x00004000, + KS_AnalogVideo_SECAM_H = 0x00008000, + KS_AnalogVideo_SECAM_K = 0x00010000, + KS_AnalogVideo_SECAM_K1 = 0x00020000, + KS_AnalogVideo_SECAM_L = 0x00040000, + KS_AnalogVideo_SECAM_L1 = 0x00080000, + KS_AnalogVideo_PAL_N_COMBO = 0x00100000 +} KS_AnalogVideoStandard; + +typedef struct { + KSPROPERTY Property; + ULONG Mode; + ULONG StandardsSupported; + ULONG MinFrequency; + ULONG MaxFrequency; + ULONG TuningGranularity; + ULONG NumberOfInputs; + ULONG SettlingTime; + ULONG Strategy; +} KSPROPERTY_TUNER_MODE_CAPS_S, *PKSPROPERTY_TUNER_MODE_CAPS_S; + +typedef struct tagKS_BITMAPINFOHEADER { + DWORD biSize; + LONG biWidth; + LONG biHeight; + WORD biPlanes; + WORD biBitCount; + DWORD biCompression; + DWORD biSizeImage; + LONG biXPelsPerMeter; + LONG biYPelsPerMeter; + DWORD biClrUsed; + DWORD biClrImportant; +} KS_BITMAPINFOHEADER, *PKS_BITMAPINFOHEADER; + +typedef struct _KS_VIDEO_STREAM_CONFIG_CAPS { + GUID guid; + ULONG VideoStandard; + SIZE InputSize; + SIZE MinCroppingSize; + SIZE MaxCroppingSize; + int CropGranularityX; + int CropGranularityY; + int CropAlignX; + int CropAlignY; + SIZE MinOutputSize; + SIZE MaxOutputSize; + int OutputGranularityX; + int OutputGranularityY; + int StretchTapsX; + int StretchTapsY; + int ShrinkTapsX; + int ShrinkTapsY; + LONGLONG MinFrameInterval; + LONGLONG MaxFrameInterval; + LONG MinBitsPerSecond; + LONG MaxBitsPerSecond; +} KS_VIDEO_STREAM_CONFIG_CAPS, *PKS_VIDEO_STREAM_CONFIG_CAPS; + +typedef struct tagKS_FRAME_INFO { + ULONG ExtendedHeaderSize; + DWORD dwFrameFlags; + LONGLONG PictureNumber; + LONGLONG DropCount; + HANDLE hDirectDraw; + HANDLE hSurfaceHandle; + RECT DirectDrawRect; + union { + LONG lSurfacePitch; + DWORD Reserved1; + }; + DWORD Reserved2; + union { + struct { + DWORD Reserved3; + DWORD Reserved4; + }; + ULONGLONG FrameCompletionNumber; + }; +} KS_FRAME_INFO, *PKS_FRAME_INFO; + +typedef struct tagKS_VIDEOINFOHEADER { + RECT rcSource; + RECT rcTarget; + DWORD dwBitRate; + DWORD dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + KS_BITMAPINFOHEADER bmiHeader; +} KS_VIDEOINFOHEADER, *PKS_VIDEOINFOHEADER; + +typedef struct tagKS_VIDEOINFOHEADER2 { + RECT rcSource; + RECT rcTarget; + DWORD dwBitRate; + DWORD dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + DWORD dwInterlaceFlags; + DWORD dwCopyProtectFlags; + DWORD dwPictAspectRatioX; + DWORD dwPictAspectRatioY; + union { + DWORD dwControlFlags; + DWORD dwReserved1; + }; + DWORD dwReserved2; + KS_BITMAPINFOHEADER bmiHeader; +} KS_VIDEOINFOHEADER2, *PKS_VIDEOINFOHEADER2; + +typedef struct tagKS_DATARANGE_VIDEO { + KSDATARANGE DataRange; + BOOL bFixedSizeSamples; + BOOL bTemporalCompression; + DWORD StreamDescriptionFlags; + DWORD MemoryAllocationFlags; + KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps; + KS_VIDEOINFOHEADER VideoInfoHeader; +} KS_DATARANGE_VIDEO, *PKS_DATARANGE_VIDEO; + +typedef struct tagKS_DATARANGE_VIDEO2 { + KSDATARANGE DataRange; + BOOL bFixedSizeSamples; + BOOL bTemporalCompression; + DWORD StreamDescriptionFlags; + DWORD MemoryAllocationFlags; + KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps; + KS_VIDEOINFOHEADER2 VideoInfoHeader; +} KS_DATARANGE_VIDEO2, *PKS_DATARANGE_VIDEO2; + +typedef struct tagKS_VBIINFOHEADER { + ULONG StartLine; + ULONG EndLine; + ULONG SamplingFrequency; + ULONG MinLineStartTime; + ULONG MaxLineStartTime; + ULONG ActualLineStartTime; + ULONG ActualLineEndTime; + ULONG VideoStandard; + ULONG SamplesPerLine; + ULONG StrideInBytes; + ULONG BufferSize; +} KS_VBIINFOHEADER, *PKS_VBIINFOHEADER; + +typedef struct tagKS_DATARANGE_VIDEO_VBI { + KSDATARANGE DataRange; + BOOL bFixedSizeSamples; + BOOL bTemporalCompression; + DWORD StreamDescriptionFlags; + DWORD MemoryAllocationFlags; + KS_VIDEO_STREAM_CONFIG_CAPS ConfigCaps; + KS_VBIINFOHEADER VBIInfoHeader; +} KS_DATARANGE_VIDEO_VBI, *PKS_DATARANGE_VIDEO_VBI; + +typedef struct tagKS_TVTUNER_CHANGE_INFO { + DWORD dwFlags; + DWORD dwCountryCode; + DWORD dwAnalogVideoStandard; + DWORD dwChannel; +} KS_TVTUNER_CHANGE_INFO, *PKS_TVTUNER_CHANGE_INFO; + +typedef struct { + KSPROPERTY Property; + ULONG IndexInputPin; + ULONG IndexOutputPin; + ULONG CanRoute; +} KSPROPERTY_CROSSBAR_ROUTE_S, *PKSPROPERTY_CROSSBAR_ROUTE_S; + +typedef struct tagKS_VBI_FRAME_INFO { + ULONG ExtendedHeaderSize; + DWORD dwFrameFlags; + LONGLONG PictureNumber; + LONGLONG DropCount; + DWORD dwSamplingFrequency; + KS_TVTUNER_CHANGE_INFO TvTunerChangeInfo; + KS_VBIINFOHEADER VBIInfoHeader; +} KS_VBI_FRAME_INFO, *PKS_VBI_FRAME_INFO; + +#define KS_SIZE_PREHEADER (FIELD_OFFSET(KS_VIDEOINFOHEADER,bmiHeader)) #if !defined( DEFINE_WAVEFORMATEX_GUID ) #define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}

1 0

[tfaber] 72961: [MSHTML_WINETEST] - Re-enable skipped htmldoc tests. ROSTESTS-113 #resolve
by tfaber＠svn.reactos.org 12 Oct '16

12 Oct '16

Author: tfaber Date: Wed Oct 12 21:10:04 2016 New Revision: 72961 URL: http://svn.reactos.org/svn/reactos?rev=72961&view=rev Log: [MSHTML_WINETEST] - Re-enable skipped htmldoc tests. ROSTESTS-113 #resolve Modified: trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Wed Oct 12 21:10:04 2016 @@ -8596,22 +8596,11 @@ test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); - if (winetest_interactive) - test_editing_mode(FALSE, FALSE); - else - skip("Skipping test_editing_mode(FALSE, FALSE). ROSTESTS-113.\n"); + test_editing_mode(FALSE, FALSE); test_editing_mode(TRUE, FALSE); test_editing_mode(TRUE, TRUE); - if (winetest_interactive) - { - test_HTMLDocument_http(FALSE); - test_HTMLDocument_http(TRUE); - } - else - { - skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n"); - skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n"); - } + test_HTMLDocument_http(FALSE); + test_HTMLDocument_http(TRUE); test_submit(); test_UIActivate(FALSE, FALSE, FALSE);

1 0

[tfaber] 72960: [REGDUMP] - Fix a buffer overflow. Patch by Víctor Martínez Calvo. ROSTESTS-203 #resolve
by tfaber＠svn.reactos.org 12 Oct '16

12 Oct '16

Author: tfaber Date: Wed Oct 12 12:41:31 2016 New Revision: 72960 URL: http://svn.reactos.org/svn/reactos?rev=72960&view=rev Log: [REGDUMP] - Fix a buffer overflow. Patch by Víctor Martínez Calvo. ROSTESTS-203 #resolve Modified: trunk/rostests/tests/regdump/regproc.c Modified: trunk/rostests/tests/regdump/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/regdump/regproc.c?r… ============================================================================== --- trunk/rostests/tests/regdump/regproc.c [iso-8859-1] (original) +++ trunk/rostests/tests/regdump/regproc.c [iso-8859-1] Wed Oct 12 12:41:31 2016 @@ -310,7 +310,7 @@ TCHAR xbuf[3]; TCHAR wc; memcpy(xbuf, s, 2); - xbuf[3] = _T('\0'); + xbuf[2] = _T('\0'); _stscanf(xbuf, _T("%02x"), (UINT*)&wc); if (byteCount < bufLen) *b++ = (unsigned char)wc;

1 0

[tfaber] 72959: [USER32] - Remove IsBadWritePtr hack. Patch by Katayama Hirofumi MZ. CORE-12136 #resolve
by tfaber＠svn.reactos.org 12 Oct '16

12 Oct '16

Author: tfaber Date: Wed Oct 12 12:07:44 2016 New Revision: 72959 URL: http://svn.reactos.org/svn/reactos?rev=72959&view=rev Log: [USER32] - Remove IsBadWritePtr hack. Patch by Katayama Hirofumi MZ. CORE-12136 #resolve Modified: trunk/reactos/win32ss/user/user32/misc/resources.c Modified: trunk/reactos/win32ss/user/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/resources.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/resources.c [iso-8859-1] Wed Oct 12 12:07:44 2016 @@ -12,12 +12,6 @@ typedef DWORD (WINAPI *CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); typedef DWORD (WINAPI *CMP_UNREGNOTIFY) (ULONG ); - -/* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which - does not seem to work properly for stack address space. */ -/* kill `left-hand operand of comma expression has no effect' warning */ -#define IsBadWritePtr(lp, n) ((DWORD)lp==n?0:0) - static HINSTANCE hSetupApi = NULL;

1 0

[hbelusca] 72958: [WINETESTS/SETUPAPI]: setupapi/tests: Determine path to system32 directory at runtime. Synced from Wine-Staging commit 92510a34ed9ec67fec4e580a5c73b8b53c216734 ROSTESTS-234 #comme...
by hbelusca＠svn.reactos.org 12 Oct '16

12 Oct '16

Author: hbelusca Date: Wed Oct 12 11:36:16 2016 New Revision: 72958 URL: http://svn.reactos.org/svn/reactos?rev=72958&view=rev Log: [WINETESTS/SETUPAPI]: setupapi/tests: Determine path to system32 directory at runtime. Synced from Wine-Staging commit 92510a34ed9ec67fec4e580a5c73b8b53c216734 ROSTESTS-234 #comment Updated in r72958. Modified: trunk/rostests/winetests/setupapi/dialog.c Modified: trunk/rostests/winetests/setupapi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/dialog… ============================================================================== --- trunk/rostests/winetests/setupapi/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/dialog.c [iso-8859-1] Wed Oct 12 11:36:16 2016 @@ -32,16 +32,13 @@ static void test_SetupPromptForDiskA(void) { -#ifdef __REACTOS__ - char path[] = "C:\\ReactOS\\system32"; -#else - #error "path must use GetSystemDirectoryA()! ROSTESTS_234" - char path[] = "C:\\windows\\system32"; -#endif char file[] = "kernel32.dll"; + char path[MAX_PATH]; char buffer[MAX_PATH]; UINT ret; DWORD length; + + GetSystemDirectoryA(path, MAX_PATH); memset(buffer, 0, sizeof(buffer)); ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, file, 0, IDF_CHECKFIRST, buffer, sizeof(buffer) - 1, &length); @@ -71,18 +68,15 @@ static void test_SetupPromptForDiskW(void) { -#ifdef __REACTOS__ - WCHAR path[] = {'C',':','\\','R','e','a','c','t','O','S','\\','s','y','s','t','e','m','3','2','\0'}; -#else - #error "path must use GetSystemDirectoryW()! ROSTESTS_234" - WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\0'}; -#endif WCHAR file[] = {'k','e','r','n','e','l','3','2','.','d','l','l','\0'}; WCHAR title[] = {'T','e','s','t','\0'}; WCHAR disk[] = {'T','e','s','t','d','i','s','k','\0'}; + WCHAR path[MAX_PATH]; WCHAR buffer[MAX_PATH]; UINT ret; DWORD length; + + GetSystemDirectoryW(path, MAX_PATH); memset(buffer, 0, sizeof(buffer)); ret = SetupPromptForDiskW(0, title, disk, path, file, 0, IDF_CHECKFIRST, buffer, MAX_PATH-1, &length);

1 0

[phater] 72957: [WS2_32_APITESTS] Add super simple WSARecv tests used to test WSAGetOverlappedResult. ROSTESTS-197
by phater＠svn.reactos.org 11 Oct '16

11 Oct '16

Author: phater Date: Tue Oct 11 10:48:47 2016 New Revision: 72957 URL: http://svn.reactos.org/svn/reactos?rev=72957&view=rev Log: [WS2_32_APITESTS] Add super simple WSARecv tests used to test WSAGetOverlappedResult. ROSTESTS-197 Added: trunk/rostests/apitests/ws2_32/WSARecv.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Tue Oct 11 10:48:47 2016 @@ -9,6 +9,7 @@ nostartup.c recv.c send.c + WSARecv.c WSAStartup.c testlist.c) Added: trunk/rostests/apitests/ws2_32/WSARecv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSARecv.c… ============================================================================== --- trunk/rostests/apitests/ws2_32/WSARecv.c (added) +++ trunk/rostests/apitests/ws2_32/WSARecv.c [iso-8859-1] Tue Oct 11 10:48:47 2016 @@ -0,0 +1,201 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for WSARecv + * PROGRAMMERS: Peter Hater + */ + +#include <apitest.h> + +#include <stdio.h> +#include <ntstatus.h> +#include <wine/winternl.h> +#include "ws2_32.h" + +#define RECV_BUF 4 +#define WSARecv_TIMEOUT 2000 + +static int count = 0; + +void +CALLBACK completion( + DWORD dwError, + DWORD cbTransferred, + LPWSAOVERLAPPED lpOverlapped, + DWORD dwFlags) +{ + //trace("completion called dwFlags %ld cbTransferred %ld lpOverlapped %p dwFlags %ld\n", dwError, cbTransferred, lpOverlapped, dwFlags); + count++; + ok(count == 1, "completion sould be called only once count = %d\n", count); + ok(dwError == 0, "dwError = %ld\n", dwError); + ok(cbTransferred == RECV_BUF, "cbTransferred %ld != %d\n", cbTransferred, RECV_BUF); + ok(lpOverlapped != NULL, "lpOverlapped %p\n", lpOverlapped); + if (lpOverlapped) + { + ok(lpOverlapped->hEvent != INVALID_HANDLE_VALUE, "lpOverlapped->hEvent %d\n", (int)lpOverlapped->hEvent); + if (lpOverlapped->hEvent != INVALID_HANDLE_VALUE) + WSASetEvent(lpOverlapped->hEvent); + } +} + +void Test_WSARecv() +{ + const char szDummyBytes[RECV_BUF] = { 0xFF, 0x00, 0xFF, 0x00 }; + + char szBuf[RECV_BUF]; + char szRecvBuf[RECV_BUF]; + int iResult, err; + SOCKET sck; + WSADATA wdata; + WSABUF buffers; + DWORD dwRecv, dwSent, dwFlags; + WSAOVERLAPPED overlapped; + char szGetRequest[] = "GET / HTTP/1.0\r\n\r\n"; + struct fd_set readable; + + /* Start up Winsock */ + iResult = WSAStartup(MAKEWORD(2, 2), &wdata); + ok(iResult == 0, "WSAStartup failed, iResult == %d\n", iResult); + + /* If we call recv without a socket, it should return with an error and do nothing. */ + memcpy(szBuf, szDummyBytes, RECV_BUF); + buffers.buf = szBuf; + buffers.len = sizeof(szBuf); + dwFlags = 0; + dwRecv = 0; + iResult = WSARecv(0, &buffers, 1, &dwRecv, &dwFlags, NULL, NULL); + ok(iResult == SOCKET_ERROR, "iRseult = %d\n", iResult); + ok(!memcmp(szBuf, szDummyBytes, RECV_BUF), "not equal\n"); + + /* Create the socket */ + sck = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + if(sck == INVALID_SOCKET) + { + WSACleanup(); + skip("CreateSocket failed. Aborting test.\n"); + return; + } + + /* Now we can pass at least a socket, but we have no connection yet. Should return with an error and do nothing. */ + memcpy(szBuf, szDummyBytes, RECV_BUF); + buffers.buf = szBuf; + buffers.len = sizeof(szBuf); + dwFlags = 0; + dwRecv = 0; + iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, NULL, NULL); + ok(iResult == SOCKET_ERROR, "iResult = %d\n", iResult); + ok(!memcmp(szBuf, szDummyBytes, RECV_BUF), "not equal\n"); + + /* Connect to "www.reactos.org" */ + if (!ConnectToReactOSWebsite(sck)) + { + WSACleanup(); + skip("ConnectToReactOSWebsite failed. Aborting test.\n"); + return; + } + + /* prepare overlapped */ + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = WSACreateEvent(); + + /* Send the GET request */ + buffers.buf = szGetRequest; + buffers.len = strlen(szGetRequest); + dwSent = 0; + iResult = WSASend(sck, &buffers, 1, &dwSent, 0, &overlapped, NULL); + err = WSAGetLastError(); + ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); + if (err == WSA_IO_PENDING) + { + iResult = WSAWaitForMultipleEvents(1, &overlapped.hEvent, TRUE, WSARecv_TIMEOUT, TRUE); + ok(iResult == WSA_WAIT_EVENT_0, "WSAWaitForMultipleEvents failed %d\n", iResult); + ok(WSAGetOverlappedResult(sck, &overlapped, &dwSent, TRUE, &dwFlags), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + } + ok(dwSent == strlen(szGetRequest), "dwSent %ld != %d\n", dwSent, strlen(szGetRequest)); +#if 0 /* break windows too */ + /* Shutdown the SEND connection */ + iResult = shutdown(sck, SD_SEND); + ok(iResult != SOCKET_ERROR, "iResult = %d\n", iResult); +#endif + /* Wait until we're ready to read */ + FD_ZERO(&readable); + FD_SET(sck, &readable); + + iResult = select(0, &readable, NULL, NULL, NULL); + ok(iResult != SOCKET_ERROR, "iResult = %d\n", iResult); + + /* Receive the data. */ + buffers.buf = szBuf; + buffers.len = sizeof(szBuf); + dwRecv = sizeof(szBuf); + iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, NULL, NULL); + ok(iResult != SOCKET_ERROR, "iResult = %d\n", iResult); + ok(dwRecv == sizeof(szBuf), "dwRecv %ld != %d\n", dwRecv, sizeof(szBuf)); + /* MSG_PEEK is invalid for overlapped (MSDN), but passes??? */ + buffers.buf = szRecvBuf; + buffers.len = sizeof(szRecvBuf); + dwFlags = MSG_PEEK; + dwRecv = sizeof(szRecvBuf); + ok(overlapped.hEvent != NULL, "WSACreateEvent failed %d\n", WSAGetLastError()); + iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, &overlapped, NULL); + err = WSAGetLastError(); + ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); + if (err == WSA_IO_PENDING) + { + iResult = WSAWaitForMultipleEvents(1, &overlapped.hEvent, TRUE, WSARecv_TIMEOUT, TRUE); + ok(iResult == WSA_WAIT_EVENT_0, "WSAWaitForMultipleEvents failed %d\n", iResult); + ok(WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + } + ok(dwRecv == sizeof(szRecvBuf), "dwRecv %ld != %d\n", dwRecv, sizeof(szRecvBuf)); + /* normal overlapped, no completion */ + buffers.buf = szBuf; + buffers.len = sizeof(szBuf); + dwFlags = 0; + dwRecv = sizeof(szBuf); + WSAResetEvent(overlapped.hEvent); + iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, &overlapped, NULL); + err = WSAGetLastError(); + ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); + if (err == WSA_IO_PENDING) + { + iResult = WSAWaitForMultipleEvents(1, &overlapped.hEvent, TRUE, WSARecv_TIMEOUT, TRUE); + ok(iResult == WSA_WAIT_EVENT_0, "WSAWaitForMultipleEvents failed %d\n", iResult); + ok(WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + } + ok(dwRecv == sizeof(szBuf), "dwRecv %ld != %d\n", dwRecv, sizeof(szBuf)); + ok(memcmp(szRecvBuf, szBuf, sizeof(szBuf)) == 0, "MSG_PEEK shouldn't have moved the pointer\n"); + /* overlapped with completion */ + dwFlags = 0; + dwRecv = sizeof(szBuf); + WSAResetEvent(overlapped.hEvent); + iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, &overlapped, &completion); + err = WSAGetLastError(); + ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); + if (err == WSA_IO_PENDING) + { + iResult = WSAWaitForMultipleEvents(1, &overlapped.hEvent, TRUE, WSARecv_TIMEOUT, TRUE); + ok(iResult == WSA_WAIT_EVENT_0, "WSAWaitForMultipleEvents failed %d\n", iResult); + ok(WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + } + ok(WSACloseEvent(overlapped.hEvent), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + ok(dwRecv == sizeof(szBuf), "dwRecv %ld != %d\n", dwRecv, sizeof(szBuf)); + /* no overlapped with completion */ + dwFlags = 0; + dwRecv = sizeof(szBuf); + /* call doesn't fail, but completion is not called */ + iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, NULL, &completion); + err = WSAGetLastError(); + ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); + ok(WSAGetLastError() == 0, "WSAGetLastError failed %d\n", WSAGetLastError()); + ok(dwRecv == sizeof(szBuf), "dwRecv %ld != %d and 0\n", dwRecv, sizeof(szBuf)); + + closesocket(sck); + WSACleanup(); + return; +} + +START_TEST(WSARecv) +{ + Test_WSARecv(); +} + Propchange: trunk/rostests/apitests/ws2_32/WSARecv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Tue Oct 11 10:48:47 2016 @@ -8,10 +8,11 @@ extern void func_getservbyname(void); extern void func_getservbyport(void); extern void func_ioctlsocket(void); +extern void func_nostartup(void); extern void func_recv(void); extern void func_send(void); +extern void func_WSARecv(void); extern void func_WSAStartup(void); -extern void func_nostartup(void); const struct test winetest_testlist[] = { @@ -23,6 +24,7 @@ { "nostartup", func_nostartup }, { "recv", func_recv }, { "send", func_send }, + { "WSARecv", func_WSARecv }, { "WSAStartup", func_WSAStartup }, { 0, 0 } };

1 0

[hbelusca] 72956: [CMD]: Fix the "TYPE" command so that it doesn't interpret the optional /P switch as a filename.
by hbelusca＠svn.reactos.org 10 Oct '16

10 Oct '16

Author: hbelusca Date: Mon Oct 10 19:17:03 2016 New Revision: 72956 URL: http://svn.reactos.org/svn/reactos?rev=72956&view=rev Log: [CMD]: Fix the "TYPE" command so that it doesn't interpret the optional /P switch as a filename. Modified: trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Mon Oct 10 19:17:03 2016 @@ -60,7 +60,7 @@ for (i = 0; i < argc; i++) { - if(*argv[i] == _T('/') && _tcslen(argv[i]) >= 2 && _totupper(argv[i][1]) == _T('P')) + if (argv[i][0] == _T('/') && _tcslen(argv[i]) == 2 && _totupper(argv[i][1]) == _T('P')) { bPaging = TRUE; } @@ -68,9 +68,13 @@ for (i = 0; i < argc; i++) { - if (_T('/') == argv[i][0] && _totupper(argv[i][1]) != _T('P')) + if (argv[i][0] == _T('/') && _totupper(argv[i][1]) != _T('P')) { ConErrResPrintf(STRING_TYPE_ERROR1, argv[i] + 1); + continue; + } + if (argv[i][0] == _T('/') && _tcslen(argv[i]) == 2 && _totupper(argv[i][1]) == _T('P')) + { continue; }

1 0

[hbelusca] 72955: [CMD] - Improve the screen pager so that it looks a bit more like MORE's one: display full screen pages, where only the last line contains the "press any key..." prompt, and erase...
by hbelusca＠svn.reactos.org 10 Oct '16

10 Oct '16

Author: hbelusca Date: Mon Oct 10 19:15:07 2016 New Revision: 72955 URL: http://svn.reactos.org/svn/reactos?rev=72955&view=rev Log: [CMD] - Improve the screen pager so that it looks a bit more like MORE's one: display full screen pages, where only the last line contains the "press any key..." prompt, and erase this prompt when a key is pressed and before displaying the other screen page. - GetScreenSize parameters are pointers (so use NULL instead of 0); - Use ARRAYSIZE instead of hardcoding buffer number of elements; - Simplify PrintInfoLine() (use read-only resource string buffer returned by LoadString instead of a temporary buffer, since we are just interested in the counted string). Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/prompt.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Mon Oct 10 19:15:07 2016 @@ -303,13 +303,13 @@ DWORD dwWritten; HANDLE hOutput = GetStdHandle(nStdHandle); - /* used to count number of lines since last pause */ + /* Used to count number of lines since last pause */ static int LineCount = 0; - /* used to see how big the screen is */ + /* Used to see how big the screen is */ int ScreenLines = 0; - /* chars since start of line */ + /* Chars since start of line */ int CharSL; int from = 0, i = 0; @@ -317,22 +317,26 @@ if (NewPage == TRUE) LineCount = 0; - /* rest LineCount and return if no string have been given */ + /* Reset LineCount and return if no string has been given */ if (szFormat == NULL) return 0; - /* Get the size of the visual screen that can be printed too */ + /* Get the size of the visual screen that can be printed to */ if (!IsConsoleHandle(hOutput) || !GetConsoleScreenBufferInfo(hOutput, &csbi)) { /* We assume it's a file handle */ ConPrintf(szFormat, arg_ptr, nStdHandle); return 0; } - /* Subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() */ - ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; + + /* + * Get the number of lines currently displayed on screen, minus 1 + * to account for the "press any key..." prompt from PagePrompt(). + */ + ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top); CharSL = csbi.dwCursorPosition.X; - /* Make sure they didn't make the screen to small */ + /* Make sure the user doesn't have the screen too small */ if (ScreenLines < 4) { ConPrintf(szFormat, arg_ptr, nStdHandle); @@ -355,10 +359,15 @@ WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); from = i; + /* Prompt the user */ if (PagePrompt() != PROMPT_YES) { return 1; } + + // TODO: Recalculate 'ScreenLines' in case the user redimensions + // the window during the prompt. + /* Reset the number of lines being printed */ LineCount = 0; } Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Mon Oct 10 19:15:07 2016 @@ -970,7 +970,7 @@ } /* Count the highest number of columns */ - GetScreenSize(&iScreenWidth, 0); + GetScreenSize(&iScreenWidth, NULL); iColumns = (USHORT)(iScreenWidth / iLongestName); /* Check if there is enough space for spaces between names */ Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Mon Oct 10 19:15:07 2016 @@ -290,7 +290,7 @@ hFile = FindFirstFile (path, &file); /* Count the highest number of columns */ - GetScreenSize(&screenwidth, 0); + GetScreenSize(&screenwidth, NULL); /* For counting columns of output */ count = 0; Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Mon Oct 10 19:15:07 2016 @@ -148,7 +148,7 @@ if (!bCtrlBreak) return FALSE; - LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, options, 4); + LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, options, ARRAYSIZE(options)); /* we need to be sure the string arrives on the screen! */ do @@ -536,6 +536,7 @@ INT PagePrompt(VOID) { + SHORT iScreenWidth, iCursorY; INPUT_RECORD ir; ConOutResPuts(STRING_MISC_HELP1); @@ -554,10 +555,24 @@ AddBreakHandler(); ConInEnable(); + /* + * Get the screen width, erase the full line where the cursor is, + * and move the cursor back to the beginning of the line. + */ + GetScreenSize(&iScreenWidth, NULL); + iCursorY = GetCursorY(); + SetCursorXY(0, iCursorY); + while (iScreenWidth-- > 0) // Or call FillConsoleOutputCharacter ? + ConOutChar(_T(' ')); + SetCursorXY(0, iCursorY); + if ((ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) || ((ir.Event.KeyEvent.wVirtualKeyCode == _T('C')) && (ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) { + /* We break, output a newline */ + ConOutChar(_T('\n')); + bCtrlBreak = TRUE; return PROMPT_BREAK; } Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Mon Oct 10 19:15:07 2016 @@ -78,14 +78,16 @@ COORD coPos; DWORD dwWritten; - TCHAR szInfoLine[80 + 1]; // The info line is 80 characters long (without NULL character) + PTSTR pszInfoLine = NULL; INT iInfoLineLen; /* Return directly if the output handle is not a console handle */ if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) return; - iInfoLineLen = LoadString(CMD_ModuleHandle, STRING_CMD_INFOLINE, szInfoLine, ARRAYSIZE(szInfoLine)); + iInfoLineLen = LoadString(CMD_ModuleHandle, STRING_CMD_INFOLINE, (PTSTR)&pszInfoLine, 0); + if (!pszInfoLine || iInfoLineLen == 0) + return; /* Display the localized information line */ coPos.X = 0; @@ -97,7 +99,7 @@ csbi.dwSize.X, coPos, &dwWritten); - WriteConsoleOutputCharacter(hOutput, szInfoLine, iInfoLineLen, + WriteConsoleOutputCharacter(hOutput, pszInfoLine, iInfoLineLen, coPos, &dwWritten); }

1 0

[hbelusca] 72954: [CMD] - Fix typo in STRING_MEMMORY_xxx symbols (memmory -> memory); - Remove the trailing newline for the STRING_MISC_HELP1 page prompt, as part of reworking it a bit (see next co...
by hbelusca＠svn.reactos.org 10 Oct '16

10 Oct '16

Author: hbelusca Date: Mon Oct 10 19:11:15 2016 New Revision: 72954 URL: http://svn.reactos.org/svn/reactos?rev=72954&view=rev Log: [CMD] - Fix typo in STRING_MEMMORY_xxx symbols (memmory -> memory); - Remove the trailing newline for the STRING_MISC_HELP1 page prompt, as part of reworking it a bit (see next commit); - Code formatting in type.c as I'll touch it after. 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/memory.c trunk/reactos/base/shell/cmd/resource.h trunk/reactos/base/shell/cmd/type.c 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] Mon Oct 10 19:11:15 2016 @@ -259,15 +259,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ + STRING_MEMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% memory load.\n\n\ %13s bytes total physical RAM.\n\ %13s bytes available physical RAM.\n\n\ %13s bytes total page file.\n\ %13s bytes available page file.\n\n\ %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" + STRING_MISC_HELP1 "Press a key to continue..." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\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] Mon Oct 10 19:11:15 2016 @@ -253,15 +253,15 @@ /H Erzeugt einen Hardlink.\n\ /J Erzeugt einen Junction Point.\n\n\ Wenn weder /H noch /J angegeben werden, wird eine symbolische VerknÃ¼pfung angelegt." - STRING_MEMMORY_HELP1 "Zeigt die GrÃ¶Ãe des Systemspeicher an.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% Speicher geladen.\n\n\ + STRING_MEMORY_HELP1 "Zeigt die GrÃ¶Ãe des Systemspeicher an.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% Speicher geladen.\n\n\ %13s Bytes RAM (insgesamt)\n\ %13s Bytes verfÃ¼gbarer RAM\n\n\ %13s Bytes Auslagerungsdatei (insgesamt)\n\ %13s Bytes verfÃ¼gbare Auslagerungsdatei\n\n\ %13s Bytes Virtueller Speicher (insgesamt)\n\ %13s Bytes verfÃ¼gbarer virtueller Speicher\n" - STRING_MISC_HELP1 "DrÃ¼cken Sie eine beliebige Taste . . .\n" + STRING_MISC_HELP1 "DrÃ¼cken Sie eine beliebige Taste . . ." STRING_MOVE_HELP1 "Ãberschreiben %s (Ja/Nein/Alle)? " STRING_MOVE_HELP2 "Verschiebt Dateien und benennt Dateien sowie Verzeichnisse um.\n\n\ Um eine oder mehrere Dateien zu verschieben:\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] Mon Oct 10 19:11:15 2016 @@ -258,15 +258,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ + STRING_MEMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% memory load.\n\n\ %13s bytes total physical RAM.\n\ %13s bytes available physical RAM.\n\n\ %13s bytes total page file.\n\ %13s bytes available page file.\n\n\ %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" + STRING_MISC_HELP1 "Press a key to continue..." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\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] Mon Oct 10 19:11:15 2016 @@ -254,15 +254,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ + STRING_MEMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% memory load.\n\n\ %13s bytes total physical RAM.\n\ %13s bytes available physical RAM.\n\n\ %13s bytes total page file.\n\ %13s bytes available page file.\n\n\ %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" + STRING_MISC_HELP1 "Press a key to continue..." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\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] Mon Oct 10 19:11:15 2016 @@ -254,15 +254,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Muestra la cantidad de memoria del sistema.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% carga de memoria.\n\n\ + STRING_MEMORY_HELP1 "Muestra la cantidad de memoria del sistema.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% carga de memoria.\n\n\ %13s bytes totales de RAM fÃsica.\n\ %13s bytes libres de RAM fÃsica.\n\n\ %13s bytes totales del archivo de paginaciÃ³n.\n\ %13s bytes disponibles del archivo de paginaciÃ³n.\n\n\ %13s bytes totales de memoria virtual.\n\ %13s bytes disponibles de memoria virtual.\n" - STRING_MISC_HELP1 "Pulsa cualquier tecla para continuar...\n" + STRING_MISC_HELP1 "Pulsa cualquier tecla para continuar..." STRING_MOVE_HELP1 "Â¿Sobreescribir %s (Si/No/Todos)? " STRING_MOVE_HELP2 "Mueve archivos y renombra archivos y directorios.\n\n\ Para mover uno o mÃ¡s archivos:\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] Mon Oct 10 19:11:15 2016 @@ -266,15 +266,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Affiche la quantitÃ© de mÃ©moire systÃ¨me.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% de charge mÃ©moire.\n\n\ + STRING_MEMORY_HELP1 "Affiche la quantitÃ© de mÃ©moire systÃ¨me.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% de charge mÃ©moire.\n\n\ %13s octets de RAM physique au total.\n\ %13s octets de RAM physique disponible.\n\n\ %13s octets de fichier d'Ã©change au total.\n\ %13s octets de fichier d'Ã©change disponible.\n\n\ %13s octets de mÃ©moire virtuelle au total.\n\ %13s octets de mÃ©moire virtuelle disponible.\n" - STRING_MISC_HELP1 "Appuyer sur une touche pour continuer...\n" + STRING_MISC_HELP1 "Appuyer sur une touche pour continuer..." STRING_MOVE_HELP1 "Ecraser %s (Oui/Non/Tous) ? " STRING_MOVE_HELP2 "DÃ©place des fichiers ou renomme des fichiers et des rÃ©pertoires.\n\n\ Pouur dÃ©placer un ou plusieurs fichiers:\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] Mon Oct 10 19:11:15 2016 @@ -241,15 +241,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "MegjelenÃti a memÃ³ria statisztikÃ¡t.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n A memÃ³ria %12s%%-a foglalt.\n\n\ + STRING_MEMORY_HELP1 "MegjelenÃti a memÃ³ria statisztikÃ¡t.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n A memÃ³ria %12s%%-a foglalt.\n\n\ %13s bÃ¡jtnyi teljes fizikai memÃ³ria.\n\ %13s bÃ¡jtnyi elÃ©rhetÃµ memÃ³ria.\n\n\ %13s bÃ¡jt a lapozÃ³Ã¡llomÃ¡ny.\n\ %13s bÃ¡jtnyi elÃ©rhetÃµ a lapozÃ³Ã¡llomÃ¡nyban.\n\n\ %13s bÃ¡jt a teljes virtuÃ¡lis memÃ³ria.\n\ %13s bÃ¡jtnyi elÃ©rhetÃµ a virtuÃ¡lis memÃ³riÃ¡bÃ³l.\n" - STRING_MISC_HELP1 "A folytatÃ¡shoz nyomj meg egy billentyÃ»t . . .\n" + STRING_MISC_HELP1 "A folytatÃ¡shoz nyomj meg egy billentyÃ»t . . ." STRING_MOVE_HELP1 "FelÃ¼lÃrja %s (Igen/Nem/Mind)? " STRING_MOVE_HELP2 "Ãthelyezi Ã©s Ã¡tnevezi az Ã¡llomÃ¡nyokat a mappÃ¡kban.\n\n\ Egy vagy tÃ¶bb Ã¡llomÃ¡ny Ã¡thelyezÃ©sÃ©hez:\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] Mon Oct 10 19:11:15 2016 @@ -255,15 +255,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Menampilkan jumlah memori sistem.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% beban memori.\n\n\ + STRING_MEMORY_HELP1 "Menampilkan jumlah memori sistem.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% beban memori.\n\n\ %13s byte total fisik RAM.\n\ %13s byte fisik RAM tersedia.\n\n\ %13s byte total file page.\n\ %13s byte file page tersedia.\n\n\ %13s byte total memori virtual.\n\ %13s byte memori virtual tersedia.\n" - STRING_MISC_HELP1 "Tekan tombol untuk melanjutkan...\n" + STRING_MISC_HELP1 "Tekan tombol untuk melanjutkan..." STRING_MOVE_HELP1 "Timpa %s (Ya/Tidak/Semua)? " STRING_MOVE_HELP2 "Memindahkan file dan mengganti nama file dan direktori.\n\n\ Untuk memindahkan satu atau lebih file:\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] Mon Oct 10 19:11:15 2016 @@ -256,16 +256,16 @@ /H Crea un hard link.\n\ /J Crea una directory junction.\n\n\ Se non sono specificati ne /H ne /J verrÃ creato un link simbolico." - STRING_MEMMORY_HELP1 "Visualizza la quantitÃ della memoria di sistema.\n\n\ + STRING_MEMORY_HELP1 "Visualizza la quantitÃ della memoria di sistema.\n\n\ MEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% carico di memoria.\n\n\ + STRING_MEMORY_HELP2 "\n %12s%% carico di memoria.\n\n\ %13s byte RAM fisica totale.\n\ %13s byte RAM fisica disponibile.\n\n\ %13s byte file di paginazione totale.\n\ %13s byte file di paginazione disponibile.\n\n\ %13s byte memoria virtuale totale.\n\ %13s byte memoria virtuale totale disponibile.\n" - STRING_MISC_HELP1 "Premi un tasto per continuare...\n" + STRING_MISC_HELP1 "Premi un tasto per continuare..." STRING_MOVE_HELP1 "Sovrascrivi %s (Si/No/Tutti)? " STRING_MOVE_HELP2 "Sposta i file o cambia il nome a file e cartelle.\n\n\ Per spostare uno o piÃ¹ file:\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] Mon Oct 10 19:11:15 2016 @@ -262,15 +262,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "ã·ã¹ãã ã¡ã¢ãªã®éãè¡¨ç¤ºãã¾ãã\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% ã®ã¡ã¢ãªãä½¿ç¨ããã¦ãã¾ãã\n\n\ + STRING_MEMORY_HELP1 "ã·ã¹ãã ã¡ã¢ãªã®éãè¡¨ç¤ºãã¾ãã\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% ã®ã¡ã¢ãªãä½¿ç¨ããã¦ãã¾ãã\n\n\ %13s ãã¤ã: å¨ç©çã¡ã¢ãª\n\ %13s ãã¤ã: å©ç¨å¯è½ãªç©çã¡ã¢ãª\n\n\ %13s ãã¤ã: å¨ãã¼ã¸ãã¡ã¤ã«\n\ %13s ãã¤ã: å©ç¨å¯è½ãªãã¼ã¸ãã¡ã¤ã«\n\n\ %13s ãã¤ã: å¨ä»®æ³ã¡ã¢ãª\n\ %13s ãã¤ã: å©ç¨å¯è½ãªä»®æ³ã¡ã¢ãª\n" - STRING_MISC_HELP1 "ç¶è¡ããã«ã¯ä½ããã¼ãæ¼ãã¦ãã ãã ...\n" + STRING_MISC_HELP1 "ç¶è¡ããã«ã¯ä½ããã¼ãæ¼ãã¦ãã ãã ..." STRING_MOVE_HELP1 "%s ãä¸æ¸ããã¾ããããããã§ãã (Yes/No/All)? " STRING_MOVE_HELP2 "ãã¡ã¤ã«ãç§»åããã³ãã¡ã¤ã«ã¨ãã£ã¬ã¯ããªåãå¤æ´ãã¾ãã\n\n\ 1 ã¤ã¾ãã¯è¤æ°ã®ãã¡ã¤ã«ãç§»åããã«ã¯:\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] Mon Oct 10 19:11:15 2016 @@ -253,15 +253,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Vis mengde av system minne.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% benyttet minne.\n\n\ + STRING_MEMORY_HELP1 "Vis mengde av system minne.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% benyttet minne.\n\n\ %13s byte totalt fysisk RAM.\n\ %13s byte tilgjengelig fysisk RAM.\n\n\ %13s byte total sidevekslingsfil.\n\ %13s byte tilgjengelig sidevekslingsfil.\n\n\ %13s byte totalt virtuell minne.\n\ %13s byte tilgjengelig virtuell minne.\n" - STRING_MISC_HELP1 "Trykk en tast for Ã¥ fortsette...\n" + STRING_MISC_HELP1 "Trykk en tast for Ã¥ fortsette..." STRING_MOVE_HELP1 "Overskrive %s (Ja/Nei/Alle)? " STRING_MOVE_HELP2 "Flytt filer, og gi nytt navn pÃ¥ filer og mapper.\n\n\ For Ã¥ flytte en eller flere filer:\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] Mon Oct 10 19:11:15 2016 @@ -260,15 +260,15 @@ /H Tworzy dowiÄzanie twarde.\n\ /J Tworzy punkt poÅÄczenia katalogÃ³w.\n\n\ JeÅli nie zostaÅy uÅ¼yte zarÃ³wno /H jak i /J, zostanie utworzone dowiÄzanie symboliczne." - STRING_MEMMORY_HELP1 "WyÅwietla iloÅÄ pamiÄci systemowej.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% pamiÄci zajÄtej.\n\n\ + STRING_MEMORY_HELP1 "WyÅwietla iloÅÄ pamiÄci systemowej.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% pamiÄci zajÄtej.\n\n\ %13s bajtÃ³w pamiÄci RAM ogÃ³Åem.\n\ %13s bajtÃ³w pamiÄci RAM dostÄpne.\n\n\ %13s bajtÃ³w w pliku stronicowania ogÃ³Åem.\n\ %13s bajtÃ³w dostÄpnych w pliku stronicowania.\n\n\ %13s bajtÃ³w pamiÄci wirtualnej ogÃ³Åem.\n\ %13s bajtÃ³w pamiÄci wirtualnej dostÄpne.\n" - STRING_MISC_HELP1 "NaciÅnij dowolny klawisz, aby kontynuowaÄ...\n" + STRING_MISC_HELP1 "NaciÅnij dowolny klawisz, aby kontynuowaÄ..." STRING_MOVE_HELP1 "NadpisaÄ %s (Tak/Nie/Zawsze)? " STRING_MOVE_HELP2 "Przenosi, a takÅ¼e zmienia nazwy plikÃ³w i katalogÃ³w.\n\n\ Aby przenieÅÄ jeden lub wiÄcej plikÃ³w:\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] Mon Oct 10 19:11:15 2016 @@ -287,15 +287,15 @@ /J CreazÄ o joncÈiune de director.\n\n\ DacÄ nu sunt specificate nici /H Èi nici /J ca argumente, va fi creatÄ o\n\ legÄturÄ simbolicÄ." - STRING_MEMMORY_HELP1 "AfiÈeazÄ cantitatea de memorie a sistemului.\n\nMEMORY\n" - STRING_MEMMORY_HELP2 "\n %12s%% nivel de uzilizare.\n\n\ + STRING_MEMORY_HELP1 "AfiÈeazÄ cantitatea de memorie a sistemului.\n\nMEMORY\n" + STRING_MEMORY_HELP2 "\n %12s%% nivel de uzilizare.\n\n\ %13s octeÈi Ã®n total Ã®n memoria fizicÄ (RAM).\n\ %13s octeÈi disponibili Ã®n memorie fizicÄ (RAM).\n\n\ %13s octeÈi Ã®n total Ã®n fiÈierul de paginare.\n\ %13s octeÈi disponibili Ã®n fiÈierul de paginare.\n\n\ %13s octeÈi Ã®n total Ã®n memoria virtualÄ.\n\ %13s octeÈi disponibili Ã®n memoria virtualÄ.\n" - STRING_MISC_HELP1 "TastaÈi pentru a continua...\n" + STRING_MISC_HELP1 "TastaÈi pentru a continua..." STRING_MOVE_HELP1 "SuprascrieÈi Â«%sÂ»? (Da|Nu|Toate)" STRING_MOVE_HELP2 "MutÄ sau redenumeÈte fiÈiere Èi directoare.\n\n\ Pentru a muta unul sau mai multe fiÈiere:\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] Mon Oct 10 19:11:15 2016 @@ -263,15 +263,15 @@ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ ÐÑÑÑ (Ð¾ÑÐ½Ð¾ÑÐ¸ÑÐµÐ»ÑÐ½ÑÐ¹ Ð¸Ð»Ð¸ Ð°Ð±ÑÐ¾Ð»ÑÑÐ½ÑÐ¹), Ð½Ð° ÐºÐ¾ÑÐ¾ÑÑÐ¹ ÑÑÑÐ»Ð°ÐµÑÑÑ\n\ Ð½Ð¾Ð²Ð°Ñ ÑÑÑÐ»ÐºÐ°.\n\n\ ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ñ /H Ð¸ /J, ÑÐ¾ Ð±ÑÐ´ÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸ÑÐµÑÐºÐ°Ñ ÑÑÑÐ»ÐºÐ°." - STRING_MEMMORY_HELP1 "ÐÑÐ²Ð¾Ð´ Ð¾Ð±ÑÐµÐ¼Ð° ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸.\n\n\ + STRING_MEMORY_HELP1 "ÐÑÐ²Ð¾Ð´ Ð¾Ð±ÑÐµÐ¼Ð° ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸.\n\n\ %13s Ð±Ð°Ð¹Ñ Ð²ÑÐµÐ³Ð¾ ÑÐ¸Ð·Ð¸ÑÐµÑÐºÐ¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸.\n\ %13s Ð±Ð°Ð¹Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ ÑÐ¸Ð·Ð¸ÑÐµÑÐºÐ¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸.\n\n\ %13s Ð±Ð°Ð¹Ñ Ð²ÑÐµÐ³Ð¾ Ð² ÑÐ°Ð¹Ð»Ðµ Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸.\n\ %13s Ð±Ð°Ð¹Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ Ð² ÑÐ°Ð¹Ð»Ðµ Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸.\n\n\ %13s Ð±Ð°Ð¹Ñ Ð²ÑÐµÐ³Ð¾ Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸.\n\ %13s Ð±Ð°Ð¹Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸.\n" - STRING_MISC_HELP1 "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ...\n" + STRING_MISC_HELP1 "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ..." STRING_MOVE_HELP1 "ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÐ°ÑÑ %s (Yes/No/All)? " STRING_MOVE_HELP2 "ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð².\n\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] Mon Oct 10 19:11:15 2016 @@ -260,15 +260,15 @@ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ + STRING_MEMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% memory load.\n\n\ %13s bytes total physical RAM.\n\ %13s bytes available physical RAM.\n\n\ %13s bytes total page file.\n\ %13s bytes available page file.\n\n\ %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" + STRING_MISC_HELP1 "Press a key to continue..." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\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] Mon Oct 10 19:11:15 2016 @@ -258,15 +258,15 @@ /H Krijon njÃ« lidhjÃ« tÃ« fortÃ«.\n\ /J Krijo njÃ« kryqÃ«zim nÃ« skedÃ«.\n\n\ NÃ«se anjÃ«ra nga /H ose /J nuk speficikohet, njÃ« lidhje simboli do tÃ« krijohet." - STRING_MEMMORY_HELP1 "Paraqet sasinÃ« e memories sÃ« sistemit.\n\nMEMORIA" - STRING_MEMMORY_HELP2 "\n %12s%% ngarkimi i memories.\n\n\ + STRING_MEMORY_HELP1 "Paraqet sasinÃ« e memories sÃ« sistemit.\n\nMEMORIA" + STRING_MEMORY_HELP2 "\n %12s%% ngarkimi i memories.\n\n\ %13s bytes totali i RAM'it fizik.\n\ %13s bytes RAM'i fizik ne dispozicion.\n\n\ %13s bytes totali i faqeve i dokumentave.\n\ %13s bytes dokumentat dhe faqet ne dispozicion.\n\n\ %13s bytes memoria totale virtuale.\n\ %13s bytes memoria virtuale ne dispozicion.\n" - STRING_MISC_HELP1 "Shtypni njÃ« buton pÃ«r tÃ« vazhduar...\n" + STRING_MISC_HELP1 "Shtypni njÃ« buton pÃ«r tÃ« vazhduar..." STRING_MOVE_HELP1 "Mbishkruaj %s (Po/Jo/TÃ« Gjith)? " STRING_MOVE_HELP2 "LÃ«viz dokumentet dhe emero ato dhe skedat.\n\n\ PÃ«r tÃ« lÃ«vizur njÃ« ose mÃ« shumÃ« dokumenta:\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] Mon Oct 10 19:11:15 2016 @@ -253,15 +253,15 @@ /H Skapar en hÃ¥rdlÃ¤nk i stÃ¤llet fÃ¶r en symbolisk lÃ¤nk.\n\ /J Skapar en knutpunkt fÃ¶r en mapp sk. junction.\n\n\ Om varken /H eller /J Ã¤r angivna kommer en symbolisk lÃ¤nk att skapas." - STRING_MEMMORY_HELP1 "Visar mÃ¤ngd systemminne.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% anvÃ¤nt minne.\n\n\ + STRING_MEMORY_HELP1 "Visar mÃ¤ngd systemminne.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% anvÃ¤nt minne.\n\n\ %13s byte totalt fysisk RAM-minne.\n\ %13s byte tillgÃ¤ngligt fysisk RAM-minne.\n\n\ %13s byte total sidvÃ¤xlingsfil.\n\ %13s byte tillgÃ¤nglig sidvÃ¤xlingsfil.\n\n\ %13s byte totalt virtuell minne.\n\ %13s byte tilgÃ¤ngeligt virtuellt minne.\n" - STRING_MISC_HELP1 "Tryck en knapp fÃ¶r att fortsÃ¤tta...\n" + STRING_MISC_HELP1 "Tryck en knapp fÃ¶r att fortsÃ¤tta..." STRING_MOVE_HELP1 "Skriv Ã¶ver %s (Ja/Nej/Alla)? " STRING_MOVE_HELP2 "Flyttar filer, och byter namn pÃ¥ filer och mappar.\n\n\ fÃ¶r att flytte en eller flera filer:\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] Mon Oct 10 19:11:15 2016 @@ -261,15 +261,15 @@ /H Bir deÄiÅmez baÄlantÄ± oluÅtur.\n\ /J Bir dizin baÄlantÄ±sÄ± oluÅtur.\n\n\ /H ve /J belirtilmemiÅse bir simgelik baÄlantÄ± oluÅmuÅtur." - STRING_MEMMORY_HELP1 "Dizge belleÄinin niceliÄini gÃ¶rÃ¼ntÃ¼ler.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n Bellek %%%12s yÃ¼klÃ¼.\n\n\ + STRING_MEMORY_HELP1 "Dizge belleÄinin niceliÄini gÃ¶rÃ¼ntÃ¼ler.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n Bellek %%%12s yÃ¼klÃ¼.\n\n\ %13s Ã§oklu tÃ¼m fizÃ®kÃ® RAM.\n\ %13s Ã§oklu kullanÄ±labilir fizÃ®kÃ® RAM.\n\n\ %13s Ã§oklu tÃ¼m sayfalama kÃ¼tÃ¼ÄÃ¼.\n\ %13s Ã§oklu kullanÄ±labilir sayfalama kÃ¼tÃ¼ÄÃ¼.\n\n\ %13s Ã§oklu tÃ¼m farazÃ® bellek.\n\ %13s Ã§oklu kullanÄ±labilir farazÃ® bellek.\n" - STRING_MISC_HELP1 "SÃ¼rdÃ¼rmek iÃ§in bir dÃ¼Ämeye basÄ±nÄ±z...\n" + STRING_MISC_HELP1 "SÃ¼rdÃ¼rmek iÃ§in bir dÃ¼Ämeye basÄ±nÄ±z..." STRING_MOVE_HELP1 "Ãzerine yaz: %s (Evet/HayÄ±r/TÃ¼mÃ¼)? " STRING_MOVE_HELP2 "KÃ¼tÃ¼kleri taÅÄ±r ve kÃ¼tÃ¼kleri ve dizinleri yeniden adlandÄ±rÄ±r.\n\n\ Bir ya da daha Ã§ok kÃ¼tÃ¼ÄÃ¼ taÅÄ±mak iÃ§in:\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] Mon Oct 10 19:11:15 2016 @@ -265,15 +265,15 @@ /H Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ Ð¶Ð¾ÑÑÑÐºÐ¾Ð³Ð¾ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ.\n\ /J Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ Ð·'ÑÐ´Ð½Ð°Ð½Ð½Ñ Ð´Ð¸ÑÐµÐºÑÐ¾ÑiÐ¹.\n\n\ Ð¯ÐºÑÐ¾ Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ð½i /H Ð½i /J , ÑÑÐ²Ð¾ÑÑÑÑÑÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»iÑÐ½Ðµ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ." - STRING_MEMMORY_HELP1 "ÐiÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±'ÑÐ¼Ñ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ñ Ð¿Ð°Ð¼'ÑÑi.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% Ð¿Ð°Ð¼'ÑÑi Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÑÑÑ.\n\n\ + STRING_MEMORY_HELP1 "ÐiÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±'ÑÐ¼Ñ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ñ Ð¿Ð°Ð¼'ÑÑi.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% Ð¿Ð°Ð¼'ÑÑi Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÑÑÑ.\n\n\ %13s Ð±Ð°Ð¹Ñ Ð²ÑÑÐ¾Ð³Ð¾ ÑiÐ·Ð¸ÑÐ½Ð¾Ñ RAM.\n\ %13s Ð±Ð°Ð¹Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ ÑiÐ·Ð¸ÑÐ½Ð¾Ñ RAM.\n\n\ %13s Ð±Ð°Ð¹Ñ Ð²ÑÑÐ¾Ð³Ð¾ Ð² ÑÐ°Ð¹Ð»i Ð´Ð¾Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ.\n\ %13s Ð±Ð°Ð¹Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ Ð² ÑÐ°Ð¹Ð»i Ð´Ð¾Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ.\n\n\ %13s Ð±Ð°Ð¹Ñ Ð²ÑÑÐ¾Ð³Ð¾ Ð²iÑÑÑÐ°Ð»ÑÐ½Ð¾Ñ Ð¿Ð°Ð¼'ÑÑi.\n\ %13s Ð±Ð°Ð¹Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ Ð²iÑÑÑÐ°Ð»ÑÐ½Ð¾Ñ Ð¿Ð°Ð¼'ÑÑi.\n" - STRING_MISC_HELP1 "ÐÐ°ÑÐ¸ÑÐ½iÑÑ ÐºÐ»Ð°Ð²iÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ...\n" + STRING_MISC_HELP1 "ÐÐ°ÑÐ¸ÑÐ½iÑÑ ÐºÐ»Ð°Ð²iÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ..." STRING_MOVE_HELP1 "ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÐ¸ %s (Yes/No/All)? " STRING_MOVE_HELP2 "ÐÐµÑÐµÐ¼iÑÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»iÐ² i Ð¿ÐµÑÐµÐ¹Ð¼ÐµÐ½ÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»iÐ² i ÐºÐ°ÑÐ°Ð»Ð¾Ð³iÐ².\n\n\ ÐÐµÑÐµÐ¼iÑÐµÐ½Ð½Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑÐ° Ð±iÐ»ÑÑÐµ ÑÐ°Ð¹Ð»iÐ²:\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] Mon Oct 10 19:11:15 2016 @@ -239,15 +239,15 @@ /H åå»ºä¸ä¸ªç¡¬é¾æ¥ã\n\ /J åå»ºä¸ä¸ªç®å½è¿æ¥ç¹ã\n\n\ å¦æ /H æ /J åæªè¢«æå®ï¼ä¸ä¸ªç¬¦å·é¾æ¥å°è¢«åå»ºã" - STRING_MEMMORY_HELP1 "æ¾ç¤ºç³»ç»ååå®¹éã\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% ååå·²å®è£ã\n\n\ + STRING_MEMORY_HELP1 "æ¾ç¤ºç³»ç»ååå®¹éã\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% ååå·²å®è£ã\n\n\ %13s åè æ»ç©çååã\n\ %13s åè å¯ç¨ç©çååã\n\n\ %13s åè æ»é¡µé¢æä»¶å¤§å°ã\n\ %13s åè å¯ç¨é¡µé¢æä»¶ã\n\n\ %13s åè æ»èæååã\n\ %13s åè å¯ç¨èæååã\n" - STRING_MISC_HELP1 "æä»»æé®ç»§ç»...\n" + STRING_MISC_HELP1 "æä»»æé®ç»§ç»..." STRING_MOVE_HELP1 "è¦ç %s å (Yes/No/All)ï¼" STRING_MOVE_HELP2 "ç§»å¨æä»¶å¹¶éå½åæä»¶åç®å½ã\n\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] Mon Oct 10 19:11:15 2016 @@ -239,15 +239,15 @@ /H åµå»ºä¸åç¡¬é£çµã\n\ /J åµå»ºä¸åç®éé£ç·é»ã\n\n\ å¦æ /H æ /J åæªè¢«æå®ï¼ä¸åç¬¦èé£çµå°è¢«åµå»ºã" - STRING_MEMMORY_HELP1 "é¡¯ç¤ºç³»çµ±å§åå®¹éã\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% å§åå·²å®è£ã\n\n\ + STRING_MEMORY_HELP1 "é¡¯ç¤ºç³»çµ±å§åå®¹éã\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% å§åå·²å®è£ã\n\n\ %13s ä½åçµ ç¸½ç©çå§åã\n\ %13s ä½åçµ å¯ç¨ç©çå§åã\n\n\ %13s ä½åçµ ç¸½é é¢æªæ¡å¤§å°ã\n\ %13s ä½åçµ å¯ç¨é é¢æªæ¡ã\n\n\ %13s ä½åçµ ç¸½èæ¬å§åã\n\ %13s ä½åçµ å¯ç¨èæ¬å§åã\n" - STRING_MISC_HELP1 "æä»»æéµç¹¼çº...\n" + STRING_MISC_HELP1 "æä»»æéµç¹¼çº..." STRING_MOVE_HELP1 "è¦è %s å (Yes/No/All)ï¼" STRING_MOVE_HELP2 "ç§»åæªæ¡ä¸¦éæ°å½åæªæ¡åç®éã\n\n\ ç§»åä¸åæå¤åæªæ¡ï¼\n\ Modified: trunk/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/memory.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] Mon Oct 10 19:11:15 2016 @@ -29,7 +29,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_MEMMORY_HELP1); + ConOutResPaging(TRUE,STRING_MEMORY_HELP1); return 0; } @@ -62,7 +62,7 @@ ConvertULargeInteger(msex.ullTotalVirtual, szTotalVirtual, 40, TRUE); ConvertULargeInteger(msex.ullAvailVirtual, szAvailVirtual, 40, TRUE); - ConOutResPrintf(STRING_MEMMORY_HELP2, + ConOutResPrintf(STRING_MEMORY_HELP2, szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, szAvailPageFile, szTotalVirtual, szAvailVirtual); Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Mon Oct 10 19:11:15 2016 @@ -147,8 +147,8 @@ #define STRING_MKDIR_HELP 667 -#define STRING_MEMMORY_HELP1 668 -#define STRING_MEMMORY_HELP2 669 +#define STRING_MEMORY_HELP1 668 +#define STRING_MEMORY_HELP2 669 #define STRING_MISC_HELP1 670 Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Mon Oct 10 19:11:15 2016 @@ -31,7 +31,7 @@ #ifdef INCLUDE_CMD_TYPE -INT cmd_type (LPTSTR param) +INT cmd_type(LPTSTR param) { TCHAR buff[256]; HANDLE hFile, hConsoleOut; @@ -42,9 +42,9 @@ BOOL bPaging = FALSE; BOOL bFirstTime = TRUE; - hConsoleOut=GetStdHandle (STD_OUTPUT_HANDLE); + hConsoleOut = GetStdHandle(STD_OUTPUT_HANDLE); - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_TYPE_HELP1); return 0; @@ -52,13 +52,13 @@ if (!*param) { - error_req_param_missing (); + error_req_param_missing(); return 1; } - argv = split (param, &argc, TRUE, FALSE); + argv = split(param, &argc, TRUE, FALSE); - for(i = 0; i < argc; i++) + for (i = 0; i < argc; i++) { if(*argv[i] == _T('/') && _tcslen(argv[i]) >= 2 && _totupper(argv[i][1]) == _T('P')) { @@ -77,12 +77,12 @@ nErrorLevel = 0; hFile = CreateFile(argv[i], - GENERIC_READ, - FILE_SHARE_READ,NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL,NULL); + GENERIC_READ, + FILE_SHARE_READ, NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); - if(hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) { FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS | @@ -101,7 +101,7 @@ if (bPaging) { - while (FileGetString (hFile, buff, sizeof(buff) / sizeof(TCHAR))) + while (FileGetString(hFile, buff, ARRAYSIZE(buff))) { if (ConOutPrintfPaging(bFirstTime, _T("%s"), buff) == 1) {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2025

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