Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 52789: [KERNEL32]: Add ConvertOpenWin32AnsiObjectApiToUnicodeApi macro. [KERNEL32]: Fix bugs #11, #12, #13: OpenJobObjectA did not correctly set the error code in case the string was too long...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 09:28:15 2011 New Revision: 52789 URL: http://svn.reactos.org/svn/reactos?rev=52789&view=rev Log: [KERNEL32]: Add ConvertOpenWin32AnsiObjectApiToUnicodeApi macro. [KERNEL32]: Fix bugs #11, #12, #13: OpenJobObjectA did not correctly set the error code in case the string was too long, nor did it use the TEB's static unicode cache, nor did it enforce a 260 character object name limit. Fixed by using the new macro. Modified: trunk/reactos/dll/win32/kernel32/client/job.c trunk/reactos/dll/win32/kernel32/include/base_x.h Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Sat Jul 23 09:28:15 2011 @@ -92,31 +92,8 @@ BOOL bInheritHandle, LPCSTR lpName) { - ANSI_STRING AnsiName; - UNICODE_STRING UnicodeName; - HANDLE hJob; - NTSTATUS Status; - - if (lpName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - RtlInitAnsiString(&AnsiName, lpName); - Status = RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, TRUE); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - hJob = OpenJobObjectW(dwDesiredAccess, - bInheritHandle, - UnicodeName.Buffer); - - RtlFreeUnicodeString(&UnicodeName); - return hJob; + /* Call the W(ide) function */ + ConvertOpenWin32AnsiObjectApiToUnicodeApi(JobObject, dwDesiredAccess, bInheritHandle, lpName); } Modified: trunk/reactos/dll/win32/kernel32/include/base_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] Sat Jul 23 09:28:15 2011 @@ -69,6 +69,17 @@ ConvertAnsiToUnicodeEpilogue // +// This macro uses the ConvertAnsiToUnicode macros above to convert a OpenXxxA +// Win32 API into its equivalent OpenXxxW API. +// +#define ConvertOpenWin32AnsiObjectApiToUnicodeApi(obj, acc, inh, name) \ + ConvertAnsiToUnicodePrologue \ + if (!name) SetLastError(ERROR_INVALID_PARAMETER); return NULL; \ + ConvertAnsiToUnicodeBody(name) \ + if (NT_SUCCESS(Status)) return Open##obj##W(acc, inh, UnicodeCache->Buffer);\ + ConvertAnsiToUnicodeEpilogue + +// // This macro (split it up in 3 pieces to allow for intermediary code in between) // wraps the usual code path required to create an NT object based on a Unicode // (Wide) Win32 object creation API.

1 0

[ion] 52788: [KERNEL32]: Fix the object macros to be MSVC/C99 compatible. Also allow for the variadic part to contain no arguments. [KERNEL32]: Fix bugs #7, #8, #9, #10: CreateJobObjectW did not ad...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 02:17:26 2011 New Revision: 52788 URL: http://svn.reactos.org/svn/reactos?rev=52788&view=rev Log: [KERNEL32]: Fix the object macros to be MSVC/C99 compatible. Also allow for the variadic part to contain no arguments. [KERNEL32]: Fix bugs #7, #8, #9, #10: CreateJobObjectW did not add OBJ_OPENIF to named jobs, it did not add named objects in the BaseNamedObjects directory, it did not correctly set ERROR_ALREADY_EXISTS when collisions happened, and it did not set ERROR_SUCCESS when the object was created. All this was fixed by using the new CreateNtObjectFromWin32Api macro. Modified: trunk/reactos/dll/win32/kernel32/client/job.c trunk/reactos/dll/win32/kernel32/include/base_x.h Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Sat Jul 23 02:17:26 2011 @@ -18,72 +18,29 @@ /* FUNCTIONS ****************************************************************/ - /* * @implemented */ HANDLE WINAPI -CreateJobObjectA(LPSECURITY_ATTRIBUTES lpJobAttributes, - LPCSTR lpName) +CreateJobObjectA(IN LPSECURITY_ATTRIBUTES lpJobAttributes, + IN LPCSTR lpName) { /* Call the W(ide) function */ ConvertWin32AnsiObjectApiToUnicodeApi(JobObject, lpName, lpJobAttributes); } - /* * @implemented */ HANDLE WINAPI -CreateJobObjectW(LPSECURITY_ATTRIBUTES lpJobAttributes, - LPCWSTR lpName) -{ - UNICODE_STRING JobName; - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG Attributes = 0; - PVOID SecurityDescriptor; - HANDLE hJob; - NTSTATUS Status; - - if (lpName != NULL) - { - RtlInitUnicodeString(&JobName, lpName); - } - - if (lpJobAttributes != NULL) - { - if (lpJobAttributes->bInheritHandle) - { - Attributes |= OBJ_INHERIT; - } - - SecurityDescriptor = lpJobAttributes->lpSecurityDescriptor; - } - else - { - SecurityDescriptor = NULL; - } - - InitializeObjectAttributes(&ObjectAttributes, - ((lpName != NULL) ? &JobName : NULL), - Attributes, - NULL, - SecurityDescriptor); - - Status = NtCreateJobObject(&hJob, - JOB_OBJECT_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return hJob; -} - +CreateJobObjectW(IN LPSECURITY_ATTRIBUTES lpJobAttributes, + IN LPCWSTR lpName) +{ + /* Create the NT object */ + CreateNtObjectFromWin32Api(JobObject, JobObject, JOB, lpJobAttributes, lpName); +} /* * @implemented Modified: trunk/reactos/dll/win32/kernel32/include/base_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] Sat Jul 23 02:17:26 2011 @@ -51,21 +51,21 @@ // This macro uses the ConvertAnsiToUnicode macros above to convert a CreateXxxA // Win32 API into its equivalent CreateXxxW API. // -#define ConvertWin32AnsiObjectApiToUnicodeApi(obj, name, args...) \ +#define ConvertWin32AnsiObjectApiToUnicodeApi(obj, name, ...) \ ConvertAnsiToUnicodePrologue \ - if (!name) return Create##obj##W(args, NULL); \ + if (!name) return Create##obj##W(__VA_ARGS__, NULL); \ ConvertAnsiToUnicodeBody(name) \ - if (NT_SUCCESS(Status)) return Create##obj##W(args, UnicodeCache->Buffer); \ + if (NT_SUCCESS(Status)) return Create##obj##W(__VA_ARGS__, UnicodeCache->Buffer); \ ConvertAnsiToUnicodeEpilogue // // This macro uses the ConvertAnsiToUnicode macros above to convert a FindFirst*A // Win32 API into its equivalent FindFirst*W API. // -#define ConvertWin32AnsiChangeApiToUnicodeApi(obj, name, args...) \ +#define ConvertWin32AnsiChangeApiToUnicodeApi(obj, name, ...) \ ConvertAnsiToUnicodePrologue \ ConvertAnsiToUnicodeBody(name) \ - if (NT_SUCCESS(Status)) return obj##W(UnicodeCache->Buffer, args); \ + if (NT_SUCCESS(Status)) return obj##W(UnicodeCache->Buffer, ##__VA_ARGS__); \ ConvertAnsiToUnicodeEpilogue // @@ -87,8 +87,8 @@ ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, \ sec, \ name ? &ObjectName : NULL); -#define CreateNtObjectFromWin32ApiBody(ntobj, access, args...) \ - Status = NtCreate##ntobj(&Handle, access, ObjectAttributes, args); +#define CreateNtObjectFromWin32ApiBody(ntobj, access, ...) \ + Status = NtCreate##ntobj(&Handle, access, ObjectAttributes, ##__VA_ARGS__); #define CreateNtObjectFromWin32ApiEpilogue \ if (NT_SUCCESS(Status)) \ { \ @@ -111,8 +111,8 @@ // be improved to support caller-specified access masks, as the underlying macro // above does support this. // -#define CreateNtObjectFromWin32Api(obj, ntobj, capsobj, sec, name, args...) \ +#define CreateNtObjectFromWin32Api(obj, ntobj, capsobj, sec, name, ...) \ CreateNtObjectFromWin32ApiPrologue(sec, name); \ - CreateNtObjectFromWin32ApiBody(ntobj, capsobj##_ALL_ACCESS, args); \ + CreateNtObjectFromWin32ApiBody(ntobj, capsobj##_ALL_ACCESS, ##__VA_ARGS__); \ CreateNtObjectFromWin32ApiEpilogue

