Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56675: [NTDLL_APITEST] Add tests for rtl bitmap function
by tkreuzer＠svn.reactos.org 29 May '12

29 May '12

Author: tkreuzer Date: Tue May 29 18:46:25 2012 New Revision: 56675 URL: http://svn.reactos.org/svn/reactos?rev=56675&view=rev Log: [NTDLL_APITEST] Add tests for rtl bitmap function Added: trunk/rostests/apitests/ntdll/RtlBitmap.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Tue May 29 18:46:25 2012 @@ -2,6 +2,7 @@ list(APPEND SOURCE NtAllocateVirtualMemory.c NtFreeVirtualMemory.c + RtlBitmap.c RtlDetermineDosPathNameType.c RtlDoesFileExists.c RtlDosSearchPath_U.c Added: trunk/rostests/apitests/ntdll/RtlBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlBitmap.… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlBitmap.c (added) +++ trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] Tue May 29 18:46:25 2012 @@ -1,0 +1,512 @@ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/rtlfuncs.h> +#include <pseh/pseh2.h> + +void +Test_RtlFindMostSignificantBit(void) +{ + ok_int(RtlFindMostSignificantBit(0), -1); + + ok_int(RtlFindMostSignificantBit(0x0000000000000001ULL), 0); + ok_int(RtlFindMostSignificantBit(0x0000000000000002ULL), 1); + ok_int(RtlFindMostSignificantBit(0x1000000000000000ULL), 60); + ok_int(RtlFindMostSignificantBit(0x8000000000000000ULL), 63); + ok_int(RtlFindMostSignificantBit(0x8000000000000001ULL), 63); + ok_int(RtlFindMostSignificantBit(0xFFFFFFFFFFFFFFFFULL), 63); + ok_int(RtlFindMostSignificantBit(0x0000000070000000ULL), 30); +} + +void +Test_RtlFindLeastSignificantBit(void) +{ + ok_int(RtlFindLeastSignificantBit(0), -1); + + ok_int(RtlFindLeastSignificantBit(0x0000000000000001ULL), 0); + ok_int(RtlFindLeastSignificantBit(0x0000000000000002ULL), 1); + ok_int(RtlFindLeastSignificantBit(0x1000000000000000ULL), 60); + ok_int(RtlFindLeastSignificantBit(0x8000000000000000ULL), 63); + ok_int(RtlFindLeastSignificantBit(0x8000000000000000ULL), 63); + ok_int(RtlFindLeastSignificantBit(0xFFFFFFFFFFFFFFFFULL), 0); + ok_int(RtlFindLeastSignificantBit(0x0000000070000000ULL), 28); +} + +void +Test_RtlInitializeBitMap(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + BOOLEAN Exception = FALSE; + + _SEH2_TRY + { + RtlInitializeBitMap(NULL, NULL, 0); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Exception = TRUE; + } + _SEH2_END; + ok_int(Exception, 1); + + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(BitMapHeader.SizeOfBitMap, 0); + ok_ptr(BitMapHeader.Buffer, Buffer); + ok_hex(Buffer[0], 0xcccccccc); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(BitMapHeader.SizeOfBitMap, 8); + ok_hex(Buffer[0], 0xcccccccc); +} + +void +Test_RtlClearAllBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlClearAllBits(&BitMapHeader); + ok_hex(Buffer[0], 0x00000000); + ok_hex(Buffer[1], 0xcccccccc); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlClearAllBits(&BitMapHeader); + ok_hex(Buffer[0], 0xcccccccc); + ok_hex(Buffer[1], 0xcccccccc); +} + +void +Test_RtlSetAllBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlSetAllBits(&BitMapHeader); + ok_hex(Buffer[0], 0xffffffff); + ok_hex(Buffer[1], 0xcccccccc); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlSetAllBits(&BitMapHeader); + ok_hex(Buffer[0], 0xcccccccc); + ok_hex(Buffer[1], 0xcccccccc); +} + +void +Test_RtlClearBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 0, 0); + ok_hex(Buffer[0], 0xffffffff); + ok_hex(Buffer[1], 0xffffffff); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 0, 1); + ok_hex(Buffer[0], 0xfffffffe); + ok_hex(Buffer[1], 0xffffffff); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 21, 1); + ok_hex(Buffer[0], 0xffdfffff); + ok_hex(Buffer[1], 0xffffffff); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 7, 9); + ok_hex(Buffer[0], 0xffff007f); + ok_hex(Buffer[1], 0xffffffff); + + memset(Buffer, 0xff, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 13, 22); + ok_hex(Buffer[0], 0x00001fff); + ok_hex(Buffer[1], 0xfffffff8); + + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlClearBits(&BitMapHeader, 3, 6); + RtlClearBits(&BitMapHeader, 11, 5); + RtlClearBits(&BitMapHeader, 21, 7); + RtlClearBits(&BitMapHeader, 37, 4); + ok_hex(Buffer[0], 0xc00c0404); + ok_hex(Buffer[1], 0xcccccc0c); +} + +void +Test_RtlSetBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 0, 0); + ok_hex(Buffer[0], 0x00000000); + ok_hex(Buffer[1], 0x00000000); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 0, 1); + ok_hex(Buffer[0], 0x00000001); + ok_hex(Buffer[1], 0x00000000); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 21, 1); + ok_hex(Buffer[0], 0x00200000); + ok_hex(Buffer[1], 0x00000000); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 7, 9); + ok_hex(Buffer[0], 0x0000ff80); + ok_hex(Buffer[1], 0x00000000); + + memset(Buffer, 0x00, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 13, 22); + ok_hex(Buffer[0], 0xffffe000); + ok_hex(Buffer[1], 0x00000007); + + memset(Buffer, 0xcc, sizeof(Buffer)); + RtlSetBits(&BitMapHeader, 3, 6); + RtlSetBits(&BitMapHeader, 11, 5); + RtlSetBits(&BitMapHeader, 21, 7); + RtlSetBits(&BitMapHeader, 37, 4); + ok_hex(Buffer[0], 0xcfecfdfc); + ok_hex(Buffer[1], 0xcccccdec); +} + +void +Test_RtlAreBitsClear(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + Buffer[0] = 0x00ff00ff; + Buffer[1] = 0xc0cfc0cf; + + ok_hex(RtlAreBitsClear(&BitMapHeader, 0, 8), FALSE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 8, 8), TRUE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 7, 8), FALSE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 8, 9), FALSE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 24, 1), FALSE); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 31); + ok_hex(RtlAreBitsClear(&BitMapHeader, 24, 1), TRUE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 24, 7), TRUE); + ok_hex(RtlAreBitsClear(&BitMapHeader, 24, 8), FALSE); + +} + +void +Test_RtlAreBitsSet(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 19); + Buffer[0] = 0xff00ff00; + Buffer[1] = 0x3F303F30; + + ok_hex(RtlAreBitsSet(&BitMapHeader, 0, 8), FALSE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 8, 8), TRUE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 7, 8), FALSE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 8, 9), FALSE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 24, 1), FALSE); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 31); + ok_hex(RtlAreBitsSet(&BitMapHeader, 24, 1), TRUE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 24, 7), TRUE); + ok_hex(RtlAreBitsSet(&BitMapHeader, 24, 8), FALSE); + +} + +void +Test_RtlNumberOfSetBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0xff00ff0f; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlNumberOfSetBits(&BitMapHeader), 0); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 4); + ok_int(RtlNumberOfSetBits(&BitMapHeader), 4); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 31); + ok_int(RtlNumberOfSetBits(&BitMapHeader), 19); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 56); + ok_int(RtlNumberOfSetBits(&BitMapHeader), 30); +} + +void +Test_RtlNumberOfClearBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0xff00fff0; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlNumberOfClearBits(&BitMapHeader), 0); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 4); + ok_int(RtlNumberOfClearBits(&BitMapHeader), 4); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 31); + ok_int(RtlNumberOfClearBits(&BitMapHeader), 12); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 56); + ok_int(RtlNumberOfClearBits(&BitMapHeader), 26); +} + +void +Test_RtlFindClearBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0x060F874D; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 0), 0); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 0), -1); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 1), -1); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 0), 1); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 1), 1); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 2), 4); + + ok_int(RtlFindClearBits(&BitMapHeader, 2, 0), 4); + ok_int(RtlFindClearBits(&BitMapHeader, 3, 0), -1); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindClearBits(&BitMapHeader, 4, 0), 11); + ok_int(RtlFindClearBits(&BitMapHeader, 5, 0), 20); + ok_int(RtlFindClearBits(&BitMapHeader, 4, 11), 11); + ok_int(RtlFindClearBits(&BitMapHeader, 4, 12), 20); + ok_int(RtlFindClearBits(&BitMapHeader, 2, 11), 11); + ok_int(RtlFindClearBits(&BitMapHeader, 2, 12), 12); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 12), 8); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 39), 0); + +} + +void +Test_RtlFindSetBits(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0xF9F078B2; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 0), 0); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 0), -1); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 1), -1); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 0), 1); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 1), 1); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 2), 4); + + ok_int(RtlFindSetBits(&BitMapHeader, 2, 0), 4); + ok_int(RtlFindSetBits(&BitMapHeader, 3, 0), -1); + + RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindSetBits(&BitMapHeader, 4, 0), 11); + ok_int(RtlFindSetBits(&BitMapHeader, 5, 0), 20); + ok_int(RtlFindSetBits(&BitMapHeader, 4, 11), 11); + ok_int(RtlFindSetBits(&BitMapHeader, 4, 12), 20); + ok_int(RtlFindSetBits(&BitMapHeader, 2, 11), 11); + ok_int(RtlFindSetBits(&BitMapHeader, 2, 12), 12); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 12), 8); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 39), 0); + +} + +void +Test_RtlFindClearBitsAndSet(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0x060F874D; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 0, 0), 0); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 0), -1); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 1), -1); + ok_hex(Buffer[0], 0x060F874D); + + Buffer[0] = 0x060F874D; + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 0), 1); + ok_hex(Buffer[0], 0x60f874f); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 1), 4); + ok_hex(Buffer[0], 0x60f875f); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 1, 2), 5); + ok_hex(Buffer[0], 0x60f877f); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 2, 0), -1); + ok_hex(Buffer[0], 0x60f877f); + + Buffer[0] = 0x060F874D; + RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 4, 0), 11); + ok_hex(Buffer[0], 0x60fff4d); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 5, 0), 20); + ok_hex(Buffer[0], 0x7ffff4d); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 4, 11), 27); + ok_hex(Buffer[0], 0x7fffff4d); + + Buffer[0] = 0x060F874D; + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 4, 12), 20); + ok_hex(Buffer[0], 0x6ff874d); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 2, 11), 11); + ok_hex(Buffer[0], 0x6ff9f4d); + ok_int(RtlFindClearBitsAndSet(&BitMapHeader, 2, 12), 13); + ok_hex(Buffer[0], 0x6ffff4d); +} + +void +Test_RtlFindSetBitsAndClear(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + + Buffer[0] = 0xF9F078B2; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 0, 0), 0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 0), -1); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 1), -1); + ok_hex(Buffer[0], 0xF9F078B2); + + Buffer[0] = 0xF9F078B2; + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 0), 1); + ok_hex(Buffer[0], 0xf9f078b0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 1), 4); + ok_hex(Buffer[0], 0xf9f078a0); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 1, 2), 5); + ok_hex(Buffer[0], 0xf9f07880); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 2, 0), -1); + ok_hex(Buffer[0], 0xf9f07880); + + Buffer[0] = 0xF9F078B2; + RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 4, 0), 11); + ok_hex(Buffer[0], 0xf9f000b2); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 5, 0), 20); + ok_hex(Buffer[0], 0xf80000b2); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 4, 11), 27); + ok_hex(Buffer[0], 0x800000b2); + + Buffer[0] = 0xF9F078B2; + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 4, 12), 20); + ok_hex(Buffer[0], 0xf90078b2); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 2, 11), 11); + ok_hex(Buffer[0], 0xf90060b2); + ok_int(RtlFindSetBitsAndClear(&BitMapHeader, 2, 12), 13); + ok_hex(Buffer[0], 0xf90000b2); + +} + +void +Test_RtlFindNextForwardRunClear(void) +{ + RTL_BITMAP BitMapHeader; + ULONG Buffer[2]; + ULONG Index; + + Buffer[0] = 0xF9F078B2; + Buffer[1] = 0x3F303F30; + + RtlInitializeBitMap(&BitMapHeader, Buffer, 0); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 0, &Index), 0); + ok_int(Index, 0); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 1, &Index), 0); + ok_int(Index, 1); + + Index = -1; + RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 0, &Index), 1); + ok_int(Index, 0); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 1, &Index), 2); + ok_int(Index, 2); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 7, &Index), 0); + ok_int(Index, 8); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 17, &Index), 0); + ok_int(Index, 17); + ok_int(RtlFindNextForwardRunClear(&BitMapHeader, 39, &Index), 0); + ok_int(Index, 39); +} + +void +Test_RtlFindFirstRunClear(void) +{ +} + +void +Test_RtlFindLastBackwardRunClear(void) +{ +} + +void +Test_RtlFindClearRuns(void) +{ +} + +void +Test_RtlFindLongestRunClear(void) +{ +} + + +START_TEST(RtlBitmap) +{ + Test_RtlFindMostSignificantBit(); + Test_RtlFindLeastSignificantBit(); + Test_RtlInitializeBitMap(); + Test_RtlClearAllBits(); + Test_RtlSetAllBits(); + Test_RtlClearBits(); + Test_RtlSetBits(); + Test_RtlAreBitsClear(); + Test_RtlAreBitsSet(); + Test_RtlNumberOfSetBits(); + Test_RtlNumberOfClearBits(); + Test_RtlFindClearBits(); + Test_RtlFindSetBits(); + Test_RtlFindClearBitsAndSet(); + Test_RtlFindSetBitsAndClear(); + Test_RtlFindNextForwardRunClear(); + Test_RtlFindFirstRunClear(); + Test_RtlFindLastBackwardRunClear(); + Test_RtlFindClearRuns(); + Test_RtlFindLongestRunClear(); +} + Propchange: trunk/rostests/apitests/ntdll/RtlBitmap.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Tue May 29 18:46:25 2012 @@ -8,6 +8,7 @@ extern void func_NtAllocateVirtualMemory(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtSystemInformation(void); +extern void func_RtlBitmap(void); extern void func_RtlDetermineDosPathNameType(void); extern void func_RtlDoesFileExists(void); extern void func_RtlDosSearchPath_U(void); @@ -24,6 +25,7 @@ { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtSystemInformation", func_NtSystemInformation }, + { "RtlBitmap", func_RtlBitmap }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType }, { "RtlDoesFileExists", func_RtlDoesFileExists }, { "RtlDosSearchPath_U", func_RtlDosSearchPath_U },

