From 2062df62caff557fcd9963f8e934b26d355b96a1 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Sun, 26 Dec 2010 11:11:27 +0000 Subject: [PATCH] [Win32k] - Fixes bug 5792 and Get/PeekMessage tests. I noticed co_IntPostOrSendMessage to co_IntSendMessageNoWait changes when it should have been changed to co_IntSendMessage. Same as co_IntSendMessage to co_IntSendMessageNoWait when it should have not changed.... I'm sorting it out. ATM win test locks up and the system shutdown box is not present only the text message. svn path=/trunk/; revision=50141 --- reactos/subsystems/win32/win32k/ntuser/desktop.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c index d279995599e..95c07af381e 100644 --- a/reactos/subsystems/win32/win32k/ntuser/desktop.c +++ b/reactos/subsystems/win32/win32k/ntuser/desktop.c @@ -708,22 +708,20 @@ VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam) PDESKTOP Desktop = IntGetActiveDesktop(); HWND* HwndList; - static UINT MsgType = 0; - - if (!MsgType) + if (!gpsi->uiShellMsg) { /* Too bad, this doesn't work.*/ #if 0 UNICODE_STRING Str; RtlInitUnicodeString(&Str, L"SHELLHOOK"); - MsgType = UserRegisterWindowMessage(&Str); + gpsi->uiShellMsg = UserRegisterWindowMessage(&Str); #endif - MsgType = IntAddAtom(L"SHELLHOOK"); + gpsi->uiShellMsg = IntAddAtom(L"SHELLHOOK"); - DPRINT("MsgType = %x\n", MsgType); - if (!MsgType) + DPRINT("MsgType = %x\n", gpsi->uiShellMsg); + if (!gpsi->uiShellMsg) DPRINT1("LastError: %x\n", EngGetLastError()); } @@ -740,7 +738,7 @@ VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam) for (; *cursor; cursor++) { - co_IntSendMessageNoWait(*cursor, MsgType, Message, lParam); + UserPostMessage(*cursor, gpsi->uiShellMsg, Message, lParam); } ExFreePool(HwndList);