Ros-diffs June 2012

ros-diffs@reactos.org

11 participants
120 discussions

[tkreuzer] 56743: [PSDK] Fix winnt.h include guard definition

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 17 16:06:33 2012 New Revision: 56743 URL: http://svn.reactos.org/svn/reactos?rev=56743&view=rev Log: [PSDK] Fix winnt.h include guard definition Modified: trunk/reactos/include/psdk/ddraw.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/include/reactos/idl/lsa.idl trunk/reactos/include/reactos/idl/ms-dtyp.idl trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/include/psdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddraw.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ddraw.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ddraw.h [iso-8859-1] Sun Jun 17 16:06:33 2012 @@ -7,7 +7,7 @@ #include <objbase.h> #else #define IUnknown void -#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_H) +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_) #define CO_E_NOTINITIALIZED 0x800401F0L #endif #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jun 17 16:06:33 2012 @@ -1,5 +1,5 @@ -#ifndef _WINNT_H -#define _WINNT_H +#ifndef _WINNT_ +#define _WINNT_ #if !defined(__ROS_LONG64__) #ifdef __WINESRC__ Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Sun Jun 17 16:06:33 2012 @@ -8,7 +8,7 @@ #define PAGE_SIZE 0x1000 #endif -#ifndef _WINNT_H +#ifndef _WINNT_ // // IRQLs // @@ -34,7 +34,7 @@ #define PCR ((KPCR * const)KIP0PCRADDRESS) #define USERPCR ((volatile KPCR * const)USPCR) #define KeGetPcr() PCR -#ifndef _WINNT_H +#ifndef _WINNT_ #define SharedUserData ((KUSER_SHARED_DATA * const)KI_USER_SHARED_DATA) // @@ -124,7 +124,7 @@ // // Processor Control Region // -#ifdef _WINNT_H +#ifdef _WINNT_ #define KIRQL ULONG #endif @@ -241,7 +241,7 @@ KfAcquireSpinLock( IN OUT ULONG_PTR* SpinLock); -#ifndef _WINNT_H +#ifndef _WINNT_ // // IRQL Support on ARM is similar to MIPS/ALPHA // Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Jun 17 16:06:33 2012 @@ -9,7 +9,7 @@ typedef [context_handle] PVOID LSAPR_HANDLE; typedef LSAPR_HANDLE *PLSAPR_HANDLE; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef struct _LUID { DWORD LowPart; LONG HighPart; @@ -33,7 +33,7 @@ [size_is(AclSize - 4)] BYTE Dummy1[*]; } LSAPR_ACL, *PLSAPR_ACL; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; cpp_quote("#endif") @@ -282,7 +282,7 @@ RPC_UNICODE_STRING ReplicaAccountName; } POLICY_LSA_REPLICA_SRCE_INFO, *PPOLICY_LSA_REPLICA_SRCE_INFO; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef struct _QUOTA_LIMITS { INT64 PagedPoolLimit; INT64 NonPagedPoolLimit; Modified: trunk/reactos/include/reactos/idl/ms-dtyp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dty… ============================================================================== --- trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Sun Jun 17 16:06:33 2012 @@ -26,11 +26,11 @@ typedef signed __int64 LONG64; cpp_quote("#endif") typedef unsigned __int64 QWORD; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef short SHORT; cpp_quote("#endif") typedef __int64 TIME; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef char CHAR, *PCHAR; typedef unsigned char UCHAR, *PUCHAR; cpp_quote("#endif") @@ -43,27 +43,27 @@ typedef unsigned int UINT32; typedef unsigned __int64 UINT64; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef unsigned long ULONG, *PULONG; cpp_quote("#endif") cpp_quote("#ifndef _BASETSD_H") typedef unsigned int ULONG32; typedef unsigned __int64 ULONG64; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef unsigned __int64 ULONGLONG; typedef unsigned short USHORT; cpp_quote("#endif") cpp_quote("#ifndef _WINDEF_H") typedef unsigned short WORD, *PWORD, *LPWORD; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef long LONG, *PLONG; cpp_quote("#endif") cpp_quote("#ifndef _WINDEF_H") typedef long *LPLONG; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef signed __int64 LONGLONG; cpp_quote("#endif") @@ -74,7 +74,7 @@ typedef double DOUBLE; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef BYTE BOOLEAN, *PBOOLEAN; cpp_quote("#endif") cpp_quote("#ifndef _BASETSD_H") @@ -89,13 +89,13 @@ typedef ULONG_PTR DWORD_PTR; cpp_quote("#endif") typedef DWORD NET_API_STATUS; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef ULONGLONG DWORDLONG, *PDWORDLONG; cpp_quote("#endif") typedef DWORD HCALL; //typedef DWORD HRESULT; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef void *HANDLE; typedef void /*VOID,*/ *PVOID; cpp_quote("#endif") @@ -105,7 +105,7 @@ typedef [context_handle] void *PCONTEXT_HANDLE; typedef PCONTEXT_HANDLE *PPCONTEXT_HANDLE; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef wchar_t WCHAR, *PWCHAR; cpp_quote("#if 0") typedef wchar_t UNICODE; Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun Jun 17 16:06:33 2012 @@ -59,7 +59,7 @@ [size_is(Count)] PRPC_UNICODE_STRING Element; } SAMPR_RETURNED_USTRING_ARRAY, *PSAMPR_RETURNED_USTRING_ARRAY; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef enum _SID_NAME_USE { SidTypeUser = 1,

12 years, 6 months