1 0

[tkreuzer] 56674: [NDK] Add missing rtl bitmap functions
by tkreuzer＠svn.reactos.org 29 May '12

29 May '12

Author: tkreuzer Date: Tue May 29 18:40:41 2012 New Revision: 56674 URL: http://svn.reactos.org/svn/reactos?rev=56674&view=rev Log: [NDK] Add missing rtl bitmap functions Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue May 29 18:40:41 2012 @@ -2872,6 +2872,13 @@ NTSYSAPI VOID NTAPI +RtlClearAllBits( + IN OUT PRTL_BITMAP BitMapHeader +); + +NTSYSAPI +VOID +NTAPI RtlClearBits( IN PRTL_BITMAP BitMapHeader, IN ULONG StartingIndex, @@ -2897,6 +2904,20 @@ ); NTSYSAPI +CCHAR +NTAPI +RtlFindLeastSignificantBit( + IN ULONGLONG Value +); + +NTSYSAPI +CCHAR +NTAPI +RtlFindMostSignificantBit( + IN ULONGLONG Value +); + +NTSYSAPI ULONG NTAPI RtlFindNextForwardRunClear( @@ -2906,12 +2927,46 @@ ); NTSYSAPI +ULONG +NTAPI +RtlFindNextForwardRunSet( + IN PRTL_BITMAP BitMapHeader, + IN ULONG FromIndex, + IN PULONG StartingRunIndex +); + +NTSYSAPI +ULONG +NTAPI +RtlFindSetBits( + IN PRTL_BITMAP BitMapHeader, + IN ULONG NumberToFind, + IN ULONG HintIndex +); + +NTSYSAPI +ULONG +NTAPI +RtlFindSetBitsAndClear( + IN PRTL_BITMAP BitMapHeader, + IN ULONG NumberToFind, + IN ULONG HintIndex +); + +NTSYSAPI VOID NTAPI RtlInitializeBitMap( IN PRTL_BITMAP BitMapHeader, IN PULONG BitMapBuffer, IN ULONG SizeOfBitMap +); + +NTSYSAPI +ULONG +NTAPI +RtlNumberOfClearBits( + IN PRTL_BITMAP BitMapHeader ); NTSYSAPI

1 0

[jimtabor] 56673: [Win32k] - Don't check for send nonclient paint messages and bump up the paint count. This may spell the end of the PAINTING BUG spam.
by jimtabor＠svn.reactos.org 29 May '12

29 May '12

Author: jimtabor Date: Tue May 29 11:57:24 2012 New Revision: 56673 URL: http://svn.reactos.org/svn/reactos?rev=56673&view=rev Log: [Win32k] - Don't check for send nonclient paint messages and bump up the paint count. This may spell the end of the PAINTING BUG spam. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Tue May 29 11:57:24 2012 @@ -594,8 +594,7 @@ { return ( Wnd->style & WS_VISIBLE && ( Wnd->hrgnUpdate != NULL || - Wnd->state & WNDS_INTERNALPAINT || - Wnd->state & WNDS_SENDNCPAINT ) ); + Wnd->state & WNDS_INTERNALPAINT ) ); } PWND FASTCALL

