Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 76014: [VGA_NEW] Add CMakeLists.txt and fix build
by tkreuzer＠svn.reactos.org 01 Oct '17

01 Oct '17

Author: tkreuzer Date: Sun Oct 1 10:17:30 2017 New Revision: 76014 URL: http://svn.reactos.org/svn/reactos?rev=76014&view=rev Log: [VGA_NEW] Add CMakeLists.txt and fix build Added: trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt (with props) Modified: trunk/reactos/win32ss/drivers/displays/vga_new/enable.c trunk/reactos/win32ss/drivers/displays/vga_new/palette.c trunk/reactos/win32ss/drivers/displays/vga_new/screen.c Added: trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt (added) +++ trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt [iso-8859-1] Sun Oct 1 10:17:30 2017 @@ -0,0 +1,18 @@ + +list(APPEND SOURCE + enable.c + debug.c + enable.c + palette.c + screen.c) + +add_library(vgaddi SHARED + ${SOURCE} + vga_new.rc) + +set_module_type(vgaddi kerneldll ENTRYPOINT DrvEnableDriver 12) + +add_importlibs(vgaddi win32k) +target_link_libraries(vgaddi libcntpr) +add_dependencies(vgaddi psdk) +add_cd_file(TARGET vgaddi DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/drivers/displays/vga_new/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/enable.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/enable.c [iso-8859-1] Sun Oct 1 10:17:30 2017 @@ -48,7 +48,7 @@ * \**************************************************************************/ -BOOL DrvEnableDriver( +BOOL APIENTRY DrvEnableDriver( ULONG iEngineVersion, ULONG cj, PDRVENABLEDATA pded) @@ -88,7 +88,7 @@ * \**************************************************************************/ -DHPDEV DrvEnablePDEV( +DHPDEV APIENTRY DrvEnablePDEV( DEVMODEW *pDevmode, // Pointer to DEVMODE PWSTR pwszLogAddress, // Logical address ULONG cPatterns, // number of patterns @@ -176,7 +176,7 @@ * \**************************************************************************/ -VOID DrvCompletePDEV( +VOID APIENTRY DrvCompletePDEV( DHPDEV dhpdev, HDEV hdev) { @@ -191,7 +191,7 @@ * \**************************************************************************/ -VOID DrvDisablePDEV( +VOID APIENTRY DrvDisablePDEV( DHPDEV dhpdev) { vDisablePalette((PPDEV) dhpdev); @@ -207,14 +207,17 @@ * \**************************************************************************/ -HSURF DrvEnableSurface( +HSURF APIENTRY DrvEnableSurface( DHPDEV dhpdev) { PPDEV ppdev; HSURF hsurf; SIZEL sizl; ULONG ulBitmapType; +#if 0 FLONG flHooks; +#endif + HSURF hSurfBitmap; // Create engine bitmap around frame buffer. @@ -290,7 +293,6 @@ // eVb: 1.5 [END] ppdev->hsurfEng = hsurf; // eVb: 1.4 [VGARISC Change] - Allocate 4BPP DIB that will store GDI drawing - HSURF hSurfBitmap; hSurfBitmap = (HSURF)EngCreateBitmap(sizl, 0, ulBitmapType, 0, NULL); if (hSurfBitmap == (HSURF) 0) { @@ -328,7 +330,7 @@ * \**************************************************************************/ -VOID DrvDisableSurface( +VOID APIENTRY DrvDisableSurface( DHPDEV dhpdev) { EngDeleteSurface(((PPDEV) dhpdev)->hsurfEng); @@ -343,7 +345,7 @@ * \**************************************************************************/ -BOOL DrvAssertMode( +BOOL APIENTRY DrvAssertMode( DHPDEV dhpdev, BOOL bEnable) { @@ -415,7 +417,7 @@ * \**************************************************************************/ -ULONG DrvGetModes( +ULONG APIENTRY DrvGetModes( HANDLE hDriver, ULONG cjSize, DEVMODEW *pdm) Modified: trunk/reactos/win32ss/drivers/displays/vga_new/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/palette.c [iso-8859-1] Sun Oct 1 10:17:30 2017 @@ -288,7 +288,7 @@ * \**************************************************************************/ -BOOL DrvSetPalette( +BOOL APIENTRY DrvSetPalette( DHPDEV dhpdev, PALOBJ* ppalo, FLONG fl, Modified: trunk/reactos/win32ss/drivers/displays/vga_new/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/screen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/screen.c [iso-8859-1] Sun Oct 1 10:17:30 2017 @@ -114,7 +114,7 @@ \**************************************************************************/ // Values for the internal, EGA-compatible palette. - +#if 0 static WORD PaletteBuffer[] = { 16, // 16 entries @@ -156,6 +156,7 @@ 0x00, 0x3F, 0x3F, 0x00, // bright ScanLinesan 0x3F, 0x3F, 0x3F, 0x00 // bright white }; +#endif // eVb: 2.3 [END] /******************************Public*Routine******************************\ * bInitSURF @@ -330,8 +331,10 @@ { ULONG cModes; PVIDEO_MODE_INFORMATION pVideoBuffer, pVideoModeSelected, pVideoTemp; +#if 0 VIDEO_COLOR_CAPABILITIES colorCapabilities; ULONG ulTemp; +#endif BOOL bSelectDefault; ULONG cbModeSize;

1 0

[tkreuzer] 76013: [INTRIN] Add missing _cdecl attributes
by tkreuzer＠svn.reactos.org 01 Oct '17

01 Oct '17