[ekohl] 56742: [ADVAPI32] RegCreateKeyExA/W and RegOpenKeyExA/W: Handle Option REG_OPTION_OPEN_LINK properly. This fixes four wine tests.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 17 15:35:35 2012 New Revision: 56742 URL: http://svn.reactos.org/svn/reactos?rev=56742&view=rev Log: [ADVAPI32] RegCreateKeyExA/W and RegOpenKeyExA/W: Handle Option REG_OPTION_OPEN_LINK properly. This fixes four wine tests. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Jun 17 15:35:35 2012 @@ -1021,8 +1021,9 @@ { UNICODE_STRING SubKeyString; UNICODE_STRING ClassString; - OBJECT_ATTRIBUTES Attributes; + OBJECT_ATTRIBUTES ObjectAttributes; HANDLE ParentKey; + ULONG Attributes = OBJ_CASE_INSENSITIVE; NTSTATUS Status; TRACE("RegCreateKeyExA() called\n"); @@ -1046,15 +1047,18 @@ lpClass); } + if (dwOptions & REG_OPTION_OPEN_LINK) + Attributes |= OBJ_OPENLINK; + RtlCreateUnicodeStringFromAsciiz(&SubKeyString, (LPSTR)lpSubKey); - InitializeObjectAttributes(&Attributes, + InitializeObjectAttributes(&ObjectAttributes, &SubKeyString, - OBJ_CASE_INSENSITIVE, + Attributes, (HANDLE)ParentKey, lpSecurityAttributes ? (PSECURITY_DESCRIPTOR)lpSecurityAttributes->lpSecurityDescriptor : NULL); Status = CreateNestedKey(phkResult, - &Attributes, + &ObjectAttributes, (lpClass == NULL)? NULL : &ClassString, dwOptions, samDesired, @@ -1095,8 +1099,9 @@ { UNICODE_STRING SubKeyString; UNICODE_STRING ClassString; - OBJECT_ATTRIBUTES Attributes; + OBJECT_ATTRIBUTES ObjectAttributes; HANDLE ParentKey; + ULONG Attributes = OBJ_CASE_INSENSITIVE; NTSTATUS Status; TRACE("RegCreateKeyExW() called\n"); @@ -1113,18 +1118,21 @@ } TRACE("ParentKey %p\n", ParentKey); + + if (dwOptions & REG_OPTION_OPEN_LINK) + Attributes |= OBJ_OPENLINK; RtlInitUnicodeString(&ClassString, lpClass); RtlInitUnicodeString(&SubKeyString, lpSubKey); - InitializeObjectAttributes(&Attributes, + InitializeObjectAttributes(&ObjectAttributes, &SubKeyString, - OBJ_CASE_INSENSITIVE, + Attributes, (HANDLE)ParentKey, lpSecurityAttributes ? (PSECURITY_DESCRIPTOR)lpSecurityAttributes->lpSecurityDescriptor : NULL); Status = CreateNestedKey(phkResult, - &Attributes, + &ObjectAttributes, (lpClass == NULL)? NULL : &ClassString, dwOptions, samDesired, @@ -3347,6 +3355,7 @@ UNICODE_STRING SubKeyString; HANDLE KeyHandle; NTSTATUS Status; + ULONG Attributes = OBJ_CASE_INSENSITIVE; LONG ErrorCode = ERROR_SUCCESS; TRACE("RegOpenKeyExA hKey 0x%x lpSubKey %s ulOptions 0x%x samDesired 0x%x phkResult %p\n", @@ -3362,12 +3371,15 @@ { return RtlNtStatusToDosError(Status); } + + if (ulOptions & REG_OPTION_OPEN_LINK) + Attributes |= OBJ_OPENLINK; RtlCreateUnicodeStringFromAsciiz(&SubKeyString, (LPSTR)lpSubKey); InitializeObjectAttributes(&ObjectAttributes, &SubKeyString, - OBJ_CASE_INSENSITIVE, + Attributes, KeyHandle, NULL); @@ -3402,6 +3414,7 @@ UNICODE_STRING SubKeyString; HANDLE KeyHandle; NTSTATUS Status; + ULONG Attributes = OBJ_CASE_INSENSITIVE; LONG ErrorCode = ERROR_SUCCESS; TRACE("RegOpenKeyExW hKey 0x%x lpSubKey %S ulOptions 0x%x samDesired 0x%x phkResult %p\n", @@ -3416,6 +3429,9 @@ { return RtlNtStatusToDosError(Status); } + + if (ulOptions & REG_OPTION_OPEN_LINK) + Attributes |= OBJ_OPENLINK; if (lpSubKey != NULL) RtlInitUnicodeString(&SubKeyString, (LPWSTR)lpSubKey); @@ -3424,7 +3440,7 @@ InitializeObjectAttributes(&ObjectAttributes, &SubKeyString, - OBJ_CASE_INSENSITIVE, + Attributes, KeyHandle, NULL);

12 years, 6 months

[tfaber] 56737: [NTOSKRNL:MM] - Do not ignore pool tag in ExFreePoolWithTag when freeing to a lookaside list

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 15 07:27:45 2012 New Revision: 56737 URL: http://svn.reactos.org/svn/reactos?rev=56737&view=rev Log: [NTOSKRNL:MM] - Do not ignore pool tag in ExFreePoolWithTag when freeing to a lookaside list Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Fri Jun 15 07:27:45 2012 @@ -2151,6 +2151,15 @@ Entry->PoolType - 1); // + // Check block tag + // + if (TagToFree && TagToFree != Tag) + { + DPRINT1("Freeing pool - invalid tag specified: %.4s != %.4s\n", (char*)&TagToFree, (char*)&Tag); + KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Tag, TagToFree); + } + + // // Is this allocation small enough to have come from a lookaside list? // if (BlockSize <= MAXIMUM_PROCESSORS) @@ -2201,15 +2210,6 @@ OldIrql = ExLockPool(PoolDesc); // - // Check block tag - // - if (TagToFree && TagToFree != Entry->PoolTag) - { - DPRINT1("Freeing pool - invalid tag specified: %.4s != %.4s\n", (char*)&TagToFree, (char*)&Entry->PoolTag); - KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Entry->PoolTag, TagToFree); - } - - // // Check if the next allocation is at the end of the page // ExpCheckPoolBlocks(Entry);

12 years, 6 months

[tfaber] 56736: [NTOSKRNL] - Fix build

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 14 22:10:34 2012 New Revision: 56736 URL: http://svn.reactos.org/svn/reactos?rev=56736&view=rev Log: [NTOSKRNL] - Fix build Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Thu Jun 14 22:10:34 2012 @@ -425,7 +425,7 @@ 0, ExCallbackObjectType, KernelMode, - &Callback, + (PVOID *)&Callback, NULL); /* Close the Handle, since we now have the pointer */