1 0

[ekohl] 56672: [SAMLIB][SAMSRV] - Implement SamCreateUserInDomain and SamrCreateUserInDomain. - SamOpenDomain: Use the correct object types when trying to open a domain object.
by ekohl＠svn.reactos.org 28 May '12

28 May '12

Author: ekohl Date: Mon May 28 22:47:52 2012 New Revision: 56672 URL: http://svn.reactos.org/svn/reactos?rev=56672&view=rev Log: [SAMLIB][SAMSRV] - Implement SamCreateUserInDomain and SamrCreateUserInDomain. - SamOpenDomain: Use the correct object types when trying to open a domain object. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Mon May 28 22:47:52 2012 @@ -433,6 +433,36 @@ NTSTATUS NTAPI +SamCreateUserInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE UserHandle, + OUT PULONG RelativeId) +{ + NTSTATUS Status; + + TRACE("SamCreateUserInDomain(%p,%p,0x%08x,%p,%p)\n", + DomainHandle, AccountName, DesiredAccess, UserHandle, RelativeId); + + RpcTryExcept + { + Status = SamrCreateUserInDomain((SAMPR_HANDLE)DomainHandle, + (PRPC_UNICODE_STRING)AccountName, + DesiredAccess, + (SAMPR_HANDLE *)UserHandle, + RelativeId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + +NTSTATUS +NTAPI SamOpenDomain(IN SAM_HANDLE ServerHandle, IN ACCESS_MASK DesiredAccess, IN PSID DomainId, Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Mon May 28 22:47:52 2012 @@ -10,7 +10,7 @@ @ stub SamCreateAliasInDomain @ stub SamCreateGroupInDomain @ stub SamCreateUser2InDomain -@ stub SamCreateUserInDomain +@ stdcall SamCreateUserInDomain(ptr ptr long ptr ptr) @ stub SamDeleteAlias @ stub SamDeleteGroup @ stub SamDeleteUser Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Mon May 28 22:47:52 2012 @@ -603,6 +603,151 @@ NTSTATUS +SampSetDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAliasName, + IN ULONG ulAliasValue) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE ContainerKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + NTSTATUS Status; + + /* Open the container key */ + RtlInitUnicodeString(&KeyName, lpContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DomainObject->KeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open the 'Names' key */ + RtlInitUnicodeString(&KeyName, L"Names"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&NamesKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the alias value */ + RtlInitUnicodeString(&ValueName, lpAliasName); + + Status = NtSetValueKey(NamesKeyHandle, + &ValueName, + 0, + REG_DWORD, + (LPVOID)&ulAliasValue, + sizeof(ULONG)); + +done: + if (NamesKeyHandle) + NtClose(NamesKeyHandle); + + if (ContainerKeyHandle) + NtClose(ContainerKeyHandle); + + return Status; +} + + +NTSTATUS +SampCheckDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAliasName, + OUT PBOOL bAliasExists) +{ + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE ContainerKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + ULONG BufferLength = sizeof(ULONG); + NTSTATUS Status; + + /* Open the container key */ + RtlInitUnicodeString(&KeyName, lpContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DomainObject->KeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open the 'Names' key */ + RtlInitUnicodeString(&KeyName, L"Names"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&NamesKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the alias value */ + RtlInitUnicodeString(&ValueName, lpAliasName); + + BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Allocate memory for the value */ + ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (ValueInfo == NULL) + return STATUS_NO_MEMORY; + + /* Query the value */ + Status = ZwQueryValueKey(NamesKeyHandle, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &BufferLength); + + *bAliasExists = (Status != STATUS_OBJECT_NAME_NOT_FOUND); + + Status = STATUS_SUCCESS; + + /* Free the memory and return status */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + +done: + if (NamesKeyHandle) + NtClose(NamesKeyHandle); + + if (ContainerKeyHandle) + NtClose(ContainerKeyHandle); + + return Status; +} + + +NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, ULONG AttributeType, Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon May 28 22:47:52 2012 @@ -193,6 +193,7 @@ TRACE("SamrOpenDomain(%p %lx %p %p)\n", ServerHandle, DesiredAccess, DomainId, DomainHandle); + /* Validate the server handle */ Status = SampValidateDbObject(ServerHandle, SamDbServerObject, SAM_SERVER_LOOKUP_DOMAIN, @@ -216,7 +217,7 @@ Status = SampOpenDbObject(ServerObject, L"Domains", L"Builtin", - SamDbServerObject, + SamDbDomainObject, DesiredAccess, &DomainObject); } @@ -231,7 +232,7 @@ Status = SampOpenDbObject(ServerObject, L"Domains", L"Account", - SamDbServerObject, + SamDbDomainObject, DesiredAccess, &DomainObject); } @@ -306,8 +307,116 @@ OUT SAMPR_HANDLE *UserHandle, OUT unsigned long *RelativeId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT UserObject; + ULONG ulSize; + ULONG ulRid; + WCHAR szRid[9]; + BOOL bAliasExists = FALSE; + NTSTATUS Status; + + TRACE("SamrCreateUserInDomain(%p %p %lx %p %p)\n", + DomainHandle, Name, DesiredAccess, UserHandle, RelativeId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_CREATE_USER, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Get the NextRID attribute */ + ulSize = sizeof(ULONG); + Status = SampGetObjectAttribute(DomainObject, + L"NextRID", + NULL, + (LPVOID)&ulRid, + &ulSize); + if (!NT_SUCCESS(Status)) + ulRid = DOMAIN_USER_RID_MAX; + + TRACE("RID: %lx\n", ulRid); + + /* Convert the RID into a string (hex) */ + _ultow(ulRid, szRid, 16); + + /* Check whether the user name is already in use */ + Status = SampCheckDbObjectNameAlias(DomainObject, + L"Users", + Name->Buffer, + &bAliasExists); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + if (bAliasExists) + { + TRACE("The user account %S already exists!\n", Name->Buffer); + return STATUS_USER_EXISTS; + } + + /* Create the user object */ + Status = SampCreateDbObject(DomainObject, + L"Users", + szRid, + SamDbUserObject, + DesiredAccess, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Add the name alias for the user object */ + Status = SampSetDbObjectNameAlias(DomainObject, + L"Users", + Name->Buffer, + ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the account name attribute */ + Status = SampSetObjectAttribute(UserObject, + L"AccountName", + REG_SZ, + (LPVOID)Name->Buffer, + Name->MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* FIXME: Set default user attributes */ + + if (NT_SUCCESS(Status)) + { + *UserHandle = (SAMPR_HANDLE)UserObject; + *RelativeId = ulRid; + } + + /* Increment the NextRID attribute */ + ulRid++; + ulSize = sizeof(ULONG); + SampSetObjectAttribute(DomainObject, + L"NextRID", + REG_DWORD, + (LPVOID)&ulRid, + ulSize); + + TRACE("returns with status 0x%08lx\n", Status); + + return Status; } /* Function 13 */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Mon May 28 22:47:52 2012 @@ -7,6 +7,7 @@ * PROGRAMMERS: Eric Kohl */ +#include <stdlib.h> #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER @@ -76,6 +77,18 @@ SampCloseDbObject(PSAM_DB_OBJECT DbObject); NTSTATUS +SampSetDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAliasName, + IN DWORD dwAliasValue); + +NTSTATUS +SampCheckDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAliasName, + OUT PBOOL bAliasExists); + +NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, ULONG AttributeType, Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Mon May 28 22:47:52 2012 @@ -5,6 +5,18 @@ #ifdef __cplusplus extern "C" { #endif + +#define DOMAIN_READ_PASSWORD_PARAMETERS 1 +#define DOMAIN_WRITE_PASSWORD_PARAMS 2 +#define DOMAIN_READ_OTHER_PARAMETERS 4 +#define DOMAIN_WRITE_OTHER_PARAMETERS 8 +#define DOMAIN_CREATE_USER 16 +#define DOMAIN_CREATE_GROUP 32 +#define DOMAIN_CREATE_ALIAS 64 +#define DOMAIN_GET_ALIAS_MEMBERSHIP 128 +#define DOMAIN_LIST_ACCOUNTS 256 +#define DOMAIN_LOOKUP 512 +#define DOMAIN_ADMINISTER_SERVER 1024 #define SAM_SERVER_CONNECT 1 #define SAM_SERVER_SHUTDOWN 2

1 0

[jimtabor] 56671: [Service Manager] - Patch by Hermes Belusca: Fix dialog painting. See bug 4965, marked as WIP.
by jimtabor＠svn.reactos.org 28 May '12

28 May '12