Author: tkreuzer Date: Sun Oct 1 10:14:03 2017 New Revision: 76013 URL: http://svn.reactos.org/svn/reactos?rev=76013&view=rev Log: [INTRIN] Add missing _cdecl attributes Modified: trunk/reactos/sdk/include/crt/intrin.h trunk/reactos/sdk/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/sdk/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/crt/intrin.h?r… ============================================================================== --- trunk/reactos/sdk/include/crt/intrin.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/crt/intrin.h [iso-8859-1] Sun Oct 1 10:14:03 2017 @@ -77,13 +77,13 @@ _Check_return_ unsigned long __cdecl _lrotl(_In_ unsigned long, _In_ int); _Check_return_ unsigned long __cdecl _lrotr(_In_ unsigned long, _In_ int); _Check_return_ unsigned int __cdecl _rotl(_In_ unsigned int _Value, _In_ int _Shift); -unsigned short _rotl16(unsigned short _Value, unsigned char _Shift); +_Check_return_ unsigned short __cdecl _rotl16(_In_ unsigned short _Value, _In_ unsigned char _Shift); _Check_return_ unsigned __int64 __cdecl _rotl64(_In_ unsigned __int64 _Value, _In_ int _Shift); -unsigned char _rotl8(unsigned char _Value, unsigned char _Shift); +_Check_return_ unsigned char __cdecl _rotl8(_In_ unsigned char _Value, _In_ unsigned char _Shift); _Check_return_ unsigned int __cdecl _rotr(_In_ unsigned int _Value, _In_ int _Shift); -unsigned short _rotr16(unsigned short _Value, unsigned char _Shift); +_Check_return_ unsigned short __cdecl _rotr16(_In_ unsigned short _Value, _In_ unsigned char _Shift); _Check_return_ unsigned __int64 __cdecl _rotr64(_In_ unsigned __int64 _Value, _In_ int _Shift); -unsigned char _rotr8(unsigned char _Value, unsigned char _Shift); +_Check_return_ unsigned char __cdecl _rotr8(_In_ unsigned char _Value, _In_ unsigned char _Shift); #if defined(_M_IX86) || defined(_M_X64) Modified: trunk/reactos/sdk/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/crt/mingw32/in… ============================================================================== --- trunk/reactos/sdk/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Oct 1 10:14:03 2017 @@ -70,8 +70,8 @@ #endif /*** memcopy must be memmove ***/ -void* memmove(void* dest, const void* source, size_t num); -__INTRIN_INLINE void* memcpy(void* dest, const void* source, size_t num) +void* __cdecl memmove(void* dest, const void* source, size_t num); +__INTRIN_INLINE void* __cdecl memcpy(void* dest, const void* source, size_t num) { return memmove(dest, source, num); } @@ -142,7 +142,7 @@ #ifndef __clang__ -__INTRIN_INLINE long _InterlockedCompareExchange(volatile long * Destination, long Exchange, long Comperand) +__INTRIN_INLINE long __cdecl _InterlockedCompareExchange(volatile long * Destination, long Exchange, long Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } @@ -170,7 +170,7 @@ #ifndef __clang__ -__INTRIN_INLINE long _InterlockedExchange(volatile long * Target, long Value) +__INTRIN_INLINE long __cdecl _InterlockedExchange(volatile long * Target, long Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); @@ -206,7 +206,7 @@ } #ifndef __clang__ -__INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * Addend, long Value) +__INTRIN_INLINE long __cdecl _InterlockedExchangeAdd(volatile long * Addend, long Value) { return __sync_fetch_and_add(Addend, Value); } @@ -286,12 +286,12 @@ #endif #ifndef __clang__ -__INTRIN_INLINE long _InterlockedDecrement(volatile long * lpAddend) +__INTRIN_INLINE long __cdecl _InterlockedDecrement(volatile long * lpAddend) { return __sync_sub_and_fetch(lpAddend, 1); } -__INTRIN_INLINE long _InterlockedIncrement(volatile long * lpAddend) +__INTRIN_INLINE long __cdecl _InterlockedIncrement(volatile long * lpAddend) { return __sync_add_and_fetch(lpAddend, 1); } @@ -1058,21 +1058,21 @@ #endif -__INTRIN_INLINE unsigned char _rotl8(unsigned char value, unsigned char shift) +__INTRIN_INLINE unsigned char __cdecl _rotl8(unsigned char value, unsigned char shift) { unsigned char retval; __asm__("rolb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -__INTRIN_INLINE unsigned short _rotl16(unsigned short value, unsigned char shift) +__INTRIN_INLINE unsigned short __cdecl _rotl16(unsigned short value, unsigned char shift) { unsigned short retval; __asm__("rolw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -__INTRIN_INLINE unsigned int _rotl(unsigned int value, int shift) +__INTRIN_INLINE unsigned int __cdecl _rotl(unsigned int value, int shift) { unsigned int retval; __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); @@ -1087,28 +1087,28 @@ return retval; } #else -__INTRIN_INLINE unsigned long long _rotl64(unsigned long long value, int shift) +__INTRIN_INLINE unsigned long long __cdecl _rotl64(unsigned long long value, int shift) { /* FIXME: this is probably not optimal */ return (value << shift) | (value >> (64 - shift)); } #endif -__INTRIN_INLINE unsigned int _rotr(unsigned int value, int shift) +__INTRIN_INLINE unsigned int __cdecl _rotr(unsigned int value, int shift) { unsigned int retval; __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -__INTRIN_INLINE unsigned char _rotr8(unsigned char value, unsigned char shift) +__INTRIN_INLINE unsigned char __cdecl _rotr8(unsigned char value, unsigned char shift) { unsigned char retval; __asm__("rorb %b[shift], %b[retval]" : [retval] "=qm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -__INTRIN_INLINE unsigned short _rotr16(unsigned short value, unsigned char shift) +__INTRIN_INLINE unsigned short __cdecl _rotr16(unsigned short value, unsigned char shift) { unsigned short retval; __asm__("rorw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); @@ -1123,7 +1123,7 @@ return retval; } #else -__INTRIN_INLINE unsigned long long _rotr64(unsigned long long value, int shift) +__INTRIN_INLINE unsigned long long __cdecl _rotr64(unsigned long long value, int shift) { /* FIXME: this is probably not optimal */ return (value >> shift) | (value << (64 - shift)); @@ -1193,14 +1193,14 @@ return retval; } -__INTRIN_INLINE unsigned short _byteswap_ushort(unsigned short value) +__INTRIN_INLINE unsigned short __cdecl _byteswap_ushort(unsigned short value) { unsigned short retval; __asm__("rorw $8, %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); return retval; } -__INTRIN_INLINE unsigned long _byteswap_ulong(unsigned long value) +__INTRIN_INLINE unsigned long __cdecl _byteswap_ulong(unsigned long value) { unsigned long retval; __asm__("bswapl %[retval]" : [retval] "=r" (retval) : "[retval]" (value)); @@ -1215,7 +1215,7 @@ return retval; } #else -__INTRIN_INLINE unsigned long long _byteswap_uint64(unsigned long long value) +__INTRIN_INLINE unsigned long long __cdecl _byteswap_uint64(unsigned long long value) { union { unsigned long long int64part; @@ -1389,34 +1389,34 @@ __asm__ __volatile__("rep; outsl" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); } -__INTRIN_INLINE int _inp(unsigned short Port) +__INTRIN_INLINE int __cdecl _inp(unsigned short Port) { return __inbyte(Port); } -__INTRIN_INLINE unsigned short _inpw(unsigned short Port) +__INTRIN_INLINE unsigned short __cdecl _inpw(unsigned short Port) { return __inword(Port); } -__INTRIN_INLINE unsigned long _inpd(unsigned short Port) +__INTRIN_INLINE unsigned long __cdecl _inpd(unsigned short Port) { return __indword(Port); } -__INTRIN_INLINE int _outp(unsigned short Port, int databyte) +__INTRIN_INLINE int __cdecl _outp(unsigned short Port, int databyte) { __outbyte(Port, (unsigned char)databyte); return databyte; } -__INTRIN_INLINE unsigned short _outpw(unsigned short Port, unsigned short dataword) +__INTRIN_INLINE unsigned short __cdecl _outpw(unsigned short Port, unsigned short dataword) { __outword(Port, dataword); return dataword; } -__INTRIN_INLINE unsigned long _outpd(unsigned short Port, unsigned long dataword) +__INTRIN_INLINE unsigned long __cdecl _outpd(unsigned short Port, unsigned long dataword) { __outdword(Port, dataword); return dataword; @@ -1465,7 +1465,7 @@ #ifdef __clang__ #define __debugbreak() __asm__("int $3") #else -__INTRIN_INLINE void __debugbreak(void) +__INTRIN_INLINE void __cdecl __debugbreak(void) { __asm__("int $3"); } @@ -1481,12 +1481,12 @@ __asm__("int $0x2c"); } -__INTRIN_INLINE void _disable(void) +__INTRIN_INLINE void __cdecl _disable(void) { __asm__("cli" : : : "memory"); } -__INTRIN_INLINE void _enable(void) +__INTRIN_INLINE void __cdecl _enable(void) { __asm__("sti" : : : "memory"); }

1 0

[pschweitzer] 76012: [KERNEL32] Implement GetVolumePathNamesForVolumeNameW()
by pschweitzer＠svn.reactos.org 01 Oct '17

01 Oct '17