1 0

[ion] 52787: [KERNEL32]: Fix bugs #4, #5, #6. CreateJobObjectA was building a dynamic string isntead of using the TEB. It was also not returning the right error code in case of error. It was also a...
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 00:30:56 2011 New Revision: 52787 URL: http://svn.reactos.org/svn/reactos?rev=52787&view=rev Log: [KERNEL32]: Fix bugs #4, #5, #6. CreateJobObjectA was building a dynamic string isntead of using the TEB. It was also not returning the right error code in case of error. It was also allowing jobs to have names past 260 characters. Fixed by using the ConvertWin32AnsiObjectApiToUnicodeApi macro from 5-6 revisions ago. Modified: trunk/reactos/dll/win32/kernel32/client/job.c Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Sat Jul 23 00:30:56 2011 @@ -27,32 +27,8 @@ CreateJobObjectA(LPSECURITY_ATTRIBUTES lpJobAttributes, LPCSTR lpName) { - HANDLE hJob; - ANSI_STRING AnsiName; - UNICODE_STRING UnicodeName; - - if (lpName != NULL) - { - NTSTATUS Status; - - RtlInitAnsiString(&AnsiName, lpName); - Status = RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, TRUE); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - } - - hJob = CreateJobObjectW(lpJobAttributes, - ((lpName != NULL) ? UnicodeName.Buffer : NULL)); - - if (lpName != NULL) - { - RtlFreeUnicodeString(&UnicodeName); - } - - return hJob; + /* Call the W(ide) function */ + ConvertWin32AnsiObjectApiToUnicodeApi(JobObject, lpName, lpJobAttributes); }

1 0

[ion] 52786: [KERNEL32]: Reformat (of my own code).
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 00:29:00 2011 New Revision: 52786 URL: http://svn.reactos.org/svn/reactos?rev=52786&view=rev Log: [KERNEL32]: Reformat (of my own code). Modified: trunk/reactos/dll/win32/kernel32/client/synch.c Modified: trunk/reactos/dll/win32/kernel32/client/synch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] Sat Jul 23 00:29:00 2011 @@ -1321,8 +1321,7 @@ NTSTATUS Status; /* Initialize the critical section and raise an exception if we failed */ - Status = RtlInitializeCriticalSection( - (PRTL_CRITICAL_SECTION)lpCriticalSection); + Status = RtlInitializeCriticalSection((PVOID)lpCriticalSection); if (!NT_SUCCESS(Status)) RtlRaiseStatus(Status); } @@ -1337,9 +1336,8 @@ NTSTATUS Status; /* Initialize the critical section */ - Status = RtlInitializeCriticalSectionAndSpinCount( - (PRTL_CRITICAL_SECTION)lpCriticalSection, - dwSpinCount); + Status = RtlInitializeCriticalSectionAndSpinCount((PVOID)lpCriticalSection, + dwSpinCount); if (!NT_SUCCESS(Status)) { /* Set failure code */

1 0

[ion] 52785: [KERNEL32]: New macro, not yet used. This one implements the CreateXxxW APIs (or rather, will).
by ion＠svn.reactos.org 23 Jul '11

23 Jul '11

Author: ion Date: Sat Jul 23 00:28:33 2011 New Revision: 52785 URL: http://svn.reactos.org/svn/reactos?rev=52785&view=rev Log: [KERNEL32]: New macro, not yet used. This one implements the CreateXxxW APIs (or rather, will). Modified: trunk/reactos/dll/win32/kernel32/include/base_x.h Modified: trunk/reactos/dll/win32/kernel32/include/base_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] Sat Jul 23 00:28:33 2011 @@ -68,3 +68,51 @@ if (NT_SUCCESS(Status)) return obj##W(UnicodeCache->Buffer, args); \ ConvertAnsiToUnicodeEpilogue +// +// This macro (split it up in 3 pieces to allow for intermediary code in between) +// wraps the usual code path required to create an NT object based on a Unicode +// (Wide) Win32 object creation API. +// +// It makes use of BasepConvertObjectAttributes and allows for a custom access +// mode to be used, and also sets the correct error codes in case of a collision +// +#define CreateNtObjectFromWin32ApiPrologue(sec, name) \ +{ \ + NTSTATUS Status; \ + OBJECT_ATTRIBUTES LocalAttributes; \ + POBJECT_ATTRIBUTES ObjectAttributes; \ + HANDLE Handle; \ + UNICODE_STRING ObjectName; \ + if (name) RtlInitUnicodeString(&ObjectName, name); \ + ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, \ + sec, \ + name ? &ObjectName : NULL); +#define CreateNtObjectFromWin32ApiBody(ntobj, access, args...) \ + Status = NtCreate##ntobj(&Handle, access, ObjectAttributes, args); +#define CreateNtObjectFromWin32ApiEpilogue \ + if (NT_SUCCESS(Status)) \ + { \ + if (Status == STATUS_OBJECT_NAME_EXISTS) \ + SetLastError(ERROR_ALREADY_EXISTS); \ + else \ + SetLastError(ERROR_SUCCESS); \ + return Handle; \ + } \ + SetLastErrorByStatus(Status); \ + return NULL; \ +} + +// +// This macro uses the CreateNtObjectFromWin32Api macros from above to create an +// NT object based on the Win32 API settings. +// +// Note that it is hardcoded to always use XXX_ALL_ACCESS permissions, which is +// the behavior up until Vista. When/if the target moves to Vista, the macro can +// be improved to support caller-specified access masks, as the underlying macro +// above does support this. +// +#define CreateNtObjectFromWin32Api(obj, ntobj, capsobj, sec, name, args...) \ + CreateNtObjectFromWin32ApiPrologue(sec, name); \ + CreateNtObjectFromWin32ApiBody(ntobj, capsobj##_ALL_ACCESS, args); \ + CreateNtObjectFromWin32ApiEpilogue +