12 years, 6 months

[tfaber] 56735: [NTOSKRNL] - Fix callback pool tags - Fix a reference leak in PsSetCreateProcessNotifyRoutine See issue #7120 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 14 22:06:24 2012 New Revision: 56735 URL: http://svn.reactos.org/svn/reactos?rev=56735&view=rev Log: [NTOSKRNL] - Fix callback pool tags - Fix a reference leak in PsSetCreateProcessNotifyRoutine See issue #7120 for more details. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/ps/psnotify.c Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Thu Jun 14 22:06:24 2012 @@ -132,7 +132,7 @@ fstub/disksup.c fstub/fstubex.c fstub/halstub.c - fstub/translate.c + fstub/translate.c inbv/inbv.c inbv/inbvport.c io/iomgr/adapter.c Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Thu Jun 14 22:06:24 2012 @@ -59,7 +59,7 @@ /* Allocate a callback */ CallbackBlock = ExAllocatePoolWithTag(PagedPool, sizeof(EX_CALLBACK_ROUTINE_BLOCK), - 'CbRb'); + TAG_CALLBACK_ROUTINE_BLOCK); if (CallbackBlock) { /* Initialize it */ @@ -77,7 +77,7 @@ ExFreeCallBack(IN PEX_CALLBACK_ROUTINE_BLOCK CallbackBlock) { /* Just free it from memory */ - ExFreePoolWithTag(CallbackBlock, CALLBACK_TAG); + ExFreePoolWithTag(CallbackBlock, TAG_CALLBACK_ROUTINE_BLOCK); } VOID @@ -124,7 +124,7 @@ EX_FAST_REF OldValue; ULONG_PTR Count; PEX_CALLBACK_ROUTINE_BLOCK CallbackBlock; - + /* Acquire a reference */ OldValue = ExAcquireFastReference(&CallBack->RoutineBlock); Count = ExGetCountFastReference(OldValue); @@ -140,10 +140,10 @@ ASSERT(FALSE); return NULL; } - + /* Get the callback block */ CallbackBlock = ExGetObjectFastReference(OldValue); - + /* Check if this is the last reference */ if (Count == 1) { @@ -425,7 +425,7 @@ 0, ExCallbackObjectType, KernelMode, - (PVOID)&Callback, + &Callback, NULL); /* Close the Handle, since we now have the pointer */ @@ -567,7 +567,7 @@ /* Allocate memory for the structure */ CallbackRegistration = ExAllocatePoolWithTag(NonPagedPool, sizeof(CALLBACK_REGISTRATION), - CALLBACK_TAG); + TAG_CALLBACK_REGISTRATION); if (!CallbackRegistration) { /* Dereference and fail */ @@ -602,7 +602,7 @@ KeReleaseSpinLock(&CallbackObject->Lock, OldIrql); /* Free the registration */ - ExFreePoolWithTag(CallbackRegistration, CALLBACK_TAG); + ExFreePoolWithTag(CallbackRegistration, TAG_CALLBACK_REGISTRATION); CallbackRegistration = NULL; /* Dereference the object */ @@ -676,7 +676,7 @@ KeReleaseSpinLock(&CallbackObject->Lock, OldIrql); /* Delete this registration */ - ExFreePoolWithTag(CallbackRegistration, CALLBACK_TAG); + ExFreePoolWithTag(CallbackRegistration, TAG_CALLBACK_REGISTRATION); /* Remove the reference */ ObDereferenceObject(CallbackObject); Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Thu Jun 14 22:06:24 2012 @@ -5,8 +5,9 @@ #define TAG_BCB ' BCB' #define TAG_IBCB 'BCBi' -/* formely located in include/callback.h */ -#define CALLBACK_TAG 'KBLC' +/* Executive Callbacks */ +#define TAG_CALLBACK_ROUTINE_BLOCK 'brbC' +#define TAG_CALLBACK_REGISTRATION 'eRBC' /* formely located in dbg/dbgkobj.c */ #define TAG_DEBUG_EVENT 'EgbD' Modified: trunk/reactos/ntoskrnl/ps/psnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psnotify.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psnotify.c [iso-8859-1] Thu Jun 14 22:06:24 2012 @@ -48,35 +48,32 @@ if (!CallBack) continue; /* Check it this is a matching block */ - if (ExGetCallBackBlockRoutine(CallBack) != (PVOID)NotifyRoutine) - { - /* It's not, try the next one */ - continue; - } - - /* It is, clear the current routine */ - if (ExCompareExchangeCallBack(&PspProcessNotifyRoutine[i], - NULL, - CallBack)) - { - /* Decrement the number of routines */ - InterlockedDecrement((PLONG)&PspProcessNotifyRoutineCount); + if (ExGetCallBackBlockRoutine(CallBack) == (PVOID)NotifyRoutine) + { + /* Try removing it if it matches */ + if (ExCompareExchangeCallBack(&PspProcessNotifyRoutine[i], + NULL, + CallBack)) + { + /* Decrement the number of routines */ + InterlockedDecrement((PLONG)&PspProcessNotifyRoutineCount); + + /* Dereference the block */ + ExDereferenceCallBackBlock(&PspProcessNotifyRoutine[i], + CallBack); + + /* Wait for active callbacks */ + ExWaitForCallBacks(CallBack); + + /* Free the callback and exit */ + ExFreeCallBack(CallBack); + return STATUS_SUCCESS; + } /* Dereference the block */ ExDereferenceCallBackBlock(&PspProcessNotifyRoutine[i], CallBack); - - /* Wait for actice callbacks */ - ExWaitForCallBacks(CallBack); - - /* Free the callback and exit */ - ExFreeCallBack (CallBack); - return STATUS_SUCCESS; - } - - /* Dereference the block */ - ExDereferenceCallBackBlock(&PspProcessNotifyRoutine[i], - CallBack); + } } /* We didn't find any matching block */

12 years, 6 months

