diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h index b63c1a4e391..738b1547f73 100644 --- a/reactos/include/reactos/win32k/ntuser.h +++ b/reactos/include/reactos/win32k/ntuser.h @@ -85,11 +85,15 @@ typedef struct _HEAD 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; diff --git a/reactos/subsystems/win32/win32k/include/hook.h b/reactos/subsystems/win32/win32k/include/hook.h index 98d28db1e85..90c31646fc9 100644 --- a/reactos/subsystems/win32/win32k/include/hook.h +++ b/reactos/subsystems/win32/win32k/include/hook.h @@ -15,7 +15,7 @@ typedef struct tagHOOKTABLE typedef struct tagEVENTHOOK { - THRDESKHEAD head; + THROBJHEAD head; LIST_ENTRY Chain; /* Event chain entry */ PETHREAD Thread; /* Thread owning the event */ UINT eventMin; diff --git a/reactos/subsystems/win32/win32k/ntuser/event.c b/reactos/subsystems/win32/win32k/ntuser/event.c index e1e9bcdc4e4..88f2fb29bb5 100644 --- a/reactos/subsystems/win32/win32k/ntuser/event.c +++ b/reactos/subsystems/win32/win32k/ntuser/event.c @@ -331,7 +331,6 @@ NtUserSetWinEventHook( UserHMGetHandle(pEH) = Handle; // pEH->head.pti =? -// pEH->head.rpdesk if (Thread) pEH->Thread = Thread; else