1 0

[akhaldi] 52784: [CMAKE] - *Temporarily* back out every rossym/kdbg related revision from 50033 on until bugs 6372 and 6373 are fixed. - We'll lose user mode address translation, argument values an...
by akhaldi＠svn.reactos.org 22 Jul '11

22 Jul '11

Author: akhaldi Date: Fri Jul 22 21:47:29 2011 New Revision: 52784 URL: http://svn.reactos.org/svn/reactos?rev=52784&view=rev Log: [CMAKE] - *Temporarily* back out every rossym/kdbg related revision from 50033 on until bugs 6372 and 6373 are fixed. - We'll lose user mode address translation, argument values and dt. - The same needs to be applied to trunk to allow cmake adoption. Removed: branches/cmake-bringup/lib/rossym/iofile.c Modified: branches/cmake-bringup/include/reactos/rossym.h branches/cmake-bringup/lib/rossym/CMakeLists.txt branches/cmake-bringup/lib/rossym/compat.h branches/cmake-bringup/lib/rossym/delete.c branches/cmake-bringup/lib/rossym/dwarf.h branches/cmake-bringup/lib/rossym/dwarfabbrev.c branches/cmake-bringup/lib/rossym/dwarfaranges.c branches/cmake-bringup/lib/rossym/dwarfcfa.c branches/cmake-bringup/lib/rossym/dwarfget.c branches/cmake-bringup/lib/rossym/dwarfinfo.c branches/cmake-bringup/lib/rossym/dwarfopen.c branches/cmake-bringup/lib/rossym/dwarfpc.c branches/cmake-bringup/lib/rossym/find.c branches/cmake-bringup/lib/rossym/fromfile.c branches/cmake-bringup/lib/rossym/initkm.c branches/cmake-bringup/lib/rossym/initum.c branches/cmake-bringup/lib/rossym/pe.h branches/cmake-bringup/lib/rossym/rossympriv.h branches/cmake-bringup/lib/rossym/zwfile.c branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/ntoskrnl/cache/section/io.c branches/cmake-bringup/ntoskrnl/cache/section/newmm.h branches/cmake-bringup/ntoskrnl/include/internal/kd.h branches/cmake-bringup/ntoskrnl/kdbg/i386/i386-dis.c branches/cmake-bringup/ntoskrnl/kdbg/kdb_cli.c branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c branches/cmake-bringup/ntoskrnl/ke/bug.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/include/reactos/rossym.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/r… Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL… Modified: branches/cmake-bringup/lib/rossym/compat.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/compat… Modified: branches/cmake-bringup/lib/rossym/delete.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/delete… Modified: branches/cmake-bringup/lib/rossym/dwarf.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarf.… Modified: branches/cmake-bringup/lib/rossym/dwarfabbrev.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfa… Modified: branches/cmake-bringup/lib/rossym/dwarfaranges.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfa… Modified: branches/cmake-bringup/lib/rossym/dwarfcfa.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfc… Modified: branches/cmake-bringup/lib/rossym/dwarfget.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfg… Modified: branches/cmake-bringup/lib/rossym/dwarfinfo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfi… Modified: branches/cmake-bringup/lib/rossym/dwarfopen.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfo… Modified: branches/cmake-bringup/lib/rossym/dwarfpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfp… Modified: branches/cmake-bringup/lib/rossym/find.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/find.c… Modified: branches/cmake-bringup/lib/rossym/fromfile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/fromfi… Modified: branches/cmake-bringup/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/initkm… Modified: branches/cmake-bringup/lib/rossym/initum.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/initum… Removed: branches/cmake-bringup/lib/rossym/iofile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/iofile… Modified: branches/cmake-bringup/lib/rossym/pe.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/pe.h?r… Modified: branches/cmake-bringup/lib/rossym/rossympriv.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/rossym… Modified: branches/cmake-bringup/lib/rossym/zwfile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/zwfile… Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… Modified: branches/cmake-bringup/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/cache/se… Modified: branches/cmake-bringup/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/cache/se… Modified: branches/cmake-bringup/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/i38… Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… Modified: branches/cmake-bringup/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/bug.c…

1 0

[cgutman] 52783: [AFD] - Fix (hopefully) the final disconnect bugs
by cgutman＠svn.reactos.org 22 Jul '11

22 Jul '11

Author: cgutman Date: Fri Jul 22 15:11:01 2011 New Revision: 52783 URL: http://svn.reactos.org/svn/reactos?rev=52783&view=rev Log: [AFD] - Fix (hopefully) the final disconnect bugs Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Fri Jul 22 15:11:01 2011 @@ -603,12 +603,13 @@ IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT ); } - if (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE) - FCB->PollState |= AFD_EVENT_DISCONNECT; - else + if (!(FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) + { + /* Signal complete connection closure immediately */ FCB->PollState |= AFD_EVENT_ABORT; - FCB->PollStatus[FD_CLOSE_BIT] = Irp->IoStatus.Status; - PollReeval(FCB->DeviceExt, FCB->FileObject); + FCB->PollStatus[FD_CLOSE_BIT] = Irp->IoStatus.Status; + PollReeval(FCB->DeviceExt, FCB->FileObject); + } SocketStateUnlock(FCB); @@ -721,6 +722,7 @@ FCB->DisconnectFlags = Flags; FCB->DisconnectTimeout = DisReq->Timeout; FCB->DisconnectPending = TRUE; + FCB->SendClosed = TRUE; Status = QueueUserModeIrp(FCB, Irp, FUNCTION_DISCONNECT); if (Status == STATUS_PENDING) Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Fri Jul 22 15:11:01 2011 @@ -32,8 +32,8 @@ { FCB->TdiReceiveClosed = TRUE; - /* Signal unexpected termination immediately */ - FCB->PollState |= AFD_EVENT_ABORT; + /* Signal complete connection failure immediately */ + FCB->PollState |= AFD_EVENT_CLOSE; FCB->PollStatus[FD_CLOSE_BIT] = Status; PollReeval( FCB->DeviceExt, FCB->FileObject ); @@ -232,13 +232,12 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); } else if (CantReadMore(FCB) && - !(FCB->PollState & (AFD_EVENT_ABORT | AFD_EVENT_CLOSE)) && - IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV])) + !(FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_ABORT))) { FCB->PollState &= ~AFD_EVENT_RECEIVE; - /* Signal delayed close event */ - FCB->PollState |= AFD_EVENT_ABORT; + /* Signal graceful receive shutdown */ + FCB->PollState |= AFD_EVENT_DISCONNECT; FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; PollReeval( FCB->DeviceExt, FCB->FileObject ); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Fri Jul 22 15:11:01 2011 @@ -351,26 +351,28 @@ } } - if (FCB->DisconnectPending && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) + if (FCB->PollState & AFD_EVENT_CLOSE) + { + AFD_DbgPrint(MIN_TRACE,("Connection reset by remote peer\n")); + + /* This is an unexpected remote disconnect */ + return UnlockAndMaybeComplete(FCB, FCB->PollStatus[FD_CLOSE_BIT], Irp, 0); + } + + if (FCB->PollState & AFD_EVENT_ABORT) + { + AFD_DbgPrint(MIN_TRACE,("Connection aborted\n")); + + /* This is an abortive socket closure on our side */ + return UnlockAndMaybeComplete(FCB, FCB->PollStatus[FD_CLOSE_BIT], Irp, 0); + } + + if (FCB->SendClosed) { AFD_DbgPrint(MIN_TRACE,("No more sends\n")); - /* We're pending a send shutdown so don't accept anymore sends */ + + /* This is a graceful send closure */ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); - } - - if (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)) - { - AFD_DbgPrint(MIN_TRACE,("No more sends\n")); - if (FCB->PollStatus[FD_CLOSE_BIT] == STATUS_SUCCESS) - { - /* This is a local send shutdown or a graceful remote disconnect */ - return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); - } - else - { - /* This is an unexpected remote disconnect */ - return UnlockAndMaybeComplete(FCB, FCB->PollStatus[FD_CLOSE_BIT], Irp, 0); - } } if( !(SendReq = LockRequest( Irp, IrpSp )) ) Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Fri Jul 22 15:11:01 2011 @@ -173,7 +173,7 @@ } AFD_STORED_DATAGRAM, *PAFD_STORED_DATAGRAM; typedef struct _AFD_FCB { - BOOLEAN Locked, Critical, Overread, NonBlocking, OobInline, TdiReceiveClosed; + BOOLEAN Locked, Critical, Overread, NonBlocking, OobInline, TdiReceiveClosed, SendClosed; UINT State, Flags, GroupID, GroupType; KIRQL OldIrql; UINT LockCount;