[tfaber] 56734: [KMTESTS] - Add minimal ExCallback and PsNotify tests See issue #7120 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 14 18:43:32 2012 New Revision: 56734 URL: http://svn.reactos.org/svn/reactos?rev=56734&view=rev Log: [KMTESTS] - Add minimal ExCallback and PsNotify tests See issue #7120 for more details. Added: trunk/rostests/kmtests/ntos_ex/ExCallback.c (with props) trunk/rostests/kmtests/ntos_ps/ trunk/rostests/kmtests/ntos_ps/PsNotify.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Thu Jun 14 18:43:32 2012 @@ -24,6 +24,7 @@ example/Example.c example/KernelType.c + ntos_ex/ExCallback.c ntos_ex/ExDoubleList.c ntos_ex/ExFastMutex.c ntos_ex/ExHardError.c @@ -50,6 +51,7 @@ ntos_ob/ObReference.c ntos_ob/ObType.c ntos_ob/ObTypes.c + ntos_ps/PsNotify.c ${COMMON_SOURCE} kmtest_drv/kmtest_drv.rc) Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Thu Jun 14 18:43:32 2012 @@ -8,6 +8,7 @@ #include <kmt_test.h> KMT_TESTFUNC Test_Example; +KMT_TESTFUNC Test_ExCallback; KMT_TESTFUNC Test_ExDoubleList; KMT_TESTFUNC Test_ExFastMutex; KMT_TESTFUNC Test_ExHardError; @@ -37,6 +38,7 @@ KMT_TESTFUNC Test_ObTypeClean; KMT_TESTFUNC Test_ObTypeNoClean; KMT_TESTFUNC Test_ObTypes; +KMT_TESTFUNC Test_PsNotify; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlMemory; @@ -44,6 +46,7 @@ const KMT_TEST TestList[] = { + { "ExCallback", Test_ExCallback }, { "ExDoubleList", Test_ExDoubleList }, { "ExFastMutex", Test_ExFastMutex }, { "ExHardError", Test_ExHardError }, @@ -74,6 +77,7 @@ { "-ObTypeClean", Test_ObTypeClean }, { "-ObTypeNoClean", Test_ObTypeNoClean }, { "ObTypes", Test_ObTypes }, + { "PsNotify", Test_PsNotify }, { "RtlAvlTreeKM", Test_RtlAvlTree }, { "RtlExceptionKM", Test_RtlException }, { "RtlMemoryKM", Test_RtlMemory }, Added: trunk/rostests/kmtests/ntos_ex/ExCallback.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExCallbac… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExCallback.c (added) +++ trunk/rostests/kmtests/ntos_ex/ExCallback.c [iso-8859-1] Thu Jun 14 18:43:32 2012 @@ -1,0 +1,153 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Executive Callback test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +static +PEX_CALLBACK_ROUTINE_BLOCK +(NTAPI +*ExAllocateCallBack)( + IN PEX_CALLBACK_FUNCTION Function, + IN PVOID Context +) +//= (PVOID)0x809af1f4 // 2003 sp1 x86 +//= (PVOID)0x80a7f04a // 2003 sp1 x86 checked +; + +static +VOID +(NTAPI +*ExFreeCallBack)( + IN PEX_CALLBACK_ROUTINE_BLOCK CallbackBlock +) +//= (PVOID)0x80918bb5 // 2003 sp1 x86 +//= (PVOID)0x80a355f0 // 2003 sp1 x86 checked +; + +static INT CallbackArgument1; +static INT CallbackArgument2; + +static +NTSTATUS +NTAPI +ExCallbackFunction( + IN PVOID CallbackContext, + IN PVOID Argument1 OPTIONAL, + IN PVOID Argument2 OPTIONAL) +{ + ok(0, "Callback function unexpectedly called\n"); + return STATUS_SUCCESS; +} + +static +VOID +TestPrivateFunctions(VOID) +{ + UNICODE_STRING ExAllocateCallBackName = RTL_CONSTANT_STRING(L"ExAllocateCallBack"); + UNICODE_STRING ExFreeCallBackName = RTL_CONSTANT_STRING(L"ExFreeCallBack"); + PEX_CALLBACK_ROUTINE_BLOCK CallbackBlock; + INT CallbackContext; + + if (!ExAllocateCallBack) + ExAllocateCallBack = MmGetSystemRoutineAddress(&ExAllocateCallBackName); + if (!ExFreeCallBack) + ExFreeCallBack = MmGetSystemRoutineAddress(&ExFreeCallBackName); + + if (skip(ExAllocateCallBack && ExFreeCallBack, + "ExAllocateCallBack and/or ExFreeCallBack unavailable\n")) + return; + + CallbackBlock = ExAllocateCallBack(ExCallbackFunction, &CallbackContext); + ok(CallbackBlock != NULL, "CallbackBlock = NULL\n"); + + if (skip(CallbackBlock != NULL, "Allocating callback failed\n")) + return; + + ok_eq_pointer(CallbackBlock->Function, ExCallbackFunction); + ok_eq_pointer(CallbackBlock->Context, &CallbackContext); + ok_eq_hex(KmtGetPoolTag(CallbackBlock), 'brbC'); + + ExFreeCallBack(CallbackBlock); +} + +static +VOID +NTAPI +CallbackFunction( + IN PVOID CallbackContext, + IN PVOID Argument1, + IN PVOID Argument2) +{ + INT *InvocationCount = CallbackContext; + + ok_irql(PASSIVE_LEVEL); + + (*InvocationCount)++; + ok_eq_pointer(Argument1, &CallbackArgument1); + ok_eq_pointer(Argument2, &CallbackArgument2); +} + +START_TEST(ExCallback) +{ + NTSTATUS Status; + PCALLBACK_OBJECT CallbackObject; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING CallbackName = RTL_CONSTANT_STRING(L"\\Callback\\KmtestExCallbackTestCallback"); + PVOID CallbackRegistration; + INT InvocationCount = 0; + + TestPrivateFunctions(); + + /* TODO: Parameter tests */ + /* TODO: Test the three predefined callbacks */ + /* TODO: Test opening an existing callback */ + /* TODO: Test AllowMultipleCallbacks */ + /* TODO: Test calling multiple callbacks */ + /* TODO: Test registering the same function twice */ + /* TODO: Test callback object fields */ + /* TODO: Test callback registration fields */ + InitializeObjectAttributes(&ObjectAttributes, + &CallbackName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + CallbackObject = KmtInvalidPointer; + Status = ExCreateCallback(&CallbackObject, + &ObjectAttributes, + TRUE, + TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(CallbackObject != NULL && CallbackObject != KmtInvalidPointer, + "CallbackObject = %p", CallbackObject); + + if (skip(NT_SUCCESS(Status), "Creating callback failed\n")) + return; + + CallbackRegistration = ExRegisterCallback(CallbackObject, + CallbackFunction, + &InvocationCount); + ok(CallbackRegistration != NULL, "CallbackRegistration = NULL\n"); + + if (!skip(CallbackRegistration != NULL, "Registering callback failed\n")) + { + ok_eq_hex(KmtGetPoolTag(CallbackRegistration), 'eRBC'); + ok_eq_int(InvocationCount, 0); + ExNotifyCallback(CallbackObject, + &CallbackArgument1, + &CallbackArgument2); + ok_eq_int(InvocationCount, 1); + ExNotifyCallback(CallbackObject, + &CallbackArgument1, + &CallbackArgument2); + ok_eq_int(InvocationCount, 2); + + ExUnregisterCallback(CallbackRegistration); + } + + ObDereferenceObject(CallbackObject); +} Propchange: trunk/rostests/kmtests/ntos_ex/ExCallback.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_ps/PsNotify.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ps/PsNotify.… ============================================================================== --- trunk/rostests/kmtests/ntos_ps/PsNotify.c (added) +++ trunk/rostests/kmtests/ntos_ps/PsNotify.c [iso-8859-1] Thu Jun 14 18:43:32 2012 @@ -1,0 +1,177 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Process Notification Routines test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +//#define NDEBUG +#include <debug.h> + +static +VOID +NTAPI +CreateProcessNotifyRoutine( + IN HANDLE ParentId, + IN HANDLE ProcessId, + IN BOOLEAN Create) +{ + ok_irql(PASSIVE_LEVEL); + if (!Create) + ok_eq_pointer(ProcessId, PsGetCurrentProcessId()); + else + ok(ProcessId != PsGetCurrentProcessId(), + "ProcessId %p equals current\n", ProcessId); + DPRINT("%s(%p, %p, %d)\n", __FUNCTION__, ParentId, ProcessId, Create); +} + +static +VOID +TestCreateProcessNotify(VOID) +{ + NTSTATUS Status; + + Status = PsSetCreateProcessNotifyRoutine(NULL, TRUE); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsSetCreateProcessNotifyRoutine(NULL, FALSE); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsSetCreateProcessNotifyRoutine(NULL, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsSetCreateProcessNotifyRoutine(NULL, TRUE); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsSetCreateProcessNotifyRoutine(CreateProcessNotifyRoutine, TRUE); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsSetCreateProcessNotifyRoutine(CreateProcessNotifyRoutine, FALSE); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* TODO: test whether the callback is notified on process creation */ + + Status = PsSetCreateProcessNotifyRoutine(CreateProcessNotifyRoutine, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsSetCreateProcessNotifyRoutine(CreateProcessNotifyRoutine, TRUE); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + /* TODO: register the same routine twice */ + /* TODO: register more than the maximum number of notifications */ +} + +static +VOID +NTAPI +CreateThreadNotifyRoutine( + IN HANDLE ProcessId, + IN HANDLE ThreadId, + IN BOOLEAN Create) +{ + ok_irql(PASSIVE_LEVEL); + if (!Create) + { + ok_eq_pointer(ProcessId, PsGetCurrentProcessId()); + ok_eq_pointer(ThreadId, PsGetCurrentThreadId()); + } + else + { + ok(ThreadId != PsGetCurrentThreadId(), + "ThreadId %p equals current\n", ThreadId); + } + DPRINT("%s(%p, %p, %d)\n", __FUNCTION__, ProcessId, ThreadId, Create); +} + +static +VOID +TestCreateThreadNotify(VOID) +{ + NTSTATUS Status; + + Status = PsRemoveCreateThreadNotifyRoutine(NULL); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsSetCreateThreadNotifyRoutine(NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsRemoveCreateThreadNotifyRoutine(NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsRemoveCreateThreadNotifyRoutine(NULL); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsRemoveCreateThreadNotifyRoutine(CreateThreadNotifyRoutine); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsSetCreateThreadNotifyRoutine(CreateThreadNotifyRoutine); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* TODO: test whether the callback is notified on thread creation */ + + Status = PsRemoveCreateThreadNotifyRoutine(CreateThreadNotifyRoutine); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsRemoveCreateThreadNotifyRoutine(CreateThreadNotifyRoutine); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + /* TODO: register the same routine twice */ + /* TODO: register more than the maximum number of notifications */ +} + +static +VOID +NTAPI +LoadImageNotifyRoutine( + IN PUNICODE_STRING FullImageName OPTIONAL, + IN HANDLE ProcessId, + IN PIMAGE_INFO ImageInfo) +{ + ok_irql(PASSIVE_LEVEL); + DPRINT("%s('%wZ', %p, %p)\n", __FUNCTION__, FullImageName, ProcessId, ImageInfo); +} + +static +VOID +TestLoadImageNotify(VOID) +{ + NTSTATUS Status; + + Status = PsRemoveLoadImageNotifyRoutine(NULL); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsSetLoadImageNotifyRoutine(NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsRemoveLoadImageNotifyRoutine(NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsRemoveLoadImageNotifyRoutine(NULL); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsRemoveLoadImageNotifyRoutine(LoadImageNotifyRoutine); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + Status = PsSetLoadImageNotifyRoutine(LoadImageNotifyRoutine); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* TODO: test whether the callback is notified on image load */ + + Status = PsRemoveLoadImageNotifyRoutine(LoadImageNotifyRoutine); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = PsRemoveLoadImageNotifyRoutine(LoadImageNotifyRoutine); + ok_eq_hex(Status, STATUS_PROCEDURE_NOT_FOUND); + + /* TODO: register the same routine twice */ + /* TODO: register more than the maximum number of notifications */ +} + +START_TEST(PsNotify) +{ + TestCreateProcessNotify(); + TestCreateThreadNotify(); + TestLoadImageNotify(); +} Propchange: trunk/rostests/kmtests/ntos_ps/PsNotify.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 6 months

