Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[tkreuzer] 76015: [VGA_NEW] Remove duplicated enable.c from CMakeLists.txt

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 1 10:25:05 2017 New Revision: 76015 URL: http://svn.reactos.org/svn/reactos?rev=76015&view=rev Log: [VGA_NEW] Remove duplicated enable.c from CMakeLists.txt Modified: trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt [iso-8859-1] Sun Oct 1 10:25:05 2017 @@ -2,7 +2,6 @@ list(APPEND SOURCE enable.c debug.c - enable.c palette.c screen.c)

6 years, 11 months

[tkreuzer] 76014: [VGA_NEW] Add CMakeLists.txt and fix build

by tkreuzer＠svn.reactos.org

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;

6 years, 11 months

[tkreuzer] 76013: [INTRIN] Add missing _cdecl attributes

by tkreuzer＠svn.reactos.org

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"); }

6 years, 11 months

[pschweitzer] 76012: [KERNEL32] Implement GetVolumePathNamesForVolumeNameW()

by pschweitzer＠svn.reactos.org

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 */

6 years, 11 months

[tkreuzer] 76011: [GDI32] Remove obsolete function GdiIsHandleValid, which is just a copy of GdiValidateHandle

by tkreuzer＠svn.reactos.org

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;

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017