Author: pschweitzer Date: Sun Oct 1 08:23:06 2017 New Revision: 76012 URL: http://svn.reactos.org/svn/reactos?rev=76012&view=rev Log: [KERNEL32] Implement GetVolumePathNamesForVolumeNameW() Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Sun Oct 1 08:23:06 2017 @@ -1056,7 +1056,7 @@ /* - * @unimplemented + * @implemented */ BOOL WINAPI @@ -1065,8 +1065,198 @@ IN DWORD cchBufferLength, OUT PDWORD lpcchReturnLength) { - STUB; - return 0; + BOOL Ret; + PWSTR MultiSz; + DWORD BytesReturned; + HANDLE MountMgrHandle; + UNICODE_STRING VolumeName; + PMOUNTMGR_TARGET_NAME TargetName; + PMOUNTMGR_VOLUME_PATHS VolumePaths; + ULONG BufferSize, CharsInMgr, CharsInOutput, Paths; + + /* First look that our volume name looks somehow correct */ + RtlInitUnicodeString(&VolumeName, lpszVolumeName); + if (VolumeName.Buffer[(VolumeName.Length / sizeof(WCHAR)) - 1] != L'\\') + { + BaseSetLastNTError(STATUS_OBJECT_NAME_INVALID); + return FALSE; + } + + /* Validate it's a DOS volume name finishing with a backslash */ + if (!MOUNTMGR_IS_DOS_VOLUME_NAME_WB(&VolumeName)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Allocate an input MOUNTMGR_TARGET_NAME */ + TargetName = RtlAllocateHeap(RtlGetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) + sizeof(USHORT)); + if (TargetName == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* And fill it */ + RtlZeroMemory(TargetName, MAX_PATH * sizeof(WCHAR) + sizeof(USHORT)); + TargetName->DeviceNameLength = VolumeName.Length - sizeof(WCHAR); + RtlCopyMemory(TargetName->DeviceName, VolumeName.Buffer, TargetName->DeviceNameLength); + TargetName->DeviceName[1] = L'?'; + + /* Open the mount manager */ + MountMgrHandle = CreateFileW(MOUNTMGR_DOS_DEVICE_NAME, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, + INVALID_HANDLE_VALUE); + if (MountMgrHandle == INVALID_HANDLE_VALUE) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetName); + return FALSE; + } + + /* Allocate an initial output buffer, just to get length */ + VolumePaths = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(MOUNTMGR_VOLUME_PATHS)); + if (VolumePaths == NULL) + { + CloseHandle(MountMgrHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Query the paths */ + Ret = DeviceIoControl(MountMgrHandle, IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATHS, + TargetName, MAX_PATH * sizeof(WCHAR) + sizeof(USHORT), + VolumePaths, sizeof(MOUNTMGR_VOLUME_PATHS), &BytesReturned, + NULL); + /* Loop until we can query everything */ + while (!Ret) + { + /* If failed for another reason than too small buffer, fail */ + if (GetLastError() != ERROR_MORE_DATA) + { + CloseHandle(MountMgrHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetName); + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumePaths); + return FALSE; + } + + /* Get the required length */ + BufferSize = VolumePaths->MultiSzLength + sizeof(MOUNTMGR_VOLUME_PATHS); + + /* And reallocate our output buffer (big enough this time) */ + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumePaths); + VolumePaths = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferSize); + if (VolumePaths == NULL) + { + CloseHandle(MountMgrHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Query again the mount mgr */ + Ret = DeviceIoControl(MountMgrHandle, IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATHS, + TargetName, MAX_PATH * sizeof(WCHAR) + sizeof(USHORT), + VolumePaths, BufferSize, &BytesReturned, NULL); + } + + /* We're done, no need for input nor mount mgr any longer */ + CloseHandle(MountMgrHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetName); + + /* Initialize: + - Number of paths we saw (useful to count extra \) + - Progress in mount mgr output + - Progress in output buffer + - Direct buffer to returned MultiSz + */ + Paths = 0; + CharsInMgr = 0; + CharsInOutput = 0; + MultiSz = VolumePaths->MultiSz; + + /* If we have an output buffer */ + if (cchBufferLength != 0) + { + /* Loop on the output to recopy it back to the caller + * Note that we loop until -1 not to handle last 0 (will be done later on) + */ + for (; (CharsInMgr < VolumePaths->MultiSzLength / sizeof(WCHAR) - 1) && (CharsInOutput < cchBufferLength); + ++CharsInMgr, ++CharsInOutput) + { + /* When we reach the end of a path */ + if (MultiSz[CharsInMgr] == UNICODE_NULL) + { + /* On path done (count), add an extra \ at the end */ + ++Paths; + lpszVolumePathNames[CharsInOutput] = L'\\'; + ++CharsInOutput; + /* Make sure we don't overflow */ + if (CharsInOutput == cchBufferLength) + { + break; + } + } + + /* Copy the char to the caller + * So, in case we're in the end of a path, we wrote two chars to + * the output buffer: \\ and \0 + */ + lpszVolumePathNames[CharsInOutput] = MultiSz[CharsInMgr]; + } + } + + /* If output buffer was too small (ie, we couldn't parse all the input buffer) */ + if (CharsInMgr < VolumePaths->MultiSzLength / sizeof(WCHAR) - 1) + { + /* Keep looping on it, to count the number of extra \ that will be required + * So that on the next call, caller can allocate enough space + */ + for (; CharsInMgr < VolumePaths->MultiSzLength / sizeof(WCHAR) - 1; ++CharsInMgr) + { + if (MultiSz[CharsInMgr] == UNICODE_NULL) + { + ++Paths; + } + } + } + + /* If we couldn't write as much as we wanted to the output buffer + * This handles the case where we could write everything excepted the + * terminating \0 for multi SZ + */ + if (CharsInOutput >= cchBufferLength) + { + /* Fail and set appropriate error code */ + Ret = FALSE; + SetLastError(ERROR_MORE_DATA); + /* If caller wants to know how many chars to allocate, return it */ + if (lpcchReturnLength != NULL) + { + /* It's amount of extra \ + number of chars in MultiSz (including double \0) */ + *lpcchReturnLength = Paths + (VolumePaths->MultiSzLength / sizeof(WCHAR)); + } + } + else + { + /* It succeed so terminate the multi SZ (second \0) */ + lpszVolumePathNames[CharsInOutput] = UNICODE_NULL; + Ret = TRUE; + + /* If caller wants the amount of chars written, return it */ + if (lpcchReturnLength != NULL) + { + /* Including the terminating \0 we just added */ + *lpcchReturnLength = CharsInOutput + 1; + } + } + + /* Free last bits */ + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumePaths); + + /* And return */ + return Ret; } /* EOF */

1 0

[tkreuzer] 76011: [GDI32] Remove obsolete function GdiIsHandleValid, which is just a copy of GdiValidateHandle
by tkreuzer＠svn.reactos.org 01 Oct '17

01 Oct '17