Author: jimtabor Date: Mon May 28 20:12:21 2012 New Revision: 56671 URL: http://svn.reactos.org/svn/reactos?rev=56671&view=rev Log: [Service Manager] - Patch by Hermes Belusca: Fix dialog painting. See bug 4965, marked as WIP. Modified: trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/servman.c Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Mon May 28 20:12:21 2012 @@ -171,6 +171,12 @@ 0, lpProgStr); } + + /* Finally, show and update the progress dialog */ + ShowWindow(hProgDlg, SW_SHOWNORMAL); + UpdateWindow(hProgDlg); + + // TODO: Add a message loop for it ? } return hProgDlg; Modified: trunk/reactos/base/applications/mscutils/servman/servman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.c [iso-8859-1] Mon May 28 20:12:21 2012 @@ -47,7 +47,7 @@ /* pump the message queue */ while( GetMessage( &Msg, NULL, 0, 0 ) ) { - //if(! IsDialogMessage(hProgDlg, &Msg) ) + //if ( !hProgDlg || !IsWindow(hProgDlg) || !IsDialogMessage(hProgDlg, &Msg) ) //{ TranslateMessage(&Msg); DispatchMessage(&Msg);

1 0

[ekohl] 56670: [SAMSRV] Add Names sub keys to the Alias, Groups and Users keys of the Account an Builtin domains. These will later contain the 'Name to SID' entries that will simplify lookup by nam...
by ekohl＠svn.reactos.org 28 May '12

28 May '12

Author: ekohl Date: Mon May 28 15:04:26 2012 New Revision: 56670 URL: http://svn.reactos.org/svn/reactos?rev=56670&view=rev Log: [SAMSRV] Add Names sub keys to the Alias, Groups and Users keys of the Account an Builtin domains. These will later contain the 'Name to SID' entries that will simplify lookup by name operations. Modified: trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Mon May 28 15:04:26 2012 @@ -56,6 +56,28 @@ static BOOL +CreateNamesKey(HKEY hParentKey) +{ + DWORD dwDisposition; + HKEY hNamesKey; + + if (RegCreateKeyExW(hParentKey, + L"Names", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hNamesKey, + &dwDisposition)) + return FALSE; + + RegCloseKey(hNamesKey); + return TRUE; +} + + +static BOOL CreateBuiltinAliases(HKEY hAliasesKey) { return TRUE; @@ -80,13 +102,14 @@ SampInitializeSAM(VOID) { DWORD dwDisposition; - HKEY hSamKey; - HKEY hDomainsKey; - HKEY hAccountKey; - HKEY hBuiltinKey; - HKEY hAliasesKey; - HKEY hGroupsKey; - HKEY hUsersKey; + HKEY hSamKey = NULL; + HKEY hDomainsKey = NULL; + HKEY hAccountKey = NULL; + HKEY hBuiltinKey = NULL; + HKEY hAliasesKey = NULL; + HKEY hGroupsKey = NULL; + HKEY hUsersKey = NULL; + BOOL bResult = TRUE; TRACE("SampInitializeSAM() called\n"); @@ -115,11 +138,12 @@ &dwDisposition)) { ERR("Failed to create 'Domains' key! (Error %lu)\n", GetLastError()); - RegCloseKey(hSamKey); - return FALSE; - } - - RegCloseKey (hSamKey); + bResult = FALSE; + goto done; + } + + RegCloseKey(hSamKey); + hSamKey = NULL; /* Create the 'Domains\\Account' key */ if (RegCreateKeyExW(hDomainsKey, @@ -133,8 +157,8 @@ &dwDisposition)) { ERR("Failed to create 'Domains\\Account' key! (Error %lu)\n", GetLastError()); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; } @@ -150,13 +174,19 @@ &dwDisposition)) { ERR("Failed to create 'Account\\Aliases' key! (Error %lu)\n", GetLastError()); - RegCloseKey(hAccountKey); - RegCloseKey(hDomainsKey); - return FALSE; - } - - RegCloseKey (hAliasesKey); - + bResult = FALSE; + goto done; + } + + if (!CreateNamesKey(hAliasesKey)) + { + ERR("Failed to create 'Account\\Aliases\\Names' key! (Error %lu)\n", GetLastError()); + bResult = FALSE; + goto done; + } + + RegCloseKey(hAliasesKey); + hAliasesKey = NULL; /* Create the 'Account\Groups' key */ if (RegCreateKeyExW(hAccountKey, @@ -170,12 +200,19 @@ &dwDisposition)) { ERR("Failed to create 'Account\\Groups' key! (Error %lu)\n", GetLastError()); - RegCloseKey(hAccountKey); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; + } + + if (!CreateNamesKey(hGroupsKey)) + { + ERR("Failed to create 'Account\\Groups\\Names' key! (Error %lu)\n", GetLastError()); + bResult = FALSE; + goto done; } RegCloseKey(hGroupsKey); + hGroupsKey = NULL; /* Create the 'Account\Users' key */ @@ -190,15 +227,22 @@ &dwDisposition)) { ERR("Failed to create 'Account\\Users' key! (Error %lu)\n", GetLastError()); - RegCloseKey(hAccountKey); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; + } + + if (!CreateNamesKey(hUsersKey)) + { + ERR("Failed to create 'Account\\Aliases\\Users' key! (Error %lu)\n", GetLastError()); + bResult = FALSE; + goto done; } RegCloseKey(hUsersKey); + hUsersKey = NULL; RegCloseKey(hAccountKey); - + hAccountKey = NULL; /* Create the 'Domains\\Builtin' */ if (RegCreateKeyExW(hDomainsKey, @@ -212,8 +256,8 @@ &dwDisposition)) { ERR("Failed to create Builtin key! (Error %lu)\n", GetLastError()); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; } @@ -229,23 +273,27 @@ &dwDisposition)) { ERR("Failed to create 'Builtin\\Aliases' key! (Error %lu)\n", GetLastError()); - RegCloseKey(hBuiltinKey); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; + } + + if (!CreateNamesKey(hAliasesKey)) + { + ERR("Failed to create 'Builtin\\Aliases\\Names' key! (Error %lu)\n", GetLastError()); + bResult = FALSE; + goto done; } /* Create builtin aliases */ if (!CreateBuiltinAliases(hAliasesKey)) { ERR("Failed to create builtin aliases!\n"); - RegCloseKey(hAliasesKey); - RegCloseKey(hBuiltinKey); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; } RegCloseKey(hAliasesKey); - + hAliasesKey = NULL; /* Create the 'Builtin\Groups' key */ if (RegCreateKeyExW(hBuiltinKey, @@ -259,22 +307,27 @@ &dwDisposition)) { ERR("Failed to create 'Builtin\\Groups' key! (Error %lu)\n", GetLastError()); - RegCloseKey(hBuiltinKey); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; + } + + if (!CreateNamesKey(hGroupsKey)) + { + ERR("Failed to create 'Builtin\\Groups\\Names' key! (Error %lu)\n", GetLastError()); + bResult = FALSE; + goto done; } /* Create builtin groups */ if (!CreateBuiltinGroups(hGroupsKey)) { ERR("Failed to create builtin groups!\n"); - RegCloseKey(hGroupsKey); - RegCloseKey(hBuiltinKey); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; } RegCloseKey(hGroupsKey); + hGroupsKey = NULL; /* Create the 'Builtin\Users' key */ @@ -289,28 +342,48 @@ &dwDisposition)) { ERR("Failed to create 'Builtin\\Users' key! (Error %lu)\n", GetLastError()); - RegCloseKey(hBuiltinKey); - RegCloseKey(hDomainsKey); - return FALSE; + bResult = FALSE; + goto done; + } + + if (!CreateNamesKey(hUsersKey)) + { + ERR("Failed to create 'Builtin\\Users\\Names' key! (Error %lu)\n", GetLastError()); + bResult = FALSE; + goto done; } /* Create builtin users */ if (!CreateBuiltinUsers(hUsersKey)) { ERR("Failed to create builtin users!\n"); + bResult = FALSE; + goto done; + } + +done: + if (hAliasesKey) + RegCloseKey(hAliasesKey); + + if (hGroupsKey) + RegCloseKey(hGroupsKey); + + if (hUsersKey) RegCloseKey(hUsersKey); + + if (hAccountKey) + RegCloseKey(hAccountKey); + + if (hBuiltinKey) RegCloseKey(hBuiltinKey); + + if (hDomainsKey) RegCloseKey(hDomainsKey); - return FALSE; - } - - RegCloseKey(hUsersKey); - - RegCloseKey(hBuiltinKey); - - RegCloseKey(hDomainsKey); + + if (hSamKey) + RegCloseKey(hSamKey); TRACE("SampInitializeSAM() done\n"); - return TRUE; -} + return bResult; +}

1 0

[ekohl] 56669: [SAMSRV] - Support container objects in SampCreateDbObject. - Implement SampGetObjectAttribute and SampSetObjectAttribute.
by ekohl＠svn.reactos.org 28 May '12

28 May '12

