[ros-diffs] [jimtabor] 68920: [Win32k] - Use the same style for get messages in nonclient. - Remove bit checks left over from testing. Fix CORE-10086.

[jimtabor]

Author: jimtabor
Date: Wed Sep  2 23:06:19 2015
New Revision: 68920

URL: http://svn.reactos.org/svn/reactos?rev=68920&view=rev
Log:
[Win32k]
- Use the same style for get messages in nonclient.
- Remove bit checks left over from testing. Fix CORE-10086.

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

Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgqueue.c?rev=68920&r1=68919&r2=68920&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/msgqueue.c        [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/msgqueue.c        [iso-8859-1] Wed Sep  2 
23:06:19 2015
@@ -2013,16 +2013,6 @@
       IntCoalesceMouseMove(pti);
    }
 
-   if ( pti->nCntsQBits[QSRosMouseButton] != 0 ||
-        pti->nCntsQBits[QSRosMouseMove]   != 0 ||
-        pti->nCntsQBits[QSRosKey]         != 0 ||
-        pti->nCntsQBits[QSRosSendMessage] != 0 ||
-        pti->nCntsQBits[QSRosPostMessage] != 0 )
-   {
-      TRACE("No time to wait!\n");
-      return ret;
-   }
-
    UserLeaveCo();
 
    ZwYieldExecution(); // Let someone else run!

Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/nonclient.c?rev=68920&r1=68919&r2=68920&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/nonclient.c       [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/nonclient.c       [iso-8859-1] Wed Sep  2 
23:06:19 2015
@@ -497,7 +497,13 @@
                        // Only the windows that overlap will be redrawn.
                        if (RECTL_bIntersectRect( &rect, &pwnd->rcWindow, 
&pwndTemp->rcWindow ))
                        {
-                          co_UserRedrawWindow( pwndTemp, NULL, NULL, 
RDW_UPDATENOW | RDW_ALLCHILDREN);
+                          if (pwnd->head.pti == pwndTemp->head.pti)
+                          co_UserRedrawWindow( pwndTemp, NULL, NULL, 
RDW_UPDATENOW | RDW_NOCHILDREN);
+                          else
+                          {
+                            ERR("Not Same Thread!\n");
+                            co_UserRedrawWindow( pwndTemp, NULL, NULL, 
RDW_INVALIDATE | RDW_ALLCHILDREN);
+                          }
                        }
                     }
                  }
@@ -890,7 +896,7 @@
 
    if (!(Flags & DC_NOVISIBLE) && !IntIsWindowVisible(pWnd)) return;
 
-   TRACE("UserDrawCaptionBar: pWnd %p, hDc %p, Flags 0x%x.\n", pWnd, hDC, 
Flags);
+   ERR("UserDrawCaptionBar: pWnd %p, hDc %p, Flags 0x%x.\n", pWnd, hDC, Flags);
 
    Style = pWnd->style;
    ExStyle = pWnd->ExStyle;
@@ -1506,8 +1512,7 @@
 
    for (;;)
    {
-      if (co_IntGetPeekMessage(&Msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, 
PM_REMOVE, TRUE) <= 0)
-         break;
+      if (!co_IntGetPeekMessage(&Msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, 
PM_REMOVE, TRUE)) break;
       if (IntCallMsgFilter( &Msg, MSGF_MAX )) continue;
 
       if (Msg.message == WM_LBUTTONUP)