[ros-diffs] [jimtabor] 42727: - Use correct head structure for event hooks.

Author: jimtabor
Date: Sun Aug 16 08:41:18 2009
New Revision: 42727

URL: http://svn.reactos.org/svn/reactos?rev=42727&view=rev
Log:
- Use correct head structure for event hooks.

Modified:
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/include/hook.h
    trunk/reactos/subsystems/win32/win32k/ntuser/event.c

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Aug 16 08:41:18 2009
@@ -85,11 +85,15 @@
   DWORD  cLockObj;
 } HEAD, *PHEAD;
 
+typedef struct _THROBJHEAD
+{
+  HEAD;
+  PW32THREADINFO pti;
+} THROBJHEAD, *PTHROBJHEAD;
+
 typedef struct _THRDESKHEAD
 {
-  HANDLE h;
-  DWORD  cLockObj;
-  PW32THREADINFO pti;
+  THROBJHEAD;
   struct _DESKTOP *rpdesk;
   PVOID       pSelf;
 } THRDESKHEAD, *PTHRDESKHEAD;

Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] Sun Aug 16 08:41:18
2009
@@ -15,7 +15,7 @@
 
 typedef struct tagEVENTHOOK
 {
-  THRDESKHEAD    head;
+  THROBJHEAD     head;
   LIST_ENTRY     Chain;      /* Event chain entry */
   PETHREAD       Thread;     /* Thread owning the event */
   UINT           eventMin;

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Sun Aug 16 08:41:18
2009
@@ -331,7 +331,6 @@
 
       UserHMGetHandle(pEH) = Handle;
 //      pEH->head.pti  =?
-//      pEH->head.rpdesk
       if (Thread)
          pEH->Thread = Thread;
       else