1 0

[tfaber] 52782: [KMTESTS/KE] - KeIrql: make use of the new build type features - KeApc: test internals of enabling/disable APCs [KMTESTS/EX] - better portability for ExInterlocked test
by tfaber＠svn.reactos.org 22 Jul '11

22 Jul '11

Author: tfaber Date: Fri Jul 22 12:01:48 2011 New Revision: 52782 URL: http://svn.reactos.org/svn/reactos?rev=52782&view=rev Log: [KMTESTS/KE] - KeIrql: make use of the new build type features - KeApc: test internals of enabling/disable APCs [KMTESTS/EX] - better portability for ExInterlocked test Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Jul 22 12:01:48 2011 @@ -43,7 +43,7 @@ { "KeDpc", Test_KeDpc }, { "KeIrql", Test_KeIrql }, { "KeProcessor", Test_KeProcessor }, - { "KernelType", Test_KernelType }, + { "-KernelType", Test_KernelType }, { "ObCreate", Test_ObCreate }, { NULL, NULL } }; Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Fri Jul 22 12:01:48 2011 @@ -38,10 +38,20 @@ static KSPIN_LOCK SpinLock; +#ifdef _M_IX86 typedef struct { - int esi, edi, ebx, ebp, esp; -} PROCESSOR_STATE, *PPROCESSOR_STATE; + unsigned long esi, edi, ebx, ebp, esp; +} PROCESSOR_STATE; +#elif defined(_M_AMD64) +typedef struct +{ + unsigned long long rsi, rdi, rbx, rbp, rsp, r12, r13, r14, r15; +} PROCESSOR_STATE; +#else +// dummy +typedef int PROCESSOR_STATE; +#endif #if defined(_MSC_VER) && defined(_M_IX86) #define SaveState(State) do \ @@ -63,6 +73,56 @@ ok_eq_hex((OldState)->esp, (NewState)->esp); \ } while (0) +#elif defined(__GNUC__) && defined(_M_IX86) +#define SaveState(State) \ + asm volatile( \ + ".intel_syntax noprefix\n\t" \ + "mov\t[ecx], esi\n\t" \ + "mov\t[ecx+4], edi\n\t" \ + "mov\t[ecx+8], ebx\n\t" \ + "mov\t[ecx+12], ebp\n\t" \ + "mov\t[ecx+16], esp\n\t" \ + ".att_syntax prefix" \ + : : "c" (&State) : "memory" \ + ); + +#define CheckState(OldState, NewState) do \ +{ \ + ok_eq_hex((OldState)->esi, (NewState)->esi); \ + ok_eq_hex((OldState)->edi, (NewState)->edi); \ + ok_eq_hex((OldState)->ebx, (NewState)->ebx); \ + ok_eq_hex((OldState)->ebp, (NewState)->ebp); \ + ok_eq_hex((OldState)->esp, (NewState)->esp); \ +} while (0) +#elif defined(__GNUC__) && defined(_M_AMD64) +#define SaveState(State) \ + asm volatile( \ + ".intel_syntax noprefix\n\t" \ + "mov\t[rcx], rsi\n\t" \ + "mov\t[rcx+8], rdi\n\t" \ + "mov\t[rcx+16], rbx\n\t" \ + "mov\t[rcx+24], rbp\n\t" \ + "mov\t[rcx+32], rsp\n\t" \ + "mov\t[rcx+40], r12\n\t" \ + "mov\t[rcx+48], r13\n\t" \ + "mov\t[rcx+56], r14\n\t" \ + "mov\t[rcx+64], r15\n\t" \ + ".att_syntax prefix" \ + : : "c" (&State) : "memory" \ + ); + +#define CheckState(OldState, NewState) do \ +{ \ + ok_eq_hex((OldState)->rsi, (NewState)->rsi); \ + ok_eq_hex((OldState)->rdi, (NewState)->rdi); \ + ok_eq_hex((OldState)->rbx, (NewState)->rbx); \ + ok_eq_hex((OldState)->rbp, (NewState)->rbp); \ + ok_eq_hex((OldState)->rsp, (NewState)->rsp); \ + ok_eq_hex((OldState)->r12, (NewState)->r12); \ + ok_eq_hex((OldState)->r13, (NewState)->r13); \ + ok_eq_hex((OldState)->r14, (NewState)->r14); \ + ok_eq_hex((OldState)->r15, (NewState)->r15); \ +} while (0) #else #define SaveState(State) #define CheckState(OldState, NewState) @@ -220,36 +280,40 @@ /* macro version */ CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 6, 8, 5L, 5L); CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 5, 9, 9L, 5L); - /* exported function */ -#undef InterlockedCompareExchange - CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 6, 8, 5L, 5L); - CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 5, 9, 9L, 5L); /* these only exist as macros on x86 */ CheckInterlockedCmpXchg(InterlockedCompareExchangeAcquire, LONG, "%ld", 16, 9, 12, 16L, 16L); CheckInterlockedCmpXchg(InterlockedCompareExchangeAcquire, LONG, "%ld", 16, 16, 4, 4L, 16L); CheckInterlockedCmpXchg(InterlockedCompareExchangeRelease, LONG, "%ld", 27, 123, 38, 27L, 27L); CheckInterlockedCmpXchg(InterlockedCompareExchangeRelease, LONG, "%ld", 27, 27, 39, 39L, 27L); + /* exported function */ +#undef InterlockedCompareExchange +#ifdef _M_IX86 + CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 6, 8, 5L, 5L); + CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 5, 9, 9L, 5L); +#endif /* only exists as a macro */ CheckInterlockedCmpXchg(InterlockedCompareExchangePointer, PVOID, "%p", (PVOID)117, (PVOID)711, (PVOID)12, (PVOID)117, (PVOID)117); CheckInterlockedCmpXchg(InterlockedCompareExchangePointer, PVOID, "%p", (PVOID)117, (PVOID)117, (PVOID)228, (PVOID)228, (PVOID)117); /* macro version */ CheckInterlockedCmpXchgI(ExInterlockedCompareExchange64, LONGLONG, "%I64d", 17, 4LL, 20LL, 17LL, 17LL, pSpinLock); CheckInterlockedCmpXchgI(ExInterlockedCompareExchange64, LONGLONG, "%I64d", 17, 17LL, 21LL, 21LL, 17LL, pSpinLock); +#ifdef _M_IX86 /* exported function */ CheckInterlockedCmpXchgI((ExInterlockedCompareExchange64), LONGLONG, "%I64d", 17, 4LL, 20LL, 17LL, 17LL, pSpinLock); CheckInterlockedCmpXchgI((ExInterlockedCompareExchange64), LONGLONG, "%I64d", 17, 17LL, 21LL, 21LL, 17LL, pSpinLock); /* fastcall version */ CheckInterlockedCmpXchgI(ExfInterlockedCompareExchange64, LONGLONG, "%I64d", 17, 4LL, 20LL, 17LL, 17LL); CheckInterlockedCmpXchgI(ExfInterlockedCompareExchange64, LONGLONG, "%I64d", 17, 17LL, 21LL, 21LL, 17LL); +#endif /* Exchange */ CheckInterlockedOp(InterlockedExchange, LONG, "%ld", 5, 8, 8L, 5L); + CheckInterlockedOp(InterlockedExchangePointer, PVOID, "%p", (PVOID)700, (PVOID)93, (PVOID)93, (PVOID)700); #undef InterlockedExchange +#ifdef _M_IX86 CheckInterlockedOp(InterlockedExchange, LONG, "%ld", 5, 8, 8L, 5L); - CheckInterlockedOp(InterlockedExchangePointer, PVOID, "%p", (PVOID)700, (PVOID)93, (PVOID)93, (PVOID)700); CheckInterlockedOp(ExInterlockedExchangeUlong, ULONG, "%lu", 212, 121, 121LU, 212LU, pSpinLock); CheckInterlockedOp((ExInterlockedExchangeUlong), ULONG, "%lu", 212, 121, 121LU, 212LU, pSpinLock); -#ifdef _M_IX86 CheckInterlockedOp(Exi386InterlockedExchangeUlong, ULONG, "%lu", 212, 121, 121LU, 212LU); CheckInterlockedOp(Exfi386InterlockedExchangeUlong, ULONG, "%lu", 212, 121, 121LU, 212LU); #endif @@ -258,7 +322,9 @@ /* TODO: ExInterlockedExchangeAddLargeInteger? */ CheckInterlockedOp(InterlockedExchangeAdd, LONG, "%ld", 312, 7, 319L, 312L); #undef InterlockedExchangeAdd +#ifdef _M_IX86 CheckInterlockedOp(InterlockedExchangeAdd, LONG, "%ld", 312, 7, 319L, 312L); +#endif /* Add */ /* these DO need a valid spinlock even on x86 */ @@ -271,11 +337,12 @@ /* Increment */ CheckInterlockedOpNoArg(InterlockedIncrement, LONG, "%ld", 2341L, 2342L, 2342L); CheckInterlockedOpNoArg(InterlockedIncrement, LONG, "%ld", (LONG)MAXLONG, (LONG)MINLONG, (LONG)MINLONG); + CheckInterlockedOpNoArg(InterlockedIncrementAcquire, LONG, "%ld", 2341L, 2342L, 2342L); + CheckInterlockedOpNoArg(InterlockedIncrementRelease, LONG, "%ld", 2341L, 2342L, 2342L); #undef InterlockedIncrement +#ifdef _M_IX86 CheckInterlockedOpNoArg(InterlockedIncrement, LONG, "%ld", 2341L, 2342L, 2342L); CheckInterlockedOpNoArg(InterlockedIncrement, LONG, "%ld", (LONG)MAXLONG, (LONG)MINLONG, (LONG)MINLONG); - CheckInterlockedOpNoArg(InterlockedIncrementAcquire, LONG, "%ld", 2341L, 2342L, 2342L); - CheckInterlockedOpNoArg(InterlockedIncrementRelease, LONG, "%ld", 2341L, 2342L, 2342L); CheckInterlockedOpNoArg(ExInterlockedIncrementLong, LONG, "%ld", -2L, -1L, (LONG)ResultNegative, pSpinLock); CheckInterlockedOpNoArg(ExInterlockedIncrementLong, LONG, "%ld", -1L, 0L, (LONG)ResultZero, pSpinLock); CheckInterlockedOpNoArg(ExInterlockedIncrementLong, LONG, "%ld", 0L, 1L, (LONG)ResultPositive, pSpinLock); @@ -284,7 +351,6 @@ CheckInterlockedOpNoArg((ExInterlockedIncrementLong), LONG, "%ld", -1L, 0L, (LONG)ResultZero, pSpinLock); CheckInterlockedOpNoArg((ExInterlockedIncrementLong), LONG, "%ld", 0L, 1L, (LONG)ResultPositive, pSpinLock); CheckInterlockedOpNoArg((ExInterlockedIncrementLong), LONG, "%ld", (LONG)MAXLONG, (LONG)MINLONG, (LONG)ResultNegative, pSpinLock); -#ifdef _M_IX86 CheckInterlockedOpNoArg(Exi386InterlockedIncrementLong, LONG, "%ld", -2L, -1L, (LONG)ResultNegative); CheckInterlockedOpNoArg(Exi386InterlockedIncrementLong, LONG, "%ld", -1L, 0L, (LONG)ResultZero); CheckInterlockedOpNoArg(Exi386InterlockedIncrementLong, LONG, "%ld", 0L, 1L, (LONG)ResultPositive); @@ -294,11 +360,12 @@ /* Decrement */ CheckInterlockedOpNoArg(InterlockedDecrement, LONG, "%ld", 1745L, 1744L, 1744L); CheckInterlockedOpNoArg(InterlockedDecrement, LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)MAXLONG); + CheckInterlockedOpNoArg(InterlockedDecrementAcquire, LONG, "%ld", 1745L, 1744L, 1744L); + CheckInterlockedOpNoArg(InterlockedDecrementRelease, LONG, "%ld", 1745L, 1744L, 1744L); #undef InterlockedDecrement +#ifdef _M_IX86 CheckInterlockedOpNoArg(InterlockedDecrement, LONG, "%ld", 1745L, 1744L, 1744L); CheckInterlockedOpNoArg(InterlockedDecrement, LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)MAXLONG); - CheckInterlockedOpNoArg(InterlockedDecrementAcquire, LONG, "%ld", 1745L, 1744L, 1744L); - CheckInterlockedOpNoArg(InterlockedDecrementRelease, LONG, "%ld", 1745L, 1744L, 1744L); CheckInterlockedOpNoArg(ExInterlockedDecrementLong, LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)ResultPositive, pSpinLock); CheckInterlockedOpNoArg(ExInterlockedDecrementLong, LONG, "%ld", 0L, -1L, (LONG)ResultNegative, pSpinLock); CheckInterlockedOpNoArg(ExInterlockedDecrementLong, LONG, "%ld", 1L, 0L, (LONG)ResultZero, pSpinLock); @@ -307,7 +374,6 @@ CheckInterlockedOpNoArg((ExInterlockedDecrementLong), LONG, "%ld", 0L, -1L, (LONG)ResultNegative, pSpinLock); CheckInterlockedOpNoArg((ExInterlockedDecrementLong), LONG, "%ld", 1L, 0L, (LONG)ResultZero, pSpinLock); CheckInterlockedOpNoArg((ExInterlockedDecrementLong), LONG, "%ld", 2L, 1L, (LONG)ResultPositive, pSpinLock); -#ifdef _M_IX86 CheckInterlockedOpNoArg(Exi386InterlockedDecrementLong, LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)ResultPositive); CheckInterlockedOpNoArg(Exi386InterlockedDecrementLong, LONG, "%ld", 0L, -1L, (LONG)ResultNegative); CheckInterlockedOpNoArg(Exi386InterlockedDecrementLong, LONG, "%ld", 1L, 0L, (LONG)ResultZero); Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] Fri Jul 22 12:01:48 2011 @@ -6,146 +6,181 @@ */ #include <ntddk.h> +#include <ntifs.h> +#include <ndk/ketypes.h> #include <kmt_test.h> -#define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, Irql) do \ -{ \ - ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled); \ - ok_eq_bool(KeAreAllApcsDisabled(), SpecialApcsDisabled); \ - ok_irql(Irql); \ +#define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, Irql) do \ +{ \ + ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled || SpecialApcsDisabled); \ + ok_eq_int(Thread->KernelApcDisable, KernelApcsDisabled); \ + ok_eq_bool(KeAreAllApcsDisabled(), AllApcsDisabled); \ + ok_eq_int(Thread->SpecialApcDisable, SpecialApcsDisabled); \ + ok_irql(Irql); \ } while (0) START_TEST(KeApc) { KIRQL Irql; + PKTHREAD Thread = KeGetCurrentThread(); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* critical region */ KeEnterCriticalRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-2, 0, FALSE, PASSIVE_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-3, 0, FALSE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-2, 0, FALSE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* guarded region */ KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -3, TRUE, PASSIVE_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* mix them */ KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* leave without entering */ + KeLeaveCriticalRegion(); + CheckApcs(1, 0, FALSE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + KeLeaveGuardedRegion(); + CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); + KeEnterGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + KeLeaveCriticalRegion(); + CheckApcs(1, 0, FALSE, PASSIVE_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(1, 1, TRUE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); + KeEnterGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* manually disable APCs */ + Thread->KernelApcDisable = -1; + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + Thread->SpecialApcDisable = -1; + CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); + Thread->KernelApcDisable = 0; + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + Thread->SpecialApcDisable = 0; + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* raised irql - APC_LEVEL should disable APCs */ KeRaiseIrql(APC_LEVEL, &Irql); - CheckApcs(FALSE, TRUE, APC_LEVEL); + CheckApcs(0, 0, TRUE, APC_LEVEL); KeLowerIrql(Irql); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* KeAre*ApcsDisabled are documented to work up to DISPATCH_LEVEL... */ KeRaiseIrql(DISPATCH_LEVEL, &Irql); - CheckApcs(FALSE, TRUE, DISPATCH_LEVEL); + CheckApcs(0, 0, TRUE, DISPATCH_LEVEL); KeLowerIrql(Irql); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* ... but also work on higher levels! */ KeRaiseIrql(HIGH_LEVEL, &Irql); - CheckApcs(FALSE, TRUE, HIGH_LEVEL); + CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* now comes the crazy stuff */ KeRaiseIrql(HIGH_LEVEL, &Irql); - CheckApcs(FALSE, TRUE, HIGH_LEVEL); + CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(-1, 0, TRUE, HIGH_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(FALSE, TRUE, HIGH_LEVEL); + CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(0, -1, TRUE, HIGH_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(FALSE, TRUE, HIGH_LEVEL); + CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); KeRaiseIrql(HIGH_LEVEL, &Irql); - CheckApcs(FALSE, TRUE, HIGH_LEVEL); + CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(-1, 0, TRUE, HIGH_LEVEL); KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(-1, -1, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeRaiseIrql(HIGH_LEVEL, &Irql); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(0, -1, TRUE, HIGH_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(-1, -1, TRUE, HIGH_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(-1, 0, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeRaiseIrql(HIGH_LEVEL, &Irql); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(-1, 0, TRUE, HIGH_LEVEL); KeEnterGuardedRegion(); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(-1, -1, TRUE, HIGH_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(0, -1, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); - CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeLeaveGuardedRegion(); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); KeEnterCriticalRegion(); - CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeRaiseIrql(HIGH_LEVEL, &Irql); - CheckApcs(TRUE, TRUE, HIGH_LEVEL); + CheckApcs(-1, 0, TRUE, HIGH_LEVEL); KeLeaveCriticalRegion(); - CheckApcs(FALSE, TRUE, HIGH_LEVEL); + CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); - CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); } Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c [iso-8859-1] Fri Jul 22 12:01:48 2011 @@ -23,18 +23,12 @@ PrevIrql = KeGetCurrentIrql(); - // SYNCH_LEVEL is different for UP/MP - if (KeGetCurrentPrcb()->BuildType & PRCB_BUILD_UNIPROCESSOR) - { - trace("This is a Uniprocessor kernel\n"); + /* SYNCH_LEVEL is different for UP/MP */ + if (KmtIsMultiProcessorBuild) + SynchIrql = IPI_LEVEL - 2; + else SynchIrql = DISPATCH_LEVEL; - } - else - { - trace("This is a Multiprocessor kernel\n"); - SynchIrql = IPI_LEVEL - 2; - } - + /* some Irqls MUST work */ { const KIRQL Irqls[] = { LOW_LEVEL, PASSIVE_LEVEL, APC_LEVEL, DISPATCH_LEVEL, @@ -129,6 +123,17 @@ ok_eq_uint(Irql, SynchIrql); KeLowerIrql(PASSIVE_LEVEL); + /* these bugcheck on a checked build but run fine on free! */ + if (!KmtIsCheckedBuild) + { + KeRaiseIrql(HIGH_LEVEL, &Irql); + KeRaiseIrql(APC_LEVEL, &Irql); + ok_irql(APC_LEVEL); + KeLowerIrql(HIGH_LEVEL); + ok_irql(HIGH_LEVEL); + KeLowerIrql(PASSIVE_LEVEL); + } + /* make sure we exit gracefully */ ok_irql(PASSIVE_LEVEL); KeLowerIrql(PASSIVE_LEVEL);