[tfaber] 56733: [KMTESTS] - Centralize frequently used macros

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 14 17:48:14 2012 New Revision: 56733 URL: http://svn.reactos.org/svn/reactos?rev=56733&view=rev Log: [KMTESTS] - Centralize frequently used macros Modified: trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/ntos_mm/MmSection.c trunk/rostests/kmtests/rtl/RtlException.c trunk/rostests/kmtests/rtl/RtlUnicodeString.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Thu Jun 14 17:48:14 2012 @@ -173,6 +173,20 @@ #define MILLISECOND (1000 * MICROSECOND) #define SECOND (1000 * MILLISECOND) +#define KmtInvalidPointer ((PVOID)0x5555555555555555ULL) + +#define KmtStartSeh() \ + ExceptionStatus = STATUS_SUCCESS; \ + _SEH2_TRY \ + { +#define KmtEndSeh(ExpectedStatus) \ + } \ + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) \ + { \ + ExceptionStatus = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(ExceptionStatus, ExpectedStatus) + #if defined KMT_DEFINE_TEST_FUNCTIONS #if defined KMT_KERNEL_MODE Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Thu Jun 14 17:48:14 2012 @@ -6,9 +6,6 @@ */ #include <kmt_test.h> - -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) #define CheckObject(Handle, Pointers, Handles) do \ { \ @@ -81,106 +78,105 @@ { NTSTATUS Status = STATUS_SUCCESS; NTSTATUS ExceptionStatus; - const PVOID InvalidPointer = (PVOID)0x5555555555555555ULL; PVOID SectionObject; LARGE_INTEGER MaximumSize; ULONG PointerCount1, PointerCount2; - StartSeh() + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, 0, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PAGE_PROTECTION); if (!KmtIsCheckedBuild) { /* PAGE_NOACCESS and missing SEC_RESERVE/SEC_COMMIT/SEC_IMAGE assert */ - StartSeh() + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, PAGE_NOACCESS, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); - - StartSeh() + KmtEndSeh(STATUS_ACCESS_VIOLATION); + + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, PAGE_NOACCESS, 0, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); } - SectionObject = InvalidPointer; - StartSeh() + SectionObject = KmtInvalidPointer; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, NULL, 0, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PAGE_PROTECTION); - ok_eq_pointer(SectionObject, InvalidPointer); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - StartSeh() + ok_eq_pointer(SectionObject, KmtInvalidPointer); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); - - SectionObject = InvalidPointer; - StartSeh() + KmtEndSeh(STATUS_ACCESS_VIOLATION); + + SectionObject = KmtInvalidPointer; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, NULL, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); - ok_eq_pointer(SectionObject, InvalidPointer); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - SectionObject = InvalidPointer; + KmtEndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_pointer(SectionObject, KmtInvalidPointer); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + SectionObject = KmtInvalidPointer; MaximumSize.QuadPart = 0; - StartSeh() + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_FILE_FOR_SECTION); ok_eq_longlong(MaximumSize.QuadPart, 0LL); - ok_eq_pointer(SectionObject, InvalidPointer); - - if (SectionObject && SectionObject != InvalidPointer) + ok_eq_pointer(SectionObject, KmtInvalidPointer); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); MaximumSize.QuadPart = 0; - StartSeh() + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER_4); ok_eq_longlong(MaximumSize.QuadPart, 0LL); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); MaximumSize.QuadPart = 1; - StartSeh() + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_longlong(MaximumSize.QuadPart, 1LL); - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - SectionObject = InvalidPointer; + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + SectionObject = KmtInvalidPointer; MaximumSize.QuadPart = 0; - StartSeh() + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER_4); ok_eq_longlong(MaximumSize.QuadPart, 0LL); - ok_eq_pointer(SectionObject, InvalidPointer); - - if (SectionObject && SectionObject != InvalidPointer) + ok_eq_pointer(SectionObject, KmtInvalidPointer); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); /* page file section */ - SectionObject = InvalidPointer; + SectionObject = KmtInvalidPointer; MaximumSize.QuadPart = 1; - StartSeh() + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_SUCCESS); ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); if (!skip(FileHandle1 != NULL && FileObject1 != NULL && @@ -190,196 +186,196 @@ PointerCount2 = 3; /* image section */ CheckObject(FileHandle2, PointerCount2, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, NULL); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle2, PointerCount2, 1L); CheckSection(SectionObject, SEC_IMAGE); TestMapView(SectionObject, FALSE, TRUE); - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle2, PointerCount2, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle2, PointerCount2, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, FileObject2); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); ++PointerCount2; CheckObject(FileHandle2, PointerCount2, 1L); CheckSection(SectionObject, 0); TestMapView(SectionObject, TRUE, TRUE); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); //--PointerCount2; // ???? CheckObject(FileHandle2, PointerCount2, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, FileObject2); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle2, PointerCount2, 1L); CheckSection(SectionObject, 0); TestMapView(SectionObject, TRUE, TRUE); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); /* image section with inappropriate file */ CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_IMAGE_NOT_MZ); ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok_eq_pointer(SectionObject, InvalidPointer); - CheckObject(FileHandle1, PointerCount1, 1L); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + ok_eq_pointer(SectionObject, KmtInvalidPointer); + CheckObject(FileHandle1, PointerCount1, 1L); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); ++PointerCount1; CheckObject(FileHandle1, PointerCount1, 1L); CheckSection(SectionObject, 0); TestMapView(SectionObject, TRUE, FALSE); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); //--PointerCount1; // ???? CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); /* image section with two different files */ CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, FileObject2); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle1, PointerCount1, 1L); CheckObject(FileHandle2, PointerCount2, 1L); CheckSection(SectionObject, 0); TestMapView(SectionObject, TRUE, TRUE); - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckObject(FileHandle2, PointerCount2, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckObject(FileHandle2, PointerCount2, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); /* data file section */ CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, FileHandle1, NULL); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, FileHandle1, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); CheckObject(FileHandle1, PointerCount1, 1L); Modified: trunk/rostests/kmtests/rtl/RtlException.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlException.… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] Thu Jun 14 17:48:14 2012 @@ -7,9 +7,6 @@ #include <kmt_test.h> -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) - START_TEST(RtlException) { NTSTATUS ExceptionStatus; @@ -17,38 +14,38 @@ CHAR Value; /* Access a valid pointer - must not trigger SEH */ - StartSeh() + KmtStartSeh() RtlFillMemory(Buffer, sizeof(Buffer), 0x12); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); /* Read from a NULL pointer - must cause an access violation */ - StartSeh() + KmtStartSeh() Value = *(volatile CHAR *)NULL; - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); /* Write to a NULL pointer - must cause an access violation */ - StartSeh() + KmtStartSeh() *(volatile CHAR *)NULL = 5; - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); /* TODO: Find where MmBadPointer is defined - gives an unresolved external */ #if 0 //def KMT_KERNEL_MODE /* Read from MmBadPointer - must cause an access violation */ - StartSeh() + KmtStartSeh() Value = *(volatile CHAR *)MmBadPointer; - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); /* Write to MmBadPointer - must cause an access violation */ - StartSeh() + KmtStartSeh() *(volatile CHAR *)MmBadPointer = 5; - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); #endif /* We cannot test this in kernel mode easily - the stack is just "somewhere" * in system space, and there's no guard page below it */ #ifdef KMT_USER_MODE /* Overflow the stack - must cause a special exception */ - StartSeh() + KmtStartSeh() PCHAR Pointer; while (1) @@ -56,6 +53,6 @@ Pointer = _alloca(1024); *Pointer = 5; } - EndSeh(STATUS_STACK_OVERFLOW); + KmtEndSeh(STATUS_STACK_OVERFLOW); #endif } Modified: trunk/rostests/kmtests/rtl/RtlUnicodeString.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlUnicodeStr… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlUnicodeString.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlUnicodeString.c [iso-8859-1] Thu Jun 14 17:48:14 2012 @@ -7,9 +7,6 @@ #define KMT_EMULATE_KERNEL #include <kmt_test.h> - -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) static VOID @@ -116,32 +113,32 @@ /* NULL for SearchString */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, NULL, &String, &Position); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); /* NULL for SearchString and invalid flags */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(8, NULL, &String, &Position); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); ok_eq_uint(Position, 0); ok_eq_uint(Position, 0); /* NULL for SearchString with zero-length MatchString */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, NULL, &ZeroLengthString, &Position); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); /* NULL for MatchString */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, &String, NULL, &Position); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); /* This crashes in Windows, but not in ROS. I see no reason to add @@ -149,30 +146,30 @@ #if 0 /* NULL for MatchString with zero-length SearchString */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, &ZeroLengthString, NULL, &Position); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); #endif /* NULL for MatchString and invalid flags */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(8, &String, NULL, &Position); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); ok_eq_uint(Position, 0); /* NULL for Position */ - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, &String, &String, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); /* NULL for all three */ - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, NULL, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); #endif }