Author: tkreuzer Date: Sun Oct 1 07:53:54 2017 New Revision: 76011 URL: http://svn.reactos.org/svn/reactos?rev=76011&view=rev Log: [GDI32] Remove obsolete function GdiIsHandleValid, which is just a copy of GdiValidateHandle Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/misc/misc.c trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/gdi32/objects/dc.c trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c trunk/reactos/win32ss/gdi/gdi32/objects/painting.c trunk/reactos/win32ss/gdi/gdi32/objects/region.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Sun Oct 1 07:53:54 2017 @@ -202,7 +202,8 @@ DeleteRegion( HRGN ); BOOL -GdiIsHandleValid(HGDIOBJ hGdiObj); +WINAPI +GdiValidateHandle(HGDIOBJ); BOOL GdiGetHandleUserData( Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] Sun Oct 1 07:53:54 2017 @@ -745,24 +745,6 @@ return (PVOID)GdiHandleTable; } -BOOL GdiIsHandleValid(HGDIOBJ hGdiObj) -{ - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); -// We are only looking for TYPE not the rest here, and why is FullUnique filled up with CRAP!? -// DPRINT1("FullUnique -> %x\n", Entry->FullUnique); - if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0 && - ( (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK ) == - GDI_HANDLE_GET_TYPE(hGdiObj)) - { - HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - if(pid == NULL || pid == CurrentProcessId) - { - return TRUE; - } - } - return FALSE; -} - BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, DWORD ObjectType, PVOID *UserData) { PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Sun Oct 1 07:53:54 2017 @@ -363,7 +363,7 @@ UINT cjBmpScanSize; UINT cjInfoSize; - if (!hDC || !GdiIsHandleValid((HGDIOBJ) hDC) || !lpbmi) + if (!hDC || !GdiValidateHandle((HGDIOBJ) hDC) || !lpbmi) { GdiSetLastError(ERROR_INVALID_PARAMETER); return 0; Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Sun Oct 1 07:53:54 2017 @@ -1500,7 +1500,7 @@ { /* Fix up 16 bit handles */ hobj = GdiFixUpHandle(hobj); - if (!GdiIsHandleValid(hobj)) + if (!GdiValidateHandle(hobj)) { return NULL; } Modified: trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c [iso-8859-1] Sun Oct 1 07:53:54 2017 @@ -23,7 +23,7 @@ { hobj = NtGdiGetStockObject(fnObject); - if (!GdiIsHandleValid(hobj)) + if (!GdiValidateHandle(hobj)) { return NULL; } @@ -45,7 +45,7 @@ { DWORD Ret = 0; - if (GdiIsHandleValid(h)) + if (GdiValidateHandle(h)) { LONG Type = GDI_HANDLE_GET_TYPE(h); switch(Type) @@ -249,7 +249,7 @@ /* Handle error */ if (cbResult == 0) { - if (!GdiIsHandleValid(hGdiObj)) + if (!GdiValidateHandle(hGdiObj)) { if ((dwType == GDI_OBJECT_TYPE_PEN) || (dwType == GDI_OBJECT_TYPE_EXTPEN) || @@ -316,7 +316,7 @@ { /* Check if the handle is valid (FIXME: we need some special sauce for the stock object flag) */ - if (!GdiIsHandleValid(hObject)) + if (!GdiValidateHandle(hObject)) return FALSE; /* Check if this is a stock object */ Modified: trunk/reactos/win32ss/gdi/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/painting.c [iso-8859-1] Sun Oct 1 07:53:54 2017 @@ -128,7 +128,7 @@ _In_ INT y) { if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) return CLR_INVALID; - if (!GdiIsHandleValid((HGDIOBJ) hdc)) return CLR_INVALID; + if (!GdiValidateHandle((HGDIOBJ) hdc)) return CLR_INVALID; return NtGdiGetPixel(hdc, x, y); } @@ -479,7 +479,7 @@ if ((GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_METADC16_TYPE) || (GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_ALTDC_TYPE)) { - if (!GdiIsHandleValid(hdc)) + if (!GdiValidateHandle(hdc)) { return FALSE; } Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Sun Oct 1 07:53:54 2017 @@ -186,7 +186,7 @@ _In_ HRGN hrgn, _In_ HRGN *phrn) { - if (!GdiIsHandleValid((HGDIOBJ) hdc) || + if (!GdiValidateHandle((HGDIOBJ) hdc) || (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return 0;

1 0

[hbelusca] 76010: [CMD]: Improve ExecuteAutoRunFile() with validity checks.
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 22:12:21 2017 New Revision: 76010 URL: http://svn.reactos.org/svn/reactos?rev=76010&view=rev Log: [CMD]: Improve ExecuteAutoRunFile() with validity checks. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Sep 30 22:12:21 2017 @@ -1538,12 +1538,12 @@ { LONG lRet; HKEY hKey; + DWORD dwType, len; /* * Buffer big enough to hold the string L"4294967295", * corresponding to the literal 0xFFFFFFFF (MAX_ULONG) in decimal. */ DWORD Buffer[6]; - DWORD dwType, len; lRet = RegOpenKeyEx(hKeyRoot, _T("Software\\Microsoft\\Command Processor"), @@ -1685,28 +1685,33 @@ static VOID ExecuteAutoRunFile(HKEY hKeyRoot) { - TCHAR autorun[2048]; - DWORD len = sizeof autorun; - HKEY hkey; - - if (RegOpenKeyEx(hKeyRoot, - _T("SOFTWARE\\Microsoft\\Command Processor"), - 0, - KEY_READ, - &hkey) == ERROR_SUCCESS) - { - if (RegQueryValueEx(hkey, + LONG lRet; + HKEY hKey; + DWORD dwType, len; + TCHAR AutoRun[2048]; + + lRet = RegOpenKeyEx(hKeyRoot, + _T("Software\\Microsoft\\Command Processor"), + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet != ERROR_SUCCESS) + return; + + len = sizeof(AutoRun); + lRet = RegQueryValueEx(hKey, _T("AutoRun"), - 0, - 0, - (LPBYTE)autorun, - &len) == ERROR_SUCCESS) - { - if (*autorun) - ParseCommandLine(autorun); - } - RegCloseKey(hkey); - } + NULL, + &dwType, + (LPBYTE)&AutoRun, + &len); + if ((lRet == ERROR_SUCCESS) && (dwType == REG_EXPAND_SZ || dwType == REG_SZ)) + { + if (*AutoRun) + ParseCommandLine(AutoRun); + } + + RegCloseKey(hKey); } /* Get the command that comes after a /C or /K switch */

1 0