Author: ekohl Date: Mon May 28 12:26:54 2012 New Revision: 56669 URL: http://svn.reactos.org/svn/reactos?rev=56669&view=rev Log: [SAMSRV] - Support container objects in SampCreateDbObject. - Implement SampGetObjectAttribute and SampSetObjectAttribute. Modified: trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Mon May 28 12:26:54 2012 @@ -309,6 +309,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; HANDLE ParentKeyHandle; + HANDLE ContainerKeyHandle = NULL; HANDLE ObjectKeyHandle; NTSTATUS Status; @@ -320,25 +321,73 @@ else ParentKeyHandle = ParentObject->KeyHandle; - RtlInitUnicodeString(&KeyName, - ObjectName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ParentKeyHandle, - NULL); - - Status = NtCreateKey(&ObjectKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; + if (ContainerName != NULL) + { + /* Open the container key */ + RtlInitUnicodeString(&KeyName, + ContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Open the object key */ + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtCreateKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + + NtClose(ContainerKeyHandle); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtCreateKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } } NewObject = RtlAllocateHeap(RtlGetProcessHeap(), @@ -553,120 +602,82 @@ } -#if 0 NTSTATUS -LsapSetObjectAttribute(PLSA_DB_OBJECT DbObject, +SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, + ULONG AttributeType, LPVOID AttributeData, ULONG AttributeSize) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - HANDLE AttributeKey; - NTSTATUS Status; - - RtlInitUnicodeString(&KeyName, + UNICODE_STRING ValueName; + + RtlInitUnicodeString(&ValueName, AttributeName); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - DbObject->KeyHandle, - NULL); - - Status = NtCreateKey(&AttributeKey, - KEY_SET_VALUE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - NULL); - if (!NT_SUCCESS(Status)) - { - - return Status; - } - - Status = RtlpNtSetValueKey(AttributeKey, - REG_NONE, - AttributeData, - AttributeSize); - - NtClose(AttributeKey); - - return Status; + return ZwSetValueKey(DbObject->KeyHandle, + &ValueName, + 0, + AttributeType, + AttributeData, + AttributeSize); } NTSTATUS -LsapGetObjectAttribute(PLSA_DB_OBJECT DbObject, +SampGetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, + PULONG AttributeType, LPVOID AttributeData, PULONG AttributeSize) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - HANDLE AttributeKey; - ULONG ValueSize; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + UNICODE_STRING ValueName; + ULONG BufferLength = 0; NTSTATUS Status; - RtlInitUnicodeString(&KeyName, + RtlInitUnicodeString(&ValueName, AttributeName); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - DbObject->KeyHandle, - NULL); - - Status = NtOpenKey(&AttributeKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - ValueSize = *AttributeSize; - Status = RtlpNtQueryValueKey(AttributeKey, - NULL, - NULL, - &ValueSize, - 0); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) - { - goto Done; - } - - if (AttributeData == NULL || *AttributeSize == 0) - { - *AttributeSize = ValueSize; - Status = STATUS_SUCCESS; - goto Done; - } - else if (*AttributeSize < ValueSize) - { - *AttributeSize = ValueSize; - Status = STATUS_BUFFER_OVERFLOW; - goto Done; - } - - Status = RtlpNtQueryValueKey(AttributeKey, - NULL, - AttributeData, - &ValueSize, - 0); - if (NT_SUCCESS(Status)) - { - *AttributeSize = ValueSize; - } - -Done: - NtClose(AttributeKey); + if (AttributeSize != NULL) + BufferLength = *AttributeSize; + + BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Allocate memory for the value */ + ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (ValueInfo == NULL) + return STATUS_NO_MEMORY; + + /* Query the value */ + Status = ZwQueryValueKey(DbObject->KeyHandle, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &BufferLength); + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (AttributeType != NULL) + *AttributeType = ValueInfo->Type; + + if (AttributeSize != NULL) + *AttributeSize = ValueInfo->DataLength; + } + + /* Check if the caller wanted data back, and we got it */ + if ((NT_SUCCESS(Status)) && (AttributeData != NULL)) + { + /* Copy it */ + RtlMoveMemory(AttributeData, + ValueInfo->Data, + ValueInfo->DataLength); + } + + /* Free the memory and return status */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); return Status; } -#endif /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Mon May 28 12:26:54 2012 @@ -75,6 +75,20 @@ NTSTATUS SampCloseDbObject(PSAM_DB_OBJECT DbObject); +NTSTATUS +SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, + LPWSTR AttributeName, + ULONG AttributeType, + LPVOID AttributeData, + ULONG AttributeSize); + +NTSTATUS +SampGetObjectAttribute(PSAM_DB_OBJECT DbObject, + LPWSTR AttributeName, + PULONG AttributeType, + LPVOID AttributeData, + PULONG AttributeSize); + /* samspc.c */ VOID SampStartRpcServer(VOID);

1 0

[tfaber] 56668: [LIBUSB][USBCCGP] - Whitespace and DPRINT fixes
by tfaber＠svn.reactos.org 28 May '12

28 May '12

