[Win32k]

- Use the same style for get messages in nonclient.
- Remove bit checks left over from testing. Fix CORE-10086.

svn path=/trunk/; revision=68920

diff --git a/reactos/win32ss/user/ntuser/msgqueue.c b/reactos/win32ss/user/ntuser/msgqueue.c
index 3a7fe54..bf12a5a 100644 (file)
--- a/reactos/win32ss/user/ntuser/msgqueue.c
+++ b/reactos/win32ss/user/ntuser/msgqueue.c
@@ -2013,16 +2013,6 @@ co_MsqWaitForNewMessages(PTHREADINFO pti, PWND WndFilter,
       IntCoalesceMouseMove(pti);
    }
 
       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!
    UserLeaveCo();
 
    ZwYieldExecution(); // Let someone else run!

diff --git a/reactos/win32ss/user/ntuser/nonclient.c b/reactos/win32ss/user/ntuser/nonclient.c
index dd2dafd..0330138 100644 (file)
--- a/reactos/win32ss/user/ntuser/nonclient.c
+++ b/reactos/win32ss/user/ntuser/nonclient.c
@@ -497,7 +497,13 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam)
                        // Only the windows that overlap will be redrawn.
                        if (RECTL_bIntersectRect( &rect, &pwnd->rcWindow, &pwndTemp->rcWindow ))
                        {
                        // 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 @@ VOID UserDrawCaptionBar(
 
    if (!(Flags & DC_NOVISIBLE) && !IntIsWindowVisible(pWnd)) return;
 
 
    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;
 
    Style = pWnd->style;
    ExStyle = pWnd->ExStyle;


@@ -1506,8 +1512,7 @@ NC_DoButton(PWND pWnd, WPARAM wParam, LPARAM lParam)
 
    for (;;)
    {
 
    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)
       if (IntCallMsgFilter( &Msg, MSGF_MAX )) continue;
 
       if (Msg.message == WM_LBUTTONUP)