[hbelusca] 76009: [CMD]: Small refactoring: - Moving ConGetDefaultAttributes() in console.h; - Moving some SDK inclusions into precomp.h; - Removing extern HANDLE hIn; and localize the SHORT maxx/y...
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 21:37:34 2017 New Revision: 76009 URL: http://svn.reactos.org/svn/reactos?rev=76009&view=rev Log: [CMD]: Small refactoring: - Moving ConGetDefaultAttributes() in console.h; - Moving some SDK inclusions into precomp.h; - Removing extern HANDLE hIn; and localize the SHORT maxx/y variables; - Comment fix; - Whitespace fixes for screen.c. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/console.h trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/precomp.h trunk/reactos/base/shell/cmd/screen.c trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -311,10 +311,11 @@ { TCHAR szFullName[MAX_PATH]; TCHAR *first, *rest, *dot; - TCHAR szWindowTitle[MAX_PATH], szNewTitle[MAX_PATH*2]; + TCHAR szWindowTitle[MAX_PATH]; + TCHAR szNewTitle[MAX_PATH*2]; DWORD dwExitCode = 0; TCHAR *FirstEnd; - TCHAR szFullCmdLine [CMDLINE_LENGTH]; + TCHAR szFullCmdLine[CMDLINE_LENGTH]; TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(First), debugstr_aw(Rest)); @@ -1762,33 +1763,6 @@ } -#ifdef INCLUDE_CMD_COLOR - -BOOL ConGetDefaultAttributes(PWORD pwDefAttr) -{ - BOOL Success; - HANDLE hConsole; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - /* Do not modify *pwDefAttr if we fail, in which case use default attributes */ - - hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, NULL); - if (hConsole == INVALID_HANDLE_VALUE) - return FALSE; // No default console - - Success = GetConsoleScreenBufferInfo(hConsole, &csbi); - if (Success) - *pwDefAttr = csbi.wAttributes; - - CloseHandle(hConsole); - return Success; -} - -#endif - - /* * Set up global initializations and process parameters */ @@ -1997,7 +1971,6 @@ if (IsExistingFile(_T("cmdexit.bat"))) { ConErrResPuts(STRING_CMD_ERROR5); - ParseCommandLine(_T("cmdexit.bat")); } else if (IsExistingFile(_T("\\cmdexit.bat"))) Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -25,12 +25,6 @@ #include <config.h> -#include <winnls.h> -#include <winreg.h> -#include <winuser.h> -#include <wincon.h> -#include <tchar.h> - #include "cmdver.h" #include "cmddbg.h" @@ -43,7 +37,6 @@ #define D_ON _T("on") #define D_OFF _T("off") - /* command line buffer length */ #define CMDLINE_LENGTH 8192 @@ -51,7 +44,6 @@ #define BUFF_SIZE 16384 /* Global variables */ -extern HANDLE hIn; extern LPTSTR lpOriginalEnvironment; extern WORD wColor; extern WORD wDefColor; @@ -62,8 +54,6 @@ extern BOOL bEnableExtensions; extern BOOL bDelayedExpansion; extern INT nErrorLevel; -extern SHORT maxx; -extern SHORT maxy; extern BOOL bUnicodeOutput; 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] Sat Sep 30 21:37:34 2017 @@ -507,6 +507,33 @@ +#ifdef INCLUDE_CMD_COLOR + +BOOL ConGetDefaultAttributes(PWORD pwDefAttr) +{ + BOOL Success; + HANDLE hConsole; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + /* Do not modify *pwDefAttr if we fail, in which case use default attributes */ + + hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + if (hConsole == INVALID_HANDLE_VALUE) + return FALSE; // No default console + + Success = GetConsoleScreenBufferInfo(hConsole, &csbi); + if (Success) + *pwDefAttr = csbi.wAttributes; + + CloseHandle(hConsole); + return Success; +} + +#endif + + BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle) { /* Now really set the console title */ Modified: trunk/reactos/base/shell/cmd/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.h [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -72,6 +72,11 @@ VOID SetCursorType (BOOL, BOOL); +#ifdef INCLUDE_CMD_COLOR +BOOL ConGetDefaultAttributes(PWORD pwDefAttr); +#endif + + BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle); #ifdef INCLUDE_CMD_BEEP 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] Sat Sep 30 21:37:34 2017 @@ -1052,7 +1052,7 @@ /* Calculate size */ if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - /* Directory, no size it's a directory*/ + /* Directory, no size it's a directory */ iSizeFormat = -17; _tcscpy(szSize, _T("<DIR>")); } Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -7,15 +7,20 @@ #define _CRT_SECURE_NO_DEPRECATE #endif /*_MSC_VER */ +#include <stdio.h> +#include <stdarg.h> #include <stdlib.h> #include <malloc.h> +#include <tchar.h> #define WIN32_NO_STATUS -#include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <winnls.h> +#include <winreg.h> +#include <winuser.h> +#include <wincon.h> #include <shellapi.h> -#include <stdio.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> Modified: trunk/reactos/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/screen.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/screen.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/screen.c [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -15,13 +15,13 @@ #ifdef INCLUDE_CMD_SCREEN - -INT CommandScreen (LPTSTR param) +INT CommandScreen(LPTSTR param) { - SHORT x,y; + SHORT x, y; + SHORT maxx, maxy; BOOL bSkipText = FALSE; - if (_tcsncmp (param, _T("/?"), 2) == 0) + if (_tcsncmp(param, _T("/?"), 2) == 0) { ConOutResPaging(TRUE,STRING_SCREEN_HELP); return 0; @@ -29,72 +29,71 @@ nErrorLevel = 0; - //get row - while(_istspace(*param)) + /* Retrieve the screen dimensions */ + GetScreenSize(&maxx, &maxy); + + /* Get row */ + while (_istspace(*param)) param++; - if (!(*param)) + if (!*param) { - error_req_param_missing (); + error_req_param_missing(); return 1; } y = _ttoi(param); - if (y<0 || y>(maxy-1)) + if (y < 0 || y > (maxy-1)) { ConOutResPuts(STRING_SCREEN_ROW); - return 1; } - //get col - if (!(param = _tcschr(param,_T(' ')))) + /* Get column */ + if (!(param = _tcschr(param, _T(' ')))) { - error_req_param_missing (); + error_req_param_missing(); return 1; } - while(_istspace(*param)) + while (_istspace(*param)) param++; - if (!(*param)) + if (!*param) { - error_req_param_missing (); + error_req_param_missing(); return 1; } x = _ttoi(param); - if (x<0 || x>(maxx-1)) + if (x < 0 || x > (maxx-1)) { ConErrResPuts(STRING_SCREEN_COL); return 1; } - //get text - if (!(param = _tcschr(param,_T(' ')))) + /* Get text */ + if (!(param = _tcschr(param, _T(' ')))) { bSkipText = TRUE; } else { - while(_istspace(*param)) + while (_istspace(*param)) param++; - if (!(*param)) - { + if (!*param) bSkipText = TRUE; - } } bIgnoreEcho = TRUE; if (bSkipText) - x=0; + x = 0; + SetCursorXY(x, y); - SetCursorXY(x,y); - - if (!(bSkipText)) + if (!bSkipText) ConOutPuts(param); return 0; Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -45,7 +45,7 @@ BOOL bWait = FALSE; BOOL bBat = FALSE; BOOL bCreate = FALSE; - TCHAR szFullCmdLine [CMDLINE_LENGTH]; + TCHAR szFullCmdLine[CMDLINE_LENGTH]; PROCESS_INFORMATION prci; STARTUPINFO stui; #ifdef UNICODE @@ -303,6 +303,7 @@ nErrorLevel = (INT)dwExitCode; } CloseHandle (prci.hProcess); + /* Get New code page if it has change */ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP();

1 0