12 years, 6 months

[arty] 56732: [NTOSKRNL] Actually remove the matching exclusive lock region when unlocking.

by arty＠svn.reactos.org

Author: arty Date: Thu Jun 14 16:19:01 2012 New Revision: 56732 URL: http://svn.reactos.org/svn/reactos?rev=56732&view=rev Log: [NTOSKRNL] Actually remove the matching exclusive lock region when unlocking. Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Thu Jun 14 16:19:01 2012 @@ -579,8 +579,8 @@ &FileObject->FileName, Conflict->Exclusive.FileLock.StartingByte.HighPart, Conflict->Exclusive.FileLock.StartingByte.LowPart, - Conflict->Exclusive.FileLock.StartingByte.HighPart, - Conflict->Exclusive.FileLock.StartingByte.LowPart, + Conflict->Exclusive.FileLock.EndingByte.HighPart, + Conflict->Exclusive.FileLock.EndingByte.LowPart, Conflict->Exclusive.FileLock.ExclusiveLock); if (!ExclusiveLock) { @@ -824,6 +824,14 @@ DPRINT("Range not locked %wZ\n", &FileObject->FileName); return STATUS_RANGE_NOT_LOCKED; } + + DPRINT("Found lock entry: Exclusive %d %08x%08x:%08x%08x %wZ\n", + Entry->Exclusive.FileLock.ExclusiveLock, + Entry->Exclusive.FileLock.StartingByte.HighPart, + Entry->Exclusive.FileLock.StartingByte.LowPart, + Entry->Exclusive.FileLock.EndingByte.HighPart, + Entry->Exclusive.FileLock.EndingByte.LowPart, + &FileObject->FileName); if (Entry->Exclusive.FileLock.ExclusiveLock) { @@ -837,6 +845,8 @@ return STATUS_RANGE_NOT_LOCKED; } RtlCopyMemory(&Find, Entry, sizeof(Find)); + // Remove the old exclusive lock region + RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); } else { @@ -882,7 +892,12 @@ } if (IsListEmpty(&InternalInfo->SharedLocks)) { - DPRINT("Removing the lock entry %wZ\n", &FileObject->FileName); + DPRINT("Removing the lock entry %wZ (%08x%08x:%08x%08x)\n", + &FileObject->FileName, + Entry->Exclusive.FileLock.StartingByte.HighPart, + Entry->Exclusive.FileLock.StartingByte.LowPart, + Entry->Exclusive.FileLock.EndingByte.HighPart, + Entry->Exclusive.FileLock.EndingByte.LowPart); RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); } else { DPRINT("Lock still has:\n");