Author: tfaber Date: Mon May 28 10:49:44 2012 New Revision: 56668 URL: http://svn.reactos.org/svn/reactos?rev=56668&view=rev Log: [LIBUSB][USBCCGP] - Whitespace and DPRINT fixes Modified: trunk/reactos/drivers/usb/usbccgp/function.c trunk/reactos/drivers/usb/usbccgp/misc.c trunk/reactos/drivers/usb/usbccgp/pdo.c trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Mon May 28 10:49:44 2012 @@ -56,7 +56,7 @@ // // initialize request // - Stack=IoGetNextIrpStackLocation(Irp); + Stack = IoGetNextIrpStackLocation(Irp); Stack->MajorFunction = IRP_MJ_PNP; Stack->MinorFunction = IRP_MN_QUERY_INTERFACE; Stack->Parameters.QueryInterface.Size = sizeof(BUS_INTERFACE_STANDARD); @@ -69,7 +69,7 @@ // // call driver // - Status= IoCallDriver(DeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); // // did operation complete @@ -116,14 +116,14 @@ // // invoke callback // - Status = FDODeviceExtension->BusInterface.StartDeviceCallback(FDODeviceExtension->DeviceDescriptor, - FDODeviceExtension->ConfigurationDescriptor, + Status = FDODeviceExtension->BusInterface.StartDeviceCallback(FDODeviceExtension->DeviceDescriptor, + FDODeviceExtension->ConfigurationDescriptor, &FunctionDescriptorBuffer, &FunctionDescriptorBufferLength, DeviceObject, FDODeviceExtension->PhysicalDeviceObject); - DPRINT("USBCCGP_CustomEnumWithInterface Status %x\n", Status); + DPRINT("USBCCGP_CustomEnumWithInterface Status %lx\n", Status); if (!NT_SUCCESS(Status)) { // @@ -167,7 +167,7 @@ Offset = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->bLength; End = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength; - while(Offset < End) + while (Offset < End) { // // get association descriptor @@ -209,7 +209,7 @@ Offset = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->bLength; End = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength; - while(Offset < End) + while (Offset < End) { // // get association descriptor @@ -260,7 +260,7 @@ Offset = (PUCHAR)AssociationDescriptor + AssociationDescriptor->bLength; End = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength; - while(Offset < End) + while (Offset < End) { // // get association descriptor @@ -358,8 +358,8 @@ // get interface description // Status = USBCCGP_GetStringDescriptor(FDODeviceExtension->NextDeviceObject, - 100 * sizeof(WCHAR), - Descriptor->iFunction, + 100 * sizeof(WCHAR), + Descriptor->iFunction, 0x0409, //FIXME (PVOID*)&DescriptionBuffer); if (!NT_SUCCESS(Status)) @@ -406,7 +406,6 @@ FunctionDescriptor->HardwareId.Length = Index * sizeof(WCHAR); FunctionDescriptor->HardwareId.MaximumLength = (Index + 1) * sizeof(WCHAR); - // // now init the compatible id // @@ -475,7 +474,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - for(Index = 0; Index < DescriptorCount; Index++) + for (Index = 0; Index < DescriptorCount; Index++) { // // init function descriptors @@ -552,8 +551,8 @@ FDODeviceExtension->DeviceDescriptor->bcdDevice, FunctionIndex) + 1; Index += swprintf(&Buffer[Index], L"USB\\VID_%04x&PID_%04x&MI_%02x", FDODeviceExtension->DeviceDescriptor->idVendor, - FDODeviceExtension->DeviceDescriptor->idProduct, - FunctionIndex) + 1; + FDODeviceExtension->DeviceDescriptor->idProduct, + FunctionIndex) + 1; // allocate result buffer DescriptionBuffer = AllocateItem(NonPagedPool, (Index + 1) * sizeof(WCHAR)); @@ -637,7 +636,7 @@ // // init function descriptors // - for(Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) + for (Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) { // get interface descriptor InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(FDODeviceExtension->ConfigurationDescriptor, FDODeviceExtension->ConfigurationDescriptor, Index, 0, -1, -1, -1); @@ -679,7 +678,7 @@ // // failed to init ids // - DPRINT1("[USBCCGP] Failed to init ids with %x\n", Status); + DPRINT1("[USBCCGP] Failed to init ids with %lx\n", Status); return Status; } @@ -722,7 +721,7 @@ // // first check if all interfaces belong to the same audio class // - for(Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) + for (Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) { // // get interface descriptor @@ -789,7 +788,7 @@ // // failed to allocate descriptor array // - DPRINT1("[USBCCGP] Failed to allocate descriptor array %x\n", Status); + DPRINT1("[USBCCGP] Failed to allocate descriptor array %lx\n", Status); return Status; } @@ -802,7 +801,7 @@ // // failed to init ids // - DPRINT1("[USBCCGP] Failed to init ids with %x\n", Status); + DPRINT1("[USBCCGP] Failed to init ids with %lx\n", Status); return Status; } Modified: trunk/reactos/drivers/usb/usbccgp/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] Mon May 28 10:49:44 2012 @@ -18,7 +18,7 @@ NTAPI USBSTOR_SyncForwardIrpCompletionRoutine( PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, PVOID Context) { if (Irp->PendingReturned) @@ -162,7 +162,7 @@ DPRINT1("FunctionCount %lu\n", FunctionDescriptorCount); - for(Index = 0; Index < FunctionDescriptorCount; Index++) + for (Index = 0; Index < FunctionDescriptorCount; Index++) { DPRINT1("Function %lu\n", Index); DPRINT1("FunctionNumber %lu\n", FunctionDescriptor[Index].FunctionNumber); Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Mon May 28 10:49:44 2012 @@ -136,7 +136,7 @@ // count length of string // String = DeviceId; - while(*String) + while (*String) { StringLength = wcslen(String) + 1; Length += StringLength; @@ -161,7 +161,7 @@ // *OutString = String; - while(*DeviceId) + while (*DeviceId) { StringLength = swprintf(String, L"%s&MI_%02x", DeviceId, InterfaceNumber) + 1; Length = wcslen(DeviceId) + 1; @@ -225,7 +225,7 @@ DPRINT("BusQueryDeviceID %S\n", Buffer); ExFreePool((PVOID)Irp->IoStatus.Information); - Irp->IoStatus .Information = (ULONG_PTR)Buffer; + Irp->IoStatus.Information = (ULONG_PTR)Buffer; } else { @@ -334,76 +334,76 @@ switch(IoStack->MinorFunction) { - case IRP_MN_QUERY_DEVICE_RELATIONS: - { - // - // handle device relations - // - Status = USBCCGP_PdoHandleDeviceRelations(DeviceObject, Irp); - break; - } - case IRP_MN_QUERY_DEVICE_TEXT: - { - // - // handle query device text - // - Status = USBCCGP_PdoHandleQueryDeviceText(DeviceObject, Irp); - break; - } - case IRP_MN_QUERY_ID: - { - // - // handle request - // - Status = USBCCGP_PdoHandleQueryId(DeviceObject, Irp); - break; - } - case IRP_MN_REMOVE_DEVICE: - { - // - // remove us from the fdo's pdo list - // - bFound = FALSE; - for(Index = 0; Index < PDODeviceExtension->FDODeviceExtension->FunctionDescriptorCount; Index++) - { - if (PDODeviceExtension->FDODeviceExtension->ChildPDO[Index] == DeviceObject) - { - // - // remove us - // - PDODeviceExtension->FDODeviceExtension->ChildPDO[Index] = NULL; - bFound = TRUE; - break; - } - } - - // - // Complete the IRP - // - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - if (bFound) - { - // - // Delete the device object - // - IoDeleteDevice(DeviceObject); - } - return STATUS_SUCCESS; - } - case IRP_MN_QUERY_CAPABILITIES: - { - // - // copy device capabilities - // - RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &PDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); - - /* Complete the IRP */ - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + // + // handle device relations + // + Status = USBCCGP_PdoHandleDeviceRelations(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_DEVICE_TEXT: + { + // + // handle query device text + // + Status = USBCCGP_PdoHandleQueryDeviceText(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_ID: + { + // + // handle request + // + Status = USBCCGP_PdoHandleQueryId(DeviceObject, Irp); + break; + } + case IRP_MN_REMOVE_DEVICE: + { + // + // remove us from the fdo's pdo list + // + bFound = FALSE; + for(Index = 0; Index < PDODeviceExtension->FDODeviceExtension->FunctionDescriptorCount; Index++) + { + if (PDODeviceExtension->FDODeviceExtension->ChildPDO[Index] == DeviceObject) + { + // + // remove us + // + PDODeviceExtension->FDODeviceExtension->ChildPDO[Index] = NULL; + bFound = TRUE; + break; + } + } + + // + // Complete the IRP + // + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + if (bFound) + { + // + // Delete the device object + // + IoDeleteDevice(DeviceObject); + } + return STATUS_SUCCESS; + } + case IRP_MN_QUERY_CAPABILITIES: + { + // + // copy device capabilities + // + RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &PDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + + /* Complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { @@ -413,24 +413,24 @@ Status = STATUS_SUCCESS; break; } - case IRP_MN_START_DEVICE: - { - // - // no-op for PDO - // - DPRINT("[USBCCGP] PDO IRP_MN_START\n"); - Status = STATUS_SUCCESS; - break; - } - case IRP_MN_QUERY_INTERFACE: - { - // - // forward to lower device object - // - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); - } - default: + case IRP_MN_START_DEVICE: + { + // + // no-op for PDO + // + DPRINT("[USBCCGP] PDO IRP_MN_START\n"); + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_INTERFACE: + { + // + // forward to lower device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); + } + default: { // // do nothing @@ -465,7 +465,7 @@ NTSTATUS USBCCGP_BuildConfigurationDescriptor( - PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT DeviceObject, PIRP Irp) { PIO_STACK_LOCATION IoStack; @@ -501,7 +501,7 @@ // TotalSize = sizeof(USB_CONFIGURATION_DESCRIPTOR); - for(Index = 0; Index < PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; Index++) + for (Index = 0; Index < PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; Index++) { // // get current interface descriptor @@ -555,7 +555,7 @@ // move to next descriptor // InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - }while(TRUE); + } while(TRUE); } // @@ -577,7 +577,7 @@ RtlCopyMemory(Buffer, ConfigurationDescriptor, sizeof(USB_CONFIGURATION_DESCRIPTOR)); BufferPtr = (PUCHAR)((ULONG_PTR)Buffer + ConfigurationDescriptor->bLength); - for(Index = 0; Index < PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; Index++) + for (Index = 0; Index < PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; Index++) { // // get current interface descriptor @@ -634,7 +634,7 @@ // move to next descriptor // InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - }while(TRUE); + } while(TRUE); } // @@ -674,7 +674,7 @@ NTSTATUS USBCCGP_PDOSelectConfiguration( - PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT DeviceObject, PIRP Irp) { PIO_STACK_LOCATION IoStack; @@ -736,7 +736,7 @@ // search for the interface in the local interface list // FoundInterface = FALSE; - for(InterfaceIndex = 0; InterfaceIndex < PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; InterfaceIndex++) + for (InterfaceIndex = 0; InterfaceIndex < PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; InterfaceIndex++) { if (PDODeviceExtension->FunctionDescriptor->InterfaceDescriptorList[InterfaceIndex]->bInterfaceNumber == InterfaceInformation->InterfaceNumber) { @@ -760,7 +760,7 @@ // now query the total interface list // Entry = NULL; - for(InterfaceIndex = 0; InterfaceIndex < PDODeviceExtension->InterfaceListCount; InterfaceIndex++) + for (InterfaceIndex = 0; InterfaceIndex < PDODeviceExtension->InterfaceListCount; InterfaceIndex++) { if (PDODeviceExtension->InterfaceList[InterfaceIndex].Interface->InterfaceNumber == InterfaceInformation->InterfaceNumber) { @@ -786,7 +786,6 @@ NeedSelect = FALSE; if (Entry->InterfaceDescriptor->bAlternateSetting == InterfaceInformation->AlternateSetting) { - for(InterfaceIndex = 0; InterfaceIndex < InterfaceInformation->NumberOfPipes; InterfaceIndex++) { if (InterfaceInformation->Pipes[InterfaceIndex].MaximumTransferSize != Entry->Interface->Pipes[InterfaceIndex].MaximumTransferSize) @@ -894,7 +893,7 @@ FreeItem(NewUrb); } - }while(Length); + } while(Length); // // store configuration handle @@ -911,7 +910,7 @@ NTSTATUS PDO_HandleInternalDeviceControl( - PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT DeviceObject, PIRP Irp) { PIO_STACK_LOCATION IoStack; @@ -950,7 +949,7 @@ } else if (Urb->UrbHeader.Function == URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE) { - if(Urb->UrbControlDescriptorRequest.DescriptorType == USB_DEVICE_DESCRIPTOR_TYPE) + if (Urb->UrbControlDescriptorRequest.DescriptorType == USB_DEVICE_DESCRIPTOR_TYPE) { // // is the buffer big enough @@ -1047,8 +1046,6 @@ return Status; } - - DPRINT1("IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); DPRINT1("InputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.InputBufferLength); DPRINT1("OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); @@ -1064,7 +1061,7 @@ NTSTATUS PDO_Dispatch( - PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT DeviceObject, PIRP Irp) { PIO_STACK_LOCATION IoStack; @@ -1085,5 +1082,4 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - } Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Mon May 28 10:49:44 2012 @@ -965,7 +965,7 @@ Status = m_Hardware->ClearPortStatus(PortId, C_PORT_CONNECTION); break; case C_PORT_RESET: - Status= m_Hardware->ClearPortStatus(PortId, C_PORT_RESET); + Status = m_Hardware->ClearPortStatus(PortId, C_PORT_RESET); break; default: DPRINT("[USBLIB] Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); @@ -1209,31 +1209,30 @@ UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); - // - // generate setup packet - // - CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; - CtrlSetup.wValue.LowByte = 0; - CtrlSetup.wValue.HiByte = 0; - CtrlSetup.wIndex.W = Urb->UrbControlGetStatusRequest.Index; - CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; - CtrlSetup.bmRequestType.B = 0x80; - - - if (Urb->UrbHeader.Function == URB_FUNCTION_GET_STATUS_FROM_INTERFACE) - { - // - // add interface type - // - CtrlSetup.bmRequestType.B |= 0x01; - } - else if (Urb->UrbHeader.Function == URB_FUNCTION_GET_STATUS_FROM_ENDPOINT) - { - // - // add interface type - // - CtrlSetup.bmRequestType.B |= 0x02; - } + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; + CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.HiByte = 0; + CtrlSetup.wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0x80; + + if (Urb->UrbHeader.Function == URB_FUNCTION_GET_STATUS_FROM_INTERFACE) + { + // + // add interface type + // + CtrlSetup.bmRequestType.B |= 0x01; + } + else if (Urb->UrbHeader.Function == URB_FUNCTION_GET_STATUS_FROM_ENDPOINT) + { + // + // add interface type + // + CtrlSetup.bmRequestType.B |= 0x02; + } // // submit setup packet Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev… ============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Mon May 28 10:49:44 2012 @@ -380,7 +380,7 @@ RtlZeroMemory(m_ConfigurationDescriptors, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations); // retrieve the configuration descriptors - for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++) + for (Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++) { // retrieve configuration descriptors from device Status = CreateConfigurationDescriptor(Index); @@ -1029,7 +1029,7 @@ if (ConfigurationDescriptor) { // find configuration index - for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++) + for (Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++) { if (m_ConfigurationDescriptors[Index].ConfigurationDescriptor->bConfigurationValue == ConfigurationDescriptor->bConfigurationValue) { @@ -1041,7 +1041,7 @@ if (!Found) { - DPRINT1("[USBLIB] invalid configuration value %lu\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("[USBLIB] invalid configuration value %u\n", ConfigurationDescriptor->bConfigurationValue); return STATUS_INVALID_PARAMETER; } @@ -1063,13 +1063,13 @@ if (!ConfigurationDescriptor) { // unconfigure request - DPRINT1("CUSBDevice::SelectConfiguration Unconfigure Request Status %x\n", Status); + DPRINT1("CUSBDevice::SelectConfiguration Unconfigure Request Status %lx\n", Status); m_ConfigurationIndex = 0; return Status; } // informal debug print - DPRINT1("CUSBDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationIndex, m_ConfigurationIndex, Status); + DPRINT1("CUSBDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %lx\n", ConfigurationIndex, m_ConfigurationIndex, Status); if (!NT_SUCCESS(Status)) { // @@ -1079,7 +1079,7 @@ } // destroy old interface info - while(!IsListEmpty(&m_ConfigurationDescriptors[m_ConfigurationIndex].InterfaceList)) + while (!IsListEmpty(&m_ConfigurationDescriptors[m_ConfigurationIndex].InterfaceList)) { // remove entry Entry = RemoveHeadList(&m_ConfigurationDescriptors[m_ConfigurationIndex].InterfaceList); @@ -1180,9 +1180,9 @@ Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL); // informal debug print - DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); + DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %lx\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); #if 0 - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { // failed to select interface return Status; @@ -1190,12 +1190,11 @@ #endif Status = STATUS_SUCCESS; - // find interface Found = FALSE; Entry = m_ConfigurationDescriptors[ConfigurationIndex].InterfaceList.Flink; - while(Entry != &m_ConfigurationDescriptors[ConfigurationIndex].InterfaceList) + while (Entry != &m_ConfigurationDescriptors[ConfigurationIndex].InterfaceList) { // grab interface descriptor UsbInterface = (PUSB_INTERFACE)CONTAINING_RECORD(Entry, USB_INTERFACE, ListEntry); @@ -1241,7 +1240,7 @@ InterfaceInfo->NumberOfPipes = UsbInterface->InterfaceDescriptor->bNumEndpoints; // copy pipe handles - for(PipeIndex = 0; PipeIndex < UsbInterface->InterfaceDescriptor->bNumEndpoints; PipeIndex++) + for (PipeIndex = 0; PipeIndex < UsbInterface->InterfaceDescriptor->bNumEndpoints; PipeIndex++) { // copy pipe handle DPRINT1("PipeIndex %lu\n", PipeIndex); @@ -1250,7 +1249,7 @@ DPRINT1("MaximumPacketSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize); DPRINT1("MaximumTransferSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize); DPRINT1("PipeFlags %d\n", InterfaceInfo->Pipes[PipeIndex].PipeFlags); - DPRINT1("PipeType %dd\n", InterfaceInfo->Pipes[PipeIndex].PipeType); + DPRINT1("PipeType %d\n", InterfaceInfo->Pipes[PipeIndex].PipeType); DPRINT1("UsbEndPoint %x\n", InterfaceInfo->Pipes[PipeIndex].EndpointAddress); // sanity checks @@ -1264,7 +1263,6 @@ UsbInterface->EndPoints[PipeIndex].DataToggle = FALSE; } - // // done //