[hbelusca] 76008: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Part 3/x
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 21:05:49 2017 New Revision: 76008 URL: http://svn.reactos.org/svn/reactos?rev=76008&view=rev Log: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Part 3/x Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/color.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/console.h trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Sep 30 21:05:49 2017 @@ -1956,7 +1956,7 @@ } if (wDefColor != 0) - ConSetScreenColor(wDefColor, TRUE); + ConSetScreenColor(GetStdHandle(STD_OUTPUT_HANDLE), wDefColor, TRUE); #endif if (!*ptr) Modified: trunk/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/color.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/color.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/color.c [iso-8859-1] Sat Sep 30 21:05:49 2017 @@ -46,7 +46,7 @@ /* No parameter: Set the default colors */ if (rest[0] == _T('\0')) { - ConSetScreenColor(wDefColor, TRUE); + ConSetScreenColor(GetStdHandle(STD_OUTPUT_HANDLE), wDefColor, TRUE); return 0; } @@ -87,7 +87,8 @@ * Set the chosen color. Use also the following advanced flag: * /-F to avoid changing already buffered foreground/background. */ - if (ConSetScreenColor(wColor, !_tcsstr(rest, _T("/-F")) && !_tcsstr(rest, _T("/-f"))) == FALSE) + if (ConSetScreenColor(GetStdHandle(STD_OUTPUT_HANDLE), wColor, + !_tcsstr(rest, _T("/-F")) && !_tcsstr(rest, _T("/-f"))) == FALSE) { /* Failed because foreground and background colors were the same */ ConErrResPuts(STRING_COLOR_ERROR1); 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] Sat Sep 30 21:05:49 2017 @@ -21,7 +21,7 @@ #define OUTPUT_BUFFER_SIZE 4096 - +/* Cache codepage for text streams */ UINT InputCodePage; UINT OutputCodePage; @@ -342,7 +342,7 @@ /************************** Console PAGER functions ***************************/ -INT ConPrintfVPaging(DWORD nStdHandle, BOOL NewPage, LPTSTR szFormat, va_list arg_ptr) +BOOL ConPrintfVPaging(DWORD nStdHandle, BOOL NewPage, LPTSTR szFormat, va_list arg_ptr) { INT len; CONSOLE_SCREEN_BUFFER_INFO csbi; @@ -366,14 +366,14 @@ /* Reset LineCount and return if no string has been given */ if (szFormat == NULL) - return 0; + return TRUE; /* 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 */ ConPrintfV(nStdHandle, szFormat, arg_ptr); - return 0; + return TRUE; } /* @@ -387,7 +387,7 @@ if (ScreenLines < 4) { ConPrintfV(nStdHandle, szFormat, arg_ptr); - return 0; + return TRUE; } len = _vstprintf(szOut, szFormat, arg_ptr); @@ -408,9 +408,7 @@ /* Prompt the user */ if (PagePrompt() != PROMPT_YES) - { - return 1; - } + return FALSE; // TODO: Recalculate 'ScreenLines' in case the user redimensions // the window during the prompt. @@ -422,18 +420,18 @@ WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); - return 0; -} - -INT ConOutPrintfPaging(BOOL NewPage, LPTSTR szFormat, ...) -{ - INT iReturn; + return TRUE; +} + +BOOL ConOutPrintfPaging(BOOL NewPage, LPTSTR szFormat, ...) +{ + BOOL bRet; va_list arg_ptr; va_start(arg_ptr, szFormat); - iReturn = ConPrintfVPaging(STD_OUTPUT_HANDLE, NewPage, szFormat, arg_ptr); + bRet = ConPrintfVPaging(STD_OUTPUT_HANDLE, NewPage, szFormat, arg_ptr); va_end(arg_ptr); - return iReturn; + return bRet; } VOID ConOutResPaging(BOOL NewPage, UINT resID) @@ -557,9 +555,8 @@ #endif #ifdef INCLUDE_CMD_COLOR -BOOL ConSetScreenColor(WORD wColor, BOOL bFill) -{ - HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); +BOOL ConSetScreenColor(HANDLE hOutput, WORD wColor, BOOL bFill) +{ DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; @@ -571,11 +568,11 @@ /* Fill the whole background if needed */ if (bFill) { - GetConsoleScreenBufferInfo(hConsole, &csbi); + GetConsoleScreenBufferInfo(hOutput, &csbi); coPos.X = 0; coPos.Y = 0; - FillConsoleOutputAttribute(hConsole, + FillConsoleOutputAttribute(hOutput, wColor & 0x00FF, csbi.dwSize.X * csbi.dwSize.Y, coPos, @@ -583,7 +580,7 @@ } /* Set the text attribute */ - SetConsoleTextAttribute(hConsole, wColor & 0x00FF); + SetConsoleTextAttribute(hOutput, wColor & 0x00FF); return TRUE; } #endif Modified: trunk/reactos/base/shell/cmd/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.h [iso-8859-1] Sat Sep 30 21:05:49 2017 @@ -59,8 +59,8 @@ ConFormatMessage(STD_ERROR_HANDLE, (MessageId), ##__VA_ARGS__) -INT ConPrintfVPaging(DWORD nStdHandle, BOOL, LPTSTR, va_list); -INT ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); +BOOL ConPrintfVPaging(DWORD nStdHandle, BOOL, LPTSTR, va_list); +BOOL ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); VOID ConOutResPaging(BOOL NewPage, UINT resID); SHORT GetCursorX (VOID); @@ -83,7 +83,7 @@ #endif #ifdef INCLUDE_CMD_COLOR -BOOL ConSetScreenColor(WORD wColor, BOOL bFill); +BOOL ConSetScreenColor(HANDLE hOutput, WORD wColor, BOOL bFill); #endif // TCHAR cgetchar (VOID); 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] Sat Sep 30 21:05:49 2017 @@ -550,18 +550,18 @@ } /* Print either with or without paging, depending on /P switch */ -static INT +static BOOL DirPrintf(LPDIRSWITCHFLAGS lpFlags, LPTSTR szFormat, ...) { - INT iReturn = 0; + BOOL Done = TRUE; va_list arg_ptr; va_start(arg_ptr, szFormat); if (lpFlags->bPause) - iReturn = ConPrintfVPaging(STD_OUTPUT_HANDLE, FALSE, szFormat, arg_ptr); + Done = ConPrintfVPaging(STD_OUTPUT_HANDLE, FALSE, szFormat, arg_ptr); else ConPrintfV(STD_OUTPUT_HANDLE, szFormat, arg_ptr); va_end(arg_ptr); - return iReturn; + return Done; } @@ -1139,7 +1139,7 @@ if (!lpFlags->bBareFormat && !(lpFlags->bRecursive && (dwCount <= 0))) { LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, ARRAYSIZE(szMsg)); - if (DirPrintf(lpFlags, szMsg, szTemp)) + if (!DirPrintf(lpFlags, szMsg, szTemp)) return; } 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] Sat Sep 30 21:05:49 2017 @@ -107,7 +107,7 @@ { while (FileGetString(hFile, buff, ARRAYSIZE(buff))) { - if (ConOutPrintfPaging(bFirstTime, _T("%s"), buff) == 1) + if (!ConOutPrintfPaging(bFirstTime, _T("%s"), buff)) { bCtrlBreak = FALSE; CloseHandle(hFile);

1 0