12 years, 6 months

[akhaldi] 56731: [CMAKE/MIDL] * Alter the way we handle the dlldata generation with midl. This works around the warnings we get about multiple rules to generate proxy.dlldata.c. * Brought to yo by ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jun 14 11:06:23 2012 New Revision: 56731 URL: http://svn.reactos.org/svn/reactos?rev=56731&view=rev Log: [CMAKE/MIDL] * Alter the way we handle the dlldata generation with midl. This works around the warnings we get about multiple rules to generate proxy.dlldata.c. * Brought to yo by Peter Kummel. Modified: trunk/reactos/cmake/midl-support.cmake Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Thu Jun 14 11:06:23 2012 @@ -38,16 +38,17 @@ get_includes(_includes) get_defines(_defines) set(_chain_dependency "") + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) foreach(_idl_file ${ARGN}) get_filename_component(_name_we ${_idl_file} NAME_WE) add_custom_command( - OUTPUT ${_name_we}_p.c ${_name_we}_p.h proxy.dlldata.c + OUTPUT ${_name_we}_p.c ${_name_we}_p.h COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /client none /server none /proxy ${_name_we}_p.c /h ${_name_we}_p.h /dlldata proxy.dlldata.c ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} ${_chain_dependency}) list(APPEND _chain_dependency ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.c) list(APPEND _chain_dependency ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.h) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}) endforeach() - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) endfunction() function(add_rpc_files _type)

