Author: jimtabor Date: Tue Jul 29 13:53:46 2008 New Revision: 34935
URL: http://svn.reactos.org/svn/reactos?rev=34935&view=rev Log: - Add Event handle type.
Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/subsystems/win32/win32k/include/object.h
Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/us... ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Tue Jul 29 13:53:46 2008 @@ -186,6 +186,7 @@ #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 */
Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc.... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Tue Jul 29 13:53:46 2008 @@ -336,7 +336,7 @@ /* * 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 @@ 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 @@ PVOID ret; PUSER_HANDLE_ENTRY pEntry;
- ASSERT(uType <= VALIDATE_TYPE_MONITOR); + ASSERT(uType <= VALIDATE_TYPE_EVENT);
pEntry = GetUser32Handle(handle);
@@ -418,7 +421,7 @@ PVOID ret; PUSER_HANDLE_ENTRY pEntry;
- ASSERT(uType <= VALIDATE_TYPE_MONITOR); + ASSERT(uType <= VALIDATE_TYPE_EVENT);
pEntry = GetUser32Handle(handle);
Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Tue Jul 29 13:53:46 2008 @@ -50,7 +50,8 @@ otHook = 5, otCallProc = 7, otAccel, - otMonitor = 12 + otMonitor = 12, + otEvent = 15
} USER_OBJECT_TYPE;