[ros-diffs] [jimtabor] 66238: [NtUser] - Fix wine msg.c:test_quit_message tests.

Author: jimtabor
Date: Thu Feb 12 21:33:43 2015
New Revision: 66238

URL: http://svn.reactos.org/svn/reactos?rev=66238&view=rev
Log:
[NtUser]
- Fix wine msg.c:test_quit_message tests.

Modified:
    trunk/reactos/win32ss/user/ntuser/message.c
    trunk/reactos/win32ss/user/ntuser/msgqueue.c

Modified: trunk/reactos/win32ss/user/ntuser/message.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/message...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/message.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/message.c	[iso-8859-1] Thu Feb 12 21:33:43 2015
@@ -848,8 +848,8 @@
                return TRUE;
         }

-        /* Now look for a quit message. */
-        if (pti->QuitPosted)
+        /* Only check for quit messages if not posted messages pending. */
+        if (ProcessMask & QS_POSTMESSAGE && pti->QuitPosted)
         {
             /* According to the PSDK, WM_QUIT messages are always returned, regardless
                of the filter specified */
@@ -1222,14 +1222,7 @@
            Message.lParam = lParam;
         }

-        if (WM_QUIT == Msg)
-        {
-            MsqPostQuitMessage(pti, wParam);
-        }
-        else
-        {
-            MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, ExtraInfo);
-        }
+        MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, ExtraInfo);
     }
     return TRUE;
 }

Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgqueu...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/msgqueue.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/msgqueue.c	[iso-8859-1] Thu Feb 12 21:33:43 2015
@@ -932,6 +932,11 @@
                                         ListEntry);
       if (PostedMessage->Msg.hwnd == Window->head.h)
       {
+         if (PostedMessage->Msg.message == WM_QUIT && pti->QuitPosted == 0)
+         {
+            pti->QuitPosted = 1;
+            pti->exitCode = PostedMessage->Msg.wParam;
+         }
          RemoveEntryList(&PostedMessage->ListEntry);
          ClearMsgBitsMask(pti, PostedMessage->QS_Flags);
          MsqDestroyMessage(PostedMessage);