diff --git a/reactos/dll/win32/user32/include/user32p.h b/reactos/dll/win32/user32/include/user32p.h index 760d1991c9b..24a9c9f4d82 100644 --- a/reactos/dll/win32/user32/include/user32p.h +++ b/reactos/dll/win32/user32/include/user32p.h @@ -186,6 +186,7 @@ extern int SPY_Init(void); #define VALIDATE_TYPE_CALLPROC 7 #define VALIDATE_TYPE_ACCEL 8 #define VALIDATE_TYPE_MONITOR 12 +#define VALIDATE_TYPE_EVENT 15 #define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ #define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ diff --git a/reactos/dll/win32/user32/misc/misc.c b/reactos/dll/win32/user32/misc/misc.c index bbe7322e44c..84bb9613a61 100644 --- a/reactos/dll/win32/user32/misc/misc.c +++ b/reactos/dll/win32/user32/misc/misc.c @@ -336,7 +336,7 @@ GetUser32Handle(HANDLE handle) /* * Decide whether an object is located on the desktop or shared heap */ -static const BOOL g_ObjectHeapTypeShared[VALIDATE_TYPE_MONITOR + 1] = +static const BOOL g_ObjectHeapTypeShared[VALIDATE_TYPE_EVENT + 1] = { FALSE, /* VALIDATE_TYPE_FREE (not used) */ TRUE, /* VALIDATE_TYPE_WIN */ /* FIXME: FALSE once WINDOW_OBJECT is deleted! */ @@ -350,7 +350,10 @@ static const BOOL g_ObjectHeapTypeShared[VALIDATE_TYPE_MONITOR + 1] = FALSE, /* (not used) */ FALSE, /* (not used) */ FALSE, /* (not used) */ - TRUE /* VALIDATE_TYPE_MONITOR */ + TRUE, /* VALIDATE_TYPE_MONITOR */ + FALSE, /* (not used) */ + FALSE, /* (not used) */ + TRUE /* VALIDATE_TYPE_EVENT */ }; // @@ -363,7 +366,7 @@ ValidateHandle(HANDLE handle, UINT uType) PVOID ret; PUSER_HANDLE_ENTRY pEntry; - ASSERT(uType <= VALIDATE_TYPE_MONITOR); + ASSERT(uType <= VALIDATE_TYPE_EVENT); pEntry = GetUser32Handle(handle); @@ -418,7 +421,7 @@ ValidateHandleNoErr(HANDLE handle, UINT uType) PVOID ret; PUSER_HANDLE_ENTRY pEntry; - ASSERT(uType <= VALIDATE_TYPE_MONITOR); + ASSERT(uType <= VALIDATE_TYPE_EVENT); pEntry = GetUser32Handle(handle); diff --git a/reactos/subsystems/win32/win32k/include/object.h b/reactos/subsystems/win32/win32k/include/object.h index 33ed973368c..32c32fb2e31 100644 --- a/reactos/subsystems/win32/win32k/include/object.h +++ b/reactos/subsystems/win32/win32k/include/object.h @@ -50,7 +50,8 @@ typedef enum _USER_OBJECT_TYPE otHook = 5, otCallProc = 7, otAccel, - otMonitor = 12 + otMonitor = 12, + otEvent = 15 } USER_OBJECT_TYPE;