[hbelusca] 76007: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Part 2/x
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 19:52:30 2017 New Revision: 76007 URL: http://svn.reactos.org/svn/reactos?rev=76007&view=rev Log: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Part 2/x Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/console.h trunk/reactos/base/shell/cmd/error.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] Sat Sep 30 19:52:30 2017 @@ -139,7 +139,7 @@ /******************** Console STREAM OUT utility functions ********************/ -static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle) +static VOID ConWrite(DWORD nStdHandle, TCHAR *str, DWORD len) { DWORD dwNumBytes = 0; HANDLE hOutput = GetStdHandle(nStdHandle); @@ -260,26 +260,26 @@ } } -VOID ConOutChar(TCHAR c) -{ - ConWrite(&c, 1, STD_OUTPUT_HANDLE); -} - -VOID ConPuts(LPTSTR szText, DWORD nStdHandle) -{ - ConWrite(szText, (DWORD)_tcslen(szText), nStdHandle); -} - -VOID ConOutResPuts(UINT resID) +VOID ConPuts(DWORD nStdHandle, LPTSTR szText) +{ + ConWrite(nStdHandle, szText, (DWORD)_tcslen(szText)); +} + +VOID ConResPuts(DWORD nStdHandle, UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPuts(szMsg, STD_OUTPUT_HANDLE); -} - -VOID ConOutPuts(LPTSTR szText) -{ - ConPuts(szText, STD_OUTPUT_HANDLE); + ConPuts(nStdHandle, szMsg); +} + +VOID ConOutChar(TCHAR c) +{ + ConWrite(STD_OUTPUT_HANDLE, &c, 1); +} + +VOID ConErrChar(TCHAR c) +{ + ConWrite(STD_ERROR_HANDLE, &c, 1); } VOID ConPrintfV(DWORD nStdHandle, LPTSTR szFormat, va_list arg_ptr) @@ -288,12 +288,31 @@ DWORD len; len = (DWORD)_vstprintf(szOut, szFormat, arg_ptr); - ConWrite(szOut, len, nStdHandle); -} - -VOID ConErrFormatMessage(DWORD MessageId, ...) + ConWrite(nStdHandle, szOut, len); +} + +VOID ConPrintf(DWORD nStdHandle, LPTSTR szFormat, ...) +{ + va_list arg_ptr; + + va_start(arg_ptr, szFormat); + ConPrintfV(nStdHandle, szFormat, arg_ptr); + va_end(arg_ptr); +} + +VOID ConResPrintf(DWORD nStdHandle, UINT resID, ...) { TCHAR szMsg[RC_STRING_MAX_SIZE]; + va_list arg_ptr; + + va_start(arg_ptr, resID); + LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); + ConPrintfV(nStdHandle, szMsg, arg_ptr); + va_end(arg_ptr); +} + +VOID ConFormatMessage(DWORD nStdHandle, DWORD MessageId, ...) +{ DWORD ret; LPTSTR text; va_list arg_ptr; @@ -303,107 +322,20 @@ NULL, MessageId, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &text, + (LPTSTR)&text, 0, &arg_ptr); - va_end(arg_ptr); + if (ret > 0) { - ConErrPuts(text); + ConPuts(nStdHandle, text); LocalFree(text); } else { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); - ConErrPrintf(szMsg); - } -} - -VOID ConOutFormatMessage(DWORD MessageId, ...) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - DWORD ret; - LPTSTR text; - va_list arg_ptr; - - va_start(arg_ptr, MessageId); - ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - MessageId, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &text, - 0, - &arg_ptr); - - va_end(arg_ptr); - if (ret > 0) - { - ConErrPuts(text); - LocalFree(text); - } - else - { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); - ConErrPrintf(szMsg); - } -} - -VOID ConOutResPrintf(UINT resID, ...) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - va_list arg_ptr; - - va_start(arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPrintfV(STD_OUTPUT_HANDLE, szMsg, arg_ptr); - va_end(arg_ptr); -} - -VOID ConOutPrintf(LPTSTR szFormat, ...) -{ - va_list arg_ptr; - - va_start(arg_ptr, szFormat); - ConPrintfV(STD_OUTPUT_HANDLE, szFormat, arg_ptr); - va_end(arg_ptr); -} - -VOID ConErrChar(TCHAR c) -{ - ConWrite(&c, 1, STD_ERROR_HANDLE); -} - -VOID ConErrResPuts(UINT resID) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPuts(szMsg, STD_ERROR_HANDLE); -} - -VOID ConErrPuts(LPTSTR szText) -{ - ConPuts(szText, STD_ERROR_HANDLE); -} - -VOID ConErrResPrintf(UINT resID, ...) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - va_list arg_ptr; - - va_start(arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPrintfV(STD_ERROR_HANDLE, szMsg, arg_ptr); - va_end(arg_ptr); -} - -VOID ConErrPrintf(LPTSTR szFormat, ...) -{ - va_list arg_ptr; - - va_start(arg_ptr, szFormat); - ConPrintfV(STD_ERROR_HANDLE, szFormat, arg_ptr); - va_end(arg_ptr); + ConResPrintf(nStdHandle, STRING_CONSOLE_ERROR, MessageId); + } } Modified: trunk/reactos/base/shell/cmd/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.h [iso-8859-1] Sat Sep 30 19:52:30 2017 @@ -17,17 +17,51 @@ VOID ConInKey (PINPUT_RECORD); VOID ConInString (LPTSTR, DWORD); + VOID ConOutChar (TCHAR); -VOID ConOutPuts (LPTSTR); +VOID ConErrChar (TCHAR); VOID ConPrintfV(DWORD, LPTSTR, va_list); + +VOID ConPuts(DWORD nStdHandle, LPTSTR szText); +VOID ConPrintf(DWORD nStdHandle, LPTSTR szFormat, ...); +VOID ConResPuts(DWORD nStdHandle, UINT resID); +VOID ConResPrintf(DWORD nStdHandle, UINT resID, ...); +VOID ConFormatMessage(DWORD nStdHandle, DWORD MessageId, ...); + +#define ConOutPuts(szStr) \ + ConPuts(STD_OUTPUT_HANDLE, (szStr)) + +#define ConErrPuts(szStr) \ + ConPuts(STD_ERROR_HANDLE, (szStr)) + +#define ConOutResPuts(uID) \ + ConResPuts(STD_OUTPUT_HANDLE, (uID)) + +#define ConErrResPuts(uID) \ + ConResPuts(STD_ERROR_HANDLE, (uID)) + +#define ConOutPrintf(szStr, ...) \ + ConPrintf(STD_OUTPUT_HANDLE, (szStr), ##__VA_ARGS__) + +#define ConErrPrintf(szStr, ...) \ + ConPrintf(STD_ERROR_HANDLE, (szStr), ##__VA_ARGS__) + +#define ConOutResPrintf(uID, ...) \ + ConResPrintf(STD_OUTPUT_HANDLE, (uID), ##__VA_ARGS__) + +#define ConErrResPrintf(uID, ...) \ + ConResPrintf(STD_ERROR_HANDLE, (uID), ##__VA_ARGS__) + +#define ConOutFormatMessage(MessageId, ...) \ + ConFormatMessage(STD_OUTPUT_HANDLE, (MessageId), ##__VA_ARGS__) + +#define ConErrFormatMessage(MessageId, ...) \ + ConFormatMessage(STD_ERROR_HANDLE, (MessageId), ##__VA_ARGS__) + + INT ConPrintfVPaging(DWORD nStdHandle, BOOL, LPTSTR, va_list); -VOID ConOutPrintf (LPTSTR, ...); INT ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); -VOID ConErrChar (TCHAR); -VOID ConErrPuts (LPTSTR); -VOID ConErrPrintf (LPTSTR, ...); -VOID ConOutFormatMessage (DWORD MessageId, ...); -VOID ConErrFormatMessage (DWORD MessageId, ...); +VOID ConOutResPaging(BOOL NewPage, UINT resID); SHORT GetCursorX (VOID); SHORT GetCursorY (VOID); @@ -36,12 +70,6 @@ VOID GetScreenSize (PSHORT, PSHORT); VOID SetCursorType (BOOL, BOOL); - -VOID ConOutResPuts (UINT resID); -VOID ConErrResPuts (UINT resID); -VOID ConOutResPrintf (UINT resID, ...); -VOID ConErrResPrintf (UINT resID, ...); -VOID ConOutResPaging(BOOL NewPage, UINT resID); BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle); Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Sat Sep 30 19:52:30 2017 @@ -53,6 +53,7 @@ } /* Fall back just in case the error is not defined */ + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); if (szFormat) ConErrPrintf(_T("%s -- %s\n"), szMsg, szMessage); else

1 0

[dquintana] 76006: [FATTEN] Fix copypasta.
by dquintana＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: dquintana Date: Sat Sep 30 19:19:30 2017 New Revision: 76006 URL: http://svn.reactos.org/svn/reactos?rev=76006&view=rev Log: [FATTEN] Fix copypasta. Modified: trunk/reactos/sdk/tools/fatten/fatten.c Modified: trunk/reactos/sdk/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/fatten/fatten.c?… ============================================================================== --- trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] Sat Sep 30 19:19:30 2017 @@ -138,7 +138,7 @@ // first parameter must be the image file. if (argc == 0) { - fprintf(stderr, "Error: First parameter must be a filename.\n", argv[0]); + fprintf(stderr, "Error: First parameter must be a filename.\n"); PRINT_HELP_AND_QUIT(); }

1 0