1 0

[tfaber] 56667: [LIBUSB][USBCCGP][USBEHCI] - Return the actual number of bytes copied for configuration descriptor requests - Fix MSVC warnings and NULL vs 0 vs FALSE issues
by tfaber＠svn.reactos.org 28 May '12

28 May '12

Author: tfaber Date: Mon May 28 10:34:45 2012 New Revision: 56667 URL: http://svn.reactos.org/svn/reactos?rev=56667&view=rev Log: [LIBUSB][USBCCGP][USBEHCI] - Return the actual number of bytes copied for configuration descriptor requests - Fix MSVC warnings and NULL vs 0 vs FALSE issues Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c trunk/reactos/drivers/usb/usbehci/usb_request.cpp trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Mon May 28 10:34:45 2012 @@ -473,6 +473,7 @@ PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; ULONG TotalSize, Index; + ULONG Size; PURB Urb; PVOID Buffer; PUCHAR BufferPtr; @@ -640,7 +641,7 @@ // modify configuration descriptor // ConfigurationDescriptor = Buffer; - ConfigurationDescriptor->wTotalLength = TotalSize; + ConfigurationDescriptor->wTotalLength = (USHORT)TotalSize; ConfigurationDescriptor->bNumInterfaces = PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; // @@ -652,12 +653,13 @@ // // copy descriptor // - RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, Buffer, min(TotalSize, Urb->UrbControlDescriptorRequest.TransferBufferLength)); + Size = min(TotalSize, Urb->UrbControlDescriptorRequest.TransferBufferLength); + RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, Buffer, Size); // // store final size // - Urb->UrbControlDescriptorRequest.TransferBufferLength = TotalSize; + Urb->UrbControlDescriptorRequest.TransferBufferLength = Size; // // free buffer @@ -846,7 +848,7 @@ // // now prepare interface urb // - UsbBuildSelectInterfaceRequest(NewUrb, GET_SELECT_INTERFACE_REQUEST_SIZE(InterfaceInformation->NumberOfPipes), PDODeviceExtension->ConfigurationHandle, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting); + UsbBuildSelectInterfaceRequest(NewUrb, (USHORT)GET_SELECT_INTERFACE_REQUEST_SIZE(InterfaceInformation->NumberOfPipes), PDODeviceExtension->ConfigurationHandle, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting); // // now select the interface Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Mon May 28 10:34:45 2012 @@ -538,7 +538,7 @@ // initialized with setup packet, must be a control transfer // TransferType = USB_ENDPOINT_TYPE_CONTROL; - ASSERT(m_EndpointDescriptor == FALSE); + ASSERT(m_EndpointDescriptor == NULL); } // Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Mon May 28 10:34:45 2012 @@ -1293,7 +1293,6 @@ // generate setup packet // CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; - CtrlSetup.wValue.LowByte = Urb->UrbControlVendorClassRequest.Index; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; @@ -1410,7 +1409,7 @@ CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; - CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + CtrlSetup.wLength = (USHORT)Urb->UrbControlVendorClassRequest.TransferBufferLength; if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) { @@ -1758,7 +1757,7 @@ CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; - CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + CtrlSetup.wLength = (USHORT)Urb->UrbControlVendorClassRequest.TransferBufferLength; if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) { @@ -1830,7 +1829,7 @@ CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; - CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + CtrlSetup.wLength = (USHORT)Urb->UrbControlVendorClassRequest.TransferBufferLength; if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) { @@ -2096,7 +2095,7 @@ CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; - CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + CtrlSetup.wLength = (USHORT)Urb->UrbControlVendorClassRequest.TransferBufferLength; if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) { Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev… ============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Mon May 28 10:34:45 2012 @@ -323,7 +323,7 @@ CtrlSetup->wValue.W = DeviceAddress; // set device address - Status = CommitSetupPacket(CtrlSetup, 0, 0, 0); + Status = CommitSetupPacket(CtrlSetup, NULL, 0, NULL); // free setup packet ExFreePoolWithTag(CtrlSetup, TAG_USBLIB); @@ -640,7 +640,7 @@ // // commit setup packet // - Status = CommitSetupPacket(&CtrlSetup, 0, sizeof(USB_DEVICE_DESCRIPTOR), Mdl); + Status = CommitSetupPacket(&CtrlSetup, NULL, sizeof(USB_DEVICE_DESCRIPTOR), Mdl); // // now free the mdl @@ -713,7 +713,7 @@ // // commit packet // - Status = CommitSetupPacket(&CtrlSetup, 0, BufferSize, Mdl); + Status = CommitSetupPacket(&CtrlSetup, NULL, BufferSize, Mdl); // // free mdl @@ -809,6 +809,8 @@ IN ULONG BufferLength, OUT PULONG OutBufferLength) { + ULONG Length; + // sanity check ASSERT(BufferLength >= sizeof(USB_CONFIGURATION_DESCRIPTOR)); ASSERT(ConfigDescriptorBuffer); @@ -821,8 +823,9 @@ PC_ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); // copy configuration descriptor - RtlCopyMemory(ConfigDescriptorBuffer, m_ConfigurationDescriptors[0].ConfigurationDescriptor, min(m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength, BufferLength)); - *OutBufferLength = m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength; + Length = min(m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength, BufferLength); + RtlCopyMemory(ConfigDescriptorBuffer, m_ConfigurationDescriptors[0].ConfigurationDescriptor, Length); + *OutBufferLength = Length; } //---------------------------------------------------------------------------------------- @@ -904,7 +907,7 @@ // // commit setup packet // - Status = CommitSetupPacket(SetupPacket, 0, BufferLength, Mdl); + Status = CommitSetupPacket(SetupPacket, NULL, BufferLength, Mdl); if (Mdl != NULL) { @@ -1055,7 +1058,7 @@ CtrlSetup.wValue.W = bConfigurationValue; // select configuration - Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); + Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL); if (!ConfigurationDescriptor) { @@ -1174,7 +1177,7 @@ CtrlSetup.bmRequestType.B = 0x01; // issue request - Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); + Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL); // informal debug print DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status);