1 0

[tfaber] 52781: [KMTESTS] - small structure improvement in kmt_test.h - add globals to allow easy checking for UP/MP & Free/Checked builds, as that is required for some tests - add KernelType examp...
by tfaber＠svn.reactos.org 22 Jul '11

22 Jul '11

Author: tfaber Date: Fri Jul 22 11:51:18 2011 New Revision: 52781 URL: http://svn.reactos.org/svn/reactos?rev=52781&view=rev Log: [KMTESTS] - small structure improvement in kmt_test.h - add globals to allow easy checking for UP/MP & Free/Checked builds, as that is required for some tests - add KernelType example test demonstrating the above - add a function to restore the irql (allows some failing tests to exit gracefully) Added: branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Fri Jul 22 11:51:18 2011 @@ -14,6 +14,7 @@ kmtest_drv/testlist.c example/Example.c + example/KernelType.c ntos_ex/ExHardError.c ntos_ex/ExInterlocked.c ntos_ex/ExPools.c Added: branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c [iso-8859-1] Fri Jul 22 11:51:18 2011 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Kernel Type example test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <ntddk.h> +#include <kmt_test.h> + +START_TEST(KernelType) +{ + if (KmtIsMultiProcessorBuild) + trace("This is a MultiProcessor kernel\n"); + else + trace("This is a Uniprocessor kernel\n"); + if (KmtIsCheckedBuild) + trace("This is a Checked kernel\n"); + else + trace("This is a Free kernel\n"); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Fri Jul 22 11:51:18 2011 @@ -79,6 +79,11 @@ PKMT_RESULTBUFFER ResultBuffer; PMDL Mdl; } KMT_DEVICE_EXTENSION, *PKMT_DEVICE_EXTENSION; + +extern BOOLEAN KmtIsCheckedBuild; +extern BOOLEAN KmtIsMultiProcessorBuild; + +VOID KmtSetIrql(IN KIRQL NewIrql); #elif defined KMT_USER_MODE DWORD KmtRunKernelTest(IN PCSTR TestName); @@ -146,9 +151,22 @@ FILE_ANY_ACCESS) #if defined KMT_DEFINE_TEST_FUNCTIONS -PKMT_RESULTBUFFER ResultBuffer = NULL; - -#if defined KMT_USER_MODE + +#if defined KMT_KERNEL_MODE +BOOLEAN KmtIsCheckedBuild; +BOOLEAN KmtIsMultiProcessorBuild; + +VOID KmtSetIrql(IN KIRQL NewIrql) +{ + KIRQL Irql = KeGetCurrentIrql(); + if (Irql > NewIrql) + KeLowerIrql(NewIrql); + else if (Irql < NewIrql) + KeRaiseIrql(NewIrql, &Irql); +} + +INT __cdecl KmtVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); +#elif defined KMT_USER_MODE static PKMT_RESULTBUFFER KmtAllocateResultBuffer(SIZE_T LogBufferMaxLength) { PKMT_RESULTBUFFER Buffer = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(KMT_RESULTBUFFER, LogBuffer[LogBufferMaxLength])); @@ -166,7 +184,11 @@ { HeapFree(GetProcessHeap(), 0, Buffer); } + +#define KmtVSNPrintF vsnprintf #endif /* defined KMT_USER_MODE */ + +PKMT_RESULTBUFFER ResultBuffer = NULL; static VOID KmtAddToLogBuffer(PKMT_RESULTBUFFER Buffer, PCSTR String, SIZE_T Length) { @@ -191,12 +213,6 @@ memcpy(&Buffer->LogBuffer[OldLength], String, Length); } -#ifdef KMT_KERNEL_MODE -INT __cdecl KmtVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); -#elif defined KMT_USER_MODE -#define KmtVSNPrintF vsnprintf -#endif /* defined KMT_USER_MODE */ - KMT_FORMAT(ms_printf, 5, 0) static SIZE_T KmtXVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR FileAndLine, PCSTR Prepend, PCSTR Format, va_list Arguments) { Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Fri Jul 22 11:51:18 2011 @@ -12,6 +12,7 @@ </directory> <directory name="example"> <file>Example.c</file> + <file>KernelType.c</file> </directory> <directory name="ntos_ex"> <file>ExHardError.c</file> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Fri Jul 22 11:51:18 2011 @@ -6,6 +6,8 @@ */ #include <ntddk.h> +#include <ntifs.h> +#include <ndk/ketypes.h> #include <ntstrsafe.h> #include <limits.h> #include <pseh/pseh2.h> @@ -49,12 +51,17 @@ NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING DeviceName; PKMT_DEVICE_EXTENSION DeviceExtension; + PKPRCB Prcb; PAGED_CODE(); UNREFERENCED_PARAMETER(RegistryPath); DPRINT("DriverEntry\n"); + + Prcb = KeGetCurrentPrcb(); + KmtIsCheckedBuild = (Prcb->BuildType & PRCB_BUILD_DEBUG) != 0; + KmtIsMultiProcessorBuild = (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) == 0; RtlInitUnicodeString(&DeviceName, KMTEST_DEVICE_DRIVER_PATH); Status = IoCreateDevice(DriverObject, sizeof(KMT_DEVICE_EXTENSION), Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] Fri Jul 22 11:51:18 2011 @@ -6,6 +6,8 @@ */ #include <ntddk.h> +#include <ntifs.h> +#include <ndk/ketypes.h> #define KMT_DEFINE_TEST_FUNCTIONS #include <kmt_test.h> @@ -104,10 +106,15 @@ PCWSTR DeviceNameSuffix; INT Flags = 0; int i; + PKPRCB Prcb; PAGED_CODE(); DPRINT("DriverEntry\n"); + + Prcb = KeGetCurrentPrcb(); + KmtIsCheckedBuild = (Prcb->BuildType & PRCB_BUILD_DEBUG) != 0; + KmtIsMultiProcessorBuild = (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) == 0; /* get the Kmtest device, so that we get a ResultBuffer pointer */ RtlInitUnicodeString(&KmtestDeviceName, KMTEST_DEVICE_DRIVER_PATH); Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Jul 22 11:51:18 2011 @@ -23,6 +23,7 @@ KMT_TESTFUNC Test_KeDpc; KMT_TESTFUNC Test_KeIrql; KMT_TESTFUNC Test_KeProcessor; +KMT_TESTFUNC Test_KernelType; KMT_TESTFUNC Test_ObCreate; const KMT_TEST TestList[] = @@ -42,6 +43,7 @@ { "KeDpc", Test_KeDpc }, { "KeIrql", Test_KeIrql }, { "KeProcessor", Test_KeProcessor }, + { "KernelType", Test_KernelType }, { "ObCreate", Test_ObCreate }, { NULL, NULL } };

1 0

[tfaber] 52780: [KMTESTS] - put driver files into 'bin' with the other tests instead of system32\drivers - globally define NTDDI_VERSION=NTDDI_WS03_SP1 instead of doing it in each test - fix testli...
by tfaber＠svn.reactos.org 22 Jul '11

22 Jul '11

Author: tfaber Date: Fri Jul 22 11:33:17 2011 New Revision: 52780 URL: http://svn.reactos.org/svn/reactos?rev=52780&view=rev Log: [KMTESTS] - put driver files into 'bin' with the other tests instead of system32\drivers - globally define NTDDI_VERSION=NTDDI_WS03_SP1 instead of doing it in each test - fix testlist sorting (ASCII-order, but ignore leading minus) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -36,9 +36,9 @@ set_module_type(kmtest_drv kernelmodedriver) target_link_libraries(kmtest_drv kmtest_printf ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) -set_property(TARGET kmtest_drv PROPERTY COMPILE_DEFINITIONS KMT_KERNEL_MODE) +set_property(TARGET kmtest_drv PROPERTY COMPILE_DEFINITIONS KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) -add_cd_file(TARGET kmtest_drv DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET kmtest_drv DESTINATION reactos/bin FOR all) add_library(kmtest_printf kmtest_drv/printf_stubs.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -12,4 +12,4 @@ add_importlibs(example_drv ntoskrnl hal) set_property(TARGET example_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER) -add_cd_file(TARGET example_drv DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET example_drv DESTINATION reactos/bin FOR all) Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -1,4 +1,4 @@ -<module name="example_drv" type="kernelmodedriver" installbase="system32/drivers" installname="example_drv.sys"> +<module name="example_drv" type="kernelmodedriver" installbase="bin" installname="example_drv.sys"> <include base="kmtest_drv">include</include> <library>ntoskrnl</library> <library>hal</library> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -1,4 +1,4 @@ -<module name="kmtest" type="win32cui" installbase="system32" installname="kmtest.exe"> +<module name="kmtest" type="win32cui" installbase="bin" installname="kmtest.exe"> <include base="kmtest">include</include> <library>advapi32</library> <define name="KMT_USER_MODE" /> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -71,6 +71,33 @@ fprintf(stderr, "%s: error 0x%08lx: %s\n", ErrorFileAndLine, Error, Message); LocalFree(Message); +} + +/** + * @name CompareTestNames + * + * strcmp that skips a leading '-' on either string if present + * + * @param Str1 + * @param Str2 + * @return see strcmp + */ +static +INT +CompareTestNames( + IN PCSTR Str1, + IN PCSTR Str2) +{ + if (*Str1 == '-') + ++Str1; + if (*Str2 == '-') + ++Str2; + while (*Str1 && *Str1 == *Str2) + { + ++Str1; + ++Str2; + } + return *Str1 - *Str2; } /** @@ -118,7 +145,7 @@ } else { - int Result = strcmp(TestEntry->TestName, TestName); + INT Result = CompareTestNames(TestEntry->TestName, TestName); if (Result == 0) { Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -1,10 +1,11 @@ -<module name="kmtest_drv" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest_drv.sys"> +<module name="kmtest_drv" type="kernelmodedriver" installbase="bin" installname="kmtest_drv.sys"> <include base="kmtest_drv">include</include> <library>ntoskrnl</library> <library>hal</library> <library>pseh</library> <library>kmtest_printf</library> <define name="KMT_KERNEL_MODE" /> + <define name="NTDDI_VERSION">NTDDI_WS03SP1</define> <directory name="kmtest_drv"> <file>kmtest_drv.c</file> <file>testlist.c</file> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -27,13 +27,13 @@ const KMT_TEST TestList[] = { - { "Example", Test_Example }, { "ExHardError", Test_ExHardError }, { "-ExHardErrorInteractive", Test_ExHardErrorInteractive }, { "ExInterlocked", Test_ExInterlocked }, { "ExPools", Test_ExPools }, { "ExResource", Test_ExResource }, { "ExTimer", Test_ExTimer }, + { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoIrp", Test_IoIrp }, Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -25,8 +25,6 @@ __declspec(dllimport) int __stdcall Exi386InterlockedIncrementLong(long *); __declspec(dllimport) int __stdcall Exi386InterlockedDecrementLong(long *); -#undef NTDDI_VERSION -#define NTDDI_VERSION NTDDI_WS03SP1 #include <ntddk.h> #include <pseh/pseh2.h> @@ -213,7 +211,7 @@ PKSPIN_LOCK pSpinLock = &SpinLock; PROCESSOR_STATE OldState, NewState; - /* on x86, most of these are supported intrinsicly and don't need a spinlock! */ + /* on x86, most of these are supported intrinsically and don't need a spinlock! */ #if defined _M_IX86 || defined _M_AMD64 pSpinLock = NULL; #endif Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -5,8 +5,6 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#undef NTDDI_VERSION -#define NTDDI_VERSION NTDDI_WS03SP1 #include <ntddk.h> #include <ntifs.h> #include <ndk/extypes.h> Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -5,8 +5,6 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#undef NTDDI_VERSION -#define NTDDI_VERSION NTDDI_WS03SP1 #include <ntddk.h> #include <kmt_test.h> Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c [iso-8859-1] Fri Jul 22 11:33:17 2011 @@ -30,8 +30,7 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - PKPCR Pcr = KeGetPcr(); - PKPRCB Prcb = Pcr->Prcb; + PKPRCB Prcb = KeGetCurrentPrcb(); ok_irql(DISPATCH_LEVEL); InterlockedIncrement(&DpcCount); @@ -58,7 +57,7 @@ ok_eq_pointer(Dpc->SystemArgument1, SystemArgument1); ok_eq_pointer(Dpc->SystemArgument2, SystemArgument2); ok_eq_pointer(Dpc->DpcData, NULL); - + ok_eq_uint(Prcb->DpcRoutineActive, 1); /* this DPC is not in the list anymore, but it was at the head! */ ok_eq_pointer(Prcb->DpcData[DPC_NORMAL].DpcListHead.Flink, Dpc->DpcListEntry.Flink);

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