12 years, 6 months

[tfaber] 56730: [KMTESTS] - Return a boolean from ok() - Add KmtGetPoolTag function to allow verifying pool tags used for allocations

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jun 13 21:56:54 2012 New Revision: 56730 URL: http://svn.reactos.org/svn/reactos?rev=56730&view=rev Log: [KMTESTS] - Return a boolean from ok() - Add KmtGetPoolTag function to allow verifying pool tags used for allocations Modified: trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/ntos_ex/ExPools.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Wed Jun 13 21:56:54 2012 @@ -87,6 +87,7 @@ VOID KmtSetIrql(IN KIRQL NewIrql); BOOLEAN KmtAreInterruptsEnabled(VOID); +ULONG KmtGetPoolTag(PVOID Memory); #elif defined KMT_USER_MODE DWORD KmtRunKernelTest(IN PCSTR TestName); @@ -124,8 +125,8 @@ #define trace_(file, line, ...) KmtTrace( file ":" KMT_STRINGIZE(line), __VA_ARGS__) #define skip_(test, file, line, ...) KmtSkip(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) -VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); -VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 3, 4); +BOOLEAN KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); +BOOLEAN KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 3, 4); VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 2, 0); VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 2, 3); BOOLEAN KmtVSkip(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); @@ -161,6 +162,7 @@ (expected) ? "TRUE" : "FALSE") #define ok_eq_str(value, expected) ok(!strcmp(value, expected), #value " = \"%s\", expected \"%s\"\n", value, expected) #define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) +#define ok_eq_tag(value, expected) ok_eq_print(value, expected, "0x%08lx") #define KMT_MAKE_CODE(ControlCode) CTL_CODE(FILE_DEVICE_UNKNOWN, \ 0xC00 + (ControlCode), \ @@ -222,6 +224,58 @@ return (__readeflags() & (1 << 9)) != 0; } +typedef struct _POOL_HEADER +{ + union + { + struct + { +#ifdef _M_AMD64 + USHORT PreviousSize:8; + USHORT PoolIndex:8; + USHORT BlockSize:8; + USHORT PoolType:8; +#else + USHORT PreviousSize:9; + USHORT PoolIndex:7; + USHORT BlockSize:9; + USHORT PoolType:7; +#endif + }; + ULONG Ulong1; + }; +#ifdef _M_AMD64 + ULONG PoolTag; +#endif + union + { +#ifdef _M_AMD64 + PEPROCESS ProcessBilled; +#else + ULONG PoolTag; +#endif + struct + { + USHORT AllocatorBackTraceIndex; + USHORT PoolTagHash; + }; + }; +} POOL_HEADER, *PPOOL_HEADER; + +ULONG KmtGetPoolTag(PVOID Memory) +{ + PPOOL_HEADER Header; + + /* it's not so easy for allocations of PAGE_SIZE */ + if (((ULONG_PTR)Memory & (PAGE_SIZE - 1)) == 0) + return 'TooL'; + + Header = Memory; + Header--; + + return Header->PoolTag; +} + 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 ResultBufferSize) @@ -335,13 +389,13 @@ KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); } -VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) +BOOLEAN KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) { CHAR MessageBuffer[512]; SIZE_T MessageLength; if (!ResultBuffer) - return; + return Condition != 0; if (Condition) { @@ -359,14 +413,18 @@ MessageLength = KmtXVSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Test failed: ", Format, Arguments); KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); } -} - -VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) -{ + + return Condition != 0; +} + +BOOLEAN KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) +{ + BOOLEAN Ret; va_list Arguments; va_start(Arguments, Format); - KmtVOk(Condition, FileAndLine, Format, Arguments); + Ret = KmtVOk(Condition, FileAndLine, Format, Arguments); va_end(Arguments); + return Ret; } VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments) Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExPools.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] Wed Jun 13 21:56:54 2012 @@ -145,8 +145,36 @@ ExFreePoolWithTag(Ptr, TAG_POOLTEST); } +static +VOID +TestPoolTags(VOID) +{ + PVOID Memory; + + Memory = ExAllocatePoolWithTag(PagedPool, 8, 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'MyTa'); + ExFreePoolWithTag(Memory, 'MyTa'); + + Memory = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'TooL'); + ExFreePoolWithTag(Memory, 'MyTa'); + + Memory = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE - 3 * sizeof(PVOID), 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'TooL'); + ExFreePoolWithTag(Memory, 'MyTa'); + + Memory = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE - 4 * sizeof(PVOID) + 1, 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'TooL'); + ExFreePoolWithTag(Memory, 'MyTa'); + + Memory = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE - 4 * sizeof(PVOID), 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'MyTa'); + ExFreePoolWithTag(Memory, 'MyTa'); +} + START_TEST(ExPools) { PoolsTest(); PoolsCorruption(); + TestPoolTags(); }

12 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2012