1 0

[tfaber] 56666: [USBCCGP] - Fix hardware/compatible id generation (still abusing UNICODE_STRING though) - Do not touch unsupported IRP_MN_QUERY_ID requests
by tfaber＠svn.reactos.org 28 May '12

28 May '12

Author: tfaber Date: Mon May 28 10:15:58 2012 New Revision: 56666 URL: http://svn.reactos.org/svn/reactos?rev=56666&view=rev Log: [USBCCGP] - Fix hardware/compatible id generation (still abusing UNICODE_STRING though) - Do not touch unsupported IRP_MN_QUERY_ID requests Modified: trunk/reactos/drivers/usb/usbccgp/function.c trunk/reactos/drivers/usb/usbccgp/misc.c trunk/reactos/drivers/usb/usbccgp/pdo.c Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Mon May 28 10:15:58 2012 @@ -386,9 +386,9 @@ FDODeviceExtension->DeviceDescriptor->idProduct, FDODeviceExtension->DeviceDescriptor->bcdDevice, Descriptor->bFirstInterface) + 1; - Index = swprintf(&Buffer[Index], L"USB\\VID_%04x&PID_%04x&MI_%02x", FDODeviceExtension->DeviceDescriptor->idVendor, - FDODeviceExtension->DeviceDescriptor->idProduct, - Descriptor->bFirstInterface) + 1; + Index += swprintf(&Buffer[Index], L"USB\\VID_%04x&PID_%04x&MI_%02x", FDODeviceExtension->DeviceDescriptor->idVendor, + FDODeviceExtension->DeviceDescriptor->idProduct, + Descriptor->bFirstInterface) + 1; // allocate result buffer DescriptionBuffer = AllocateItem(NonPagedPool, (Index + 1) * sizeof(WCHAR)); @@ -401,7 +401,7 @@ } // copy description - RtlCopyMemory(DescriptionBuffer, Buffer, Index * sizeof(WCHAR)); + RtlCopyMemory(DescriptionBuffer, Buffer, (Index + 1) * sizeof(WCHAR)); FunctionDescriptor->HardwareId.Buffer = DescriptionBuffer; FunctionDescriptor->HardwareId.Length = Index * sizeof(WCHAR); FunctionDescriptor->HardwareId.MaximumLength = (Index + 1) * sizeof(WCHAR); @@ -411,8 +411,8 @@ // now init the compatible id // Index = swprintf(Buffer, L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", Descriptor->bFunctionClass, Descriptor->bFunctionSubClass, Descriptor->bFunctionProtocol) + 1; - Index = swprintf(&Buffer[Index], L"USB\\Class_%04x&SubClass_%04x", Descriptor->bFunctionClass, Descriptor->bFunctionSubClass) + 1; - Index = swprintf(&Buffer[Index], L"USB\\Class_%04x", Descriptor->bFunctionClass) + 1; + Index += swprintf(&Buffer[Index], L"USB\\Class_%02x&SubClass_%02x", Descriptor->bFunctionClass, Descriptor->bFunctionSubClass) + 1; + Index += swprintf(&Buffer[Index], L"USB\\Class_%02x", Descriptor->bFunctionClass) + 1; // allocate result buffer DescriptionBuffer = AllocateItem(NonPagedPool, (Index + 1) * sizeof(WCHAR)); @@ -425,7 +425,7 @@ } // copy description - RtlCopyMemory(DescriptionBuffer, Buffer, Index * sizeof(WCHAR)); + RtlCopyMemory(DescriptionBuffer, Buffer, (Index + 1) * sizeof(WCHAR)); FunctionDescriptor->CompatibleId.Buffer = DescriptionBuffer; FunctionDescriptor->CompatibleId.Length = Index * sizeof(WCHAR); FunctionDescriptor->CompatibleId.MaximumLength = (Index + 1) * sizeof(WCHAR); @@ -566,7 +566,7 @@ } // copy description - RtlCopyMemory(DescriptionBuffer, Buffer, Index * sizeof(WCHAR)); + RtlCopyMemory(DescriptionBuffer, Buffer, (Index + 1) * sizeof(WCHAR)); FunctionDescriptor->HardwareId.Buffer = DescriptionBuffer; FunctionDescriptor->HardwareId.Length = Index * sizeof(WCHAR); FunctionDescriptor->HardwareId.MaximumLength = (Index + 1) * sizeof(WCHAR); @@ -589,7 +589,7 @@ } // copy description - RtlCopyMemory(DescriptionBuffer, Buffer, Index * sizeof(WCHAR)); + RtlCopyMemory(DescriptionBuffer, Buffer, (Index + 1) * sizeof(WCHAR)); FunctionDescriptor->CompatibleId.Buffer = DescriptionBuffer; FunctionDescriptor->CompatibleId.Length = Index * sizeof(WCHAR); FunctionDescriptor->CompatibleId.MaximumLength = (Index + 1) * sizeof(WCHAR); Modified: trunk/reactos/drivers/usb/usbccgp/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] Mon May 28 10:15:58 2012 @@ -166,8 +166,8 @@ { DPRINT1("Function %lu\n", Index); DPRINT1("FunctionNumber %lu\n", FunctionDescriptor[Index].FunctionNumber); - DPRINT1("HardwareId %wZ\n", &FunctionDescriptor[Index].HardwareId); - DPRINT1("CompatibleId %wZ\n", &FunctionDescriptor[Index].CompatibleId); + DPRINT1("HardwareId %S\n", FunctionDescriptor[Index].HardwareId.Buffer); + DPRINT1("CompatibleId %S\n", FunctionDescriptor[Index].CompatibleId.Buffer); DPRINT1("FunctionDescription %wZ\n", &FunctionDescriptor[Index].FunctionDescription); DPRINT1("NumInterfaces %lu\n", FunctionDescriptor[Index].NumberOfInterfaces); Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Mon May 28 10:15:58 2012 @@ -272,6 +272,13 @@ // DeviceString = &PDODeviceExtension->FunctionDescriptor->CompatibleId; } + else + { + // + // unsupported query + // + return Irp->IoStatus.Status; + } // // sanity check @@ -294,6 +301,7 @@ // copy buffer // RtlCopyMemory(Buffer, DeviceString->Buffer, DeviceString->Length); + Buffer[DeviceString->Length / sizeof(WCHAR)] = UNICODE_NULL; Irp->IoStatus.Information = (ULONG_PTR)Buffer; return STATUS_SUCCESS;

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