[dquintana] 76005: [FATTEN] Improve the error checking and error messages a bit.
by dquintana＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: dquintana Date: Sat Sep 30 19:11:22 2017 New Revision: 76005 URL: http://svn.reactos.org/svn/reactos?rev=76005&view=rev Log: [FATTEN] Improve the error checking and error messages a bit. Modified: trunk/reactos/sdk/tools/fatten/fatten.c Modified: trunk/reactos/sdk/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/fatten/fatten.c?… ============================================================================== --- trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] Sat Sep 30 19:11:22 2017 @@ -103,8 +103,8 @@ #define NEED_PARAMS(_min_, _max_) \ do {\ - if (nargs < _min_) { printf("Too few args for command %s.\n" , argv[-1]); PRINT_HELP_AND_QUIT(); } \ - if (nargs > _max_) { printf("Too many args for command %s.\n", argv[-1]); PRINT_HELP_AND_QUIT(); } \ + if (nargs < _min_) { fprintf(stderr, "Error: Too few args for command %s.\n" , argv[-1]); PRINT_HELP_AND_QUIT(); } \ + if (nargs > _max_) { fprintf(stderr, "Error: Too many args for command %s.\n", argv[-1]); PRINT_HELP_AND_QUIT(); } \ } while(0) int need_mount(void) @@ -125,7 +125,7 @@ #define NEED_MOUNT() \ do { ret = need_mount(); if(ret) \ {\ - printf("Error: could not mount disk (%d).\n", ret); \ + fprintf(stderr, "Error: Could not mount disk (%d).\n", ret); \ goto exit; \ } } while(0) @@ -138,18 +138,19 @@ // first parameter must be the image file. if (argc == 0) { + fprintf(stderr, "Error: First parameter must be a filename.\n", argv[0]); PRINT_HELP_AND_QUIT(); } if (is_command(argv[0])) { - printf("Error: first parameter must be a filename, found '%s' instead.\n", argv[0]); + fprintf(stderr, "Error: First parameter must be a filename, found '%s' instead.\n", argv[0]); PRINT_HELP_AND_QUIT(); } if (disk_openimage(0, argv[0])) { - printf("Error: could not open image file '%s'.\n", argv[0]); + fprintf(stderr, "Error: Could not open image file '%s'.\n", argv[0]); ret = 1; goto exit; } @@ -165,7 +166,7 @@ if (!is_command(parg)) { - printf("Error: Expected a command, found '%s' instead.\n", parg); + fprintf(stderr, "Error: Expected a command, found '%s' instead.\n", parg); PRINT_HELP_AND_QUIT(); } @@ -189,19 +190,24 @@ if (sectors <= 0) { - printf("Error: Sectors must be > 0\n"); - ret = 1; - goto exit; - } - - disk_ioctl(0, SET_SECTOR_COUNT, &sectors); + fprintf(stderr, "Error: Sectors must be > 0\n"); + ret = 1; + goto exit; + } + + if (disk_ioctl(0, SET_SECTOR_COUNT, &sectors)) + { + fprintf(stderr, "Error: Failed to set sector count to %d.\n", sectors); + ret = 1; + goto exit; + } NEED_MOUNT(); ret = f_mkfs("0:", 1, sectors < 4096 ? 1 : 8); if (ret) { - printf("ERROR: Formatting drive: %d.\n", ret); + fprintf(stderr, "Error: Formatting drive: %d.\n", ret); goto exit; } @@ -248,14 +254,14 @@ if (invalid) { - printf("Error: header label is limited to 11 printable uppercase ASCII symbols."); + fprintf(stderr, "Error: Header label is limited to 11 printable uppercase ASCII symbols."); ret = 1; goto exit; } if (disk_read(0, buff, 0, 1)) { - printf("Error: unable to read existing boot sector from image."); + fprintf(stderr, "Error: Unable to read existing boot sector from image."); ret = 1; goto exit; } @@ -271,7 +277,7 @@ if (disk_write(0, buff, 0, 1)) { - printf("Error: unable to write new boot sector to image."); + fprintf(stderr, "Error: Unable to write new boot sector to image."); ret = 1; goto exit; } @@ -279,7 +285,12 @@ // Set also the directory volume label memcpy(vol_label, "0:", 2); vol_label[2 + FAT_VOL_LABEL_LEN] = '\0'; - f_setlabel(vol_label); + if (f_setlabel(vol_label)) + { + fprintf(stderr, "Error: Unable to set the volume label."); + ret = 1; + goto exit; + } } } else if (strcmp(parg, "boot") == 0) @@ -294,14 +305,14 @@ fe = fopen(argv[0], "rb"); if (!fe) { - printf("Error: unable to open external file '%s' for reading.", argv[0]); + fprintf(stderr, "Error: Unable to open external file '%s' for reading.", argv[0]); ret = 1; goto exit; } if (!fread(buff, 512, 1, fe)) { - printf("Error: unable to read boot sector from file '%s'.", argv[0]); + fprintf(stderr, "Error: Unable to read boot sector from file '%s'.", argv[0]); fclose(fe); ret = 1; goto exit; @@ -313,14 +324,14 @@ if (disk_read(0, temp, 0, 1)) { - printf("Error: unable to read existing boot sector from image."); + fprintf(stderr, "Error: Unable to read existing boot sector from image."); ret = 1; goto exit; } if (g_Filesystem.fs_type == FS_FAT32) { - printf("TODO: writing boot sectors for FAT32 images not yet supported."); + printf("TODO: Writing boot sectors for FAT32 images not yet supported."); ret = 1; goto exit; } @@ -334,7 +345,7 @@ if (disk_write(0, buff, 0, 1)) { - printf("Error: unable to write new boot sector to image."); + fprintf(stderr, "Error: Unable to write new boot sector to image."); ret = 1; goto exit; } @@ -356,14 +367,14 @@ fe = fopen(argv[0], "rb"); if (!fe) { - printf("Error: unable to open external file '%s' for reading.", argv[0]); + fprintf(stderr, "Error: Unable to open external file '%s' for reading.", argv[0]); ret = 1; goto exit; } if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS)) { - printf("Error: unable to open file '%s' for writing.", argv[1]); + fprintf(stderr, "Error: Unable to open file '%s' for writing.", argv[1]); fclose(fe); ret = 1; goto exit; @@ -371,7 +382,12 @@ while ((rdlen = fread(buff, 1, sizeof(buff), fe)) > 0) { - f_write(&fv, buff, rdlen, &wrlen); + if (f_write(&fv, buff, rdlen, &wrlen) || wrlen < rdlen) + { + fprintf(stderr, "Error: Unable to write '%d' bytes to disk.", wrlen); + ret = 1; + goto exit; + } } fclose(fe); @@ -393,7 +409,7 @@ if (f_open(&fe, argv[0], FA_READ)) { - printf("Error: unable to open file '%s' for reading.", argv[0]); + fprintf(stderr, "Error: Unable to open file '%s' for reading.", argv[0]); ret = 1; goto exit; } @@ -401,7 +417,7 @@ fv = fopen(argv[1], "wb"); if (!fv) { - printf("Error: unable to open external file '%s' for writing.", argv[1]); + fprintf(stderr, "Error: Unable to open external file '%s' for writing.", argv[1]); f_close(&fe); ret = 1; goto exit; @@ -409,7 +425,12 @@ while ((f_read(&fe, buff, sizeof(buff), &rdlen) == 0) && (rdlen > 0)) { - fwrite(buff, 1, rdlen, fv); + if (fwrite(buff, 1, rdlen, fv) < rdlen) + { + fprintf(stderr, "Error: Unable to write '%d' bytes to file.", rdlen); + ret = 1; + goto exit; + } } f_close(&fe); @@ -424,7 +445,11 @@ // Arg 2: new path & filename if (f_rename(argv[0], argv[1])) - printf("Error moving/renaming '%s' to '%s'", argv[0], argv[1]); + { + fprintf(stderr, "Error: Unable to move/rename '%s' to '%s'", argv[0], argv[1]); + ret = 1; + goto exit; + } } else if (strcmp(parg, "copy") == 0) { @@ -441,13 +466,13 @@ if (f_open(&fe, argv[0], FA_READ)) { - printf("Error: unable to open file '%s' for reading.", argv[0]); + fprintf(stderr, "Error: Unable to open file '%s' for reading.", argv[0]); ret = 1; goto exit; } if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS)) { - printf("Error: unable to open file '%s' for writing.", argv[1]); + fprintf(stderr, "Error: Unable to open file '%s' for writing.", argv[1]); f_close(&fe); ret = 1; goto exit; @@ -455,7 +480,12 @@ while ((f_read(&fe, buff, sizeof(buff), &rdlen) == 0) && (rdlen > 0)) { - f_write(&fv, buff, rdlen, &wrlen); + if (f_write(&fv, buff, rdlen, &wrlen) || wrlen < rdlen) + { + fprintf(stderr, "Error: Unable to write '%d' bytes to disk.", wrlen); + ret = 1; + goto exit; + } } f_close(&fe); @@ -468,7 +498,12 @@ NEED_MOUNT(); // Arg 1: folder path - f_mkdir(argv[0]); + if (f_mkdir(argv[0])) + { + fprintf(stderr, "Error: Unable to create directory."); + ret = 1; + goto exit; + } } else if (strcmp(parg, "delete") == 0) { @@ -477,7 +512,12 @@ NEED_MOUNT(); // Arg 1: file/folder path (cannot delete non-empty folders) - f_unlink(argv[0]); + if (f_unlink(argv[0])) + { + fprintf(stderr, "Error: Unable to delete file or directory."); + ret = 1; + goto exit; + } } else if (strcmp(parg, "list") == 0) { @@ -497,7 +537,7 @@ if (f_opendir(&dir, root)) { - printf("Error opening directory '%s'.\n", root); + fprintf(stderr, "Error: Unable to opening directory '%s' for listing.\n", root); ret = 1; goto exit; } @@ -516,7 +556,7 @@ } else { - printf("Error: Unknown or invalid command: %s\n", argv[-1]); + fprintf(stderr, "Error: Unknown or invalid command: %s\n", argv[-1]); PRINT_HELP_AND_QUIT(); } argv += nargs;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs