Changeset 21988 for trunk/src/user32/win32wbase.cpp

Timestamp:

Mar 30, 2012, 12:57:21 AM (13 years ago)

Author:

dmik

Message:

user32: Obey return value from WM_MOUSEACTIVATE.

That is, hide the mouse button press message from the window
if the return value is WM_ACTIVATEANDEAT or WM_NOACTIVATEANDEAT
(to conform to MSDN).

File:

• trunk/src/user32/win32wbase.cpp (modified) (5 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1077 +1077 @@
 ULONG Win32BaseWindow::MsgButton(MSG *msg)
 {
- BOOL  fClick = FALSE;
+    BOOL  eatMsg = FALSE;
+    BOOL  fClick = FALSE;
 
     dprintf(("MsgButton %d at (%d,%d) %X %X", msg->message, msg->pt.x, msg->pt.y, msg->wParam, msg->lParam));
@@ -1117 +1118 @@
     if(fClick)
     {
-      HWND hwndTop;
+        HWND hwndTop;
 
         /* Activate the window if needed */
@@ -1125 +1126 @@
         if (hwndTop && (getWindowHandle() != hwndActive))
         {
-                LONG ret = SendMessageA(getWindowHandle(),WM_MOUSEACTIVATE, hwndTop,
-                                        MAKELONG( lastHitTestVal, msg->message) );
-
-                //SendMessageA(getWindowHandle(), msg->message, msg->wParam, msg->lParam);
-                dprintf2(("WM_MOUSEACTIVATE returned %d foreground %x top %x", ret, GetForegroundWindow(), hwndTop));
-#if 0
-                if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
-                         eatMsg = TRUE;
-#endif
-                //SvL: 0 is not documented, but experiments in NT4 show that
-                //     the window will get activated when it returns this.
-                //     (FreeCell is an example)
-                if(((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT) || (ret == 0))
-                   && (hwndTop != GetForegroundWindow()) )
-                {
-                    Win32BaseWindow *win32top = Win32BaseWindow::GetWindowFromHandle(hwndTop);
-
-                    //SvL: Calling OSLibSetActiveWindow(hwndTop); causes focus problems
-                    if (win32top) {
-                        //Must use client window handle (not frame!!)
-                        SetFocus(win32top->getWindowHandle());
-                        RELEASE_WNDOBJ(win32top);
-                    }
+            LONG ret = SendMessageA(getWindowHandle(),WM_MOUSEACTIVATE, hwndTop,
+                                    MAKELONG( lastHitTestVal, msg->message) );
+
+            //SendMessageA(getWindowHandle(), msg->message, msg->wParam, msg->lParam);
+            dprintf2(("WM_MOUSEACTIVATE returned %d foreground %x top %x", ret, GetForegroundWindow(), hwndTop));
+
+            if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
+                eatMsg = TRUE;
+
+            //SvL: 0 is not documented, but experiments in NT4 show that
+            //     the window will get activated when it returns this.
+            //     (FreeCell is an example)
+            if(((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT) || (ret == 0))
+               && (hwndTop != GetForegroundWindow()) )
+            {
+                Win32BaseWindow *win32top = Win32BaseWindow::GetWindowFromHandle(hwndTop);
+
+                //SvL: Calling OSLibSetActiveWindow(hwndTop); causes focus problems
+                if (win32top) {
+                    //Must use client window handle (not frame!!)
+                    SetFocus(win32top->getWindowHandle());
+                    RELEASE_WNDOBJ(win32top);
                 }
+            }
         }
     }
@@ -1154 +1155 @@
     SendMessageA(getWindowHandle(),WM_SETCURSOR, getWindowHandle(), MAKELONG(lastHitTestVal, msg->message));
 
-    return SendMessageA(getWindowHandle(),msg->message, msg->wParam, msg->lParam);
+    return eatMsg ? 0 : SendMessageA(getWindowHandle(),msg->message, msg->wParam, msg->lParam);
 }
 //******************************************************************************
@@ -2241 +2242 @@
         if(window->getStyle() & WS_CHILD && !(window->getExStyle() & WS_EX_NOPARENTNOTIFY) )
         {
-                /* Notify the parent window only */
-                parentwindow = window->getParent();
-                if(parentwindow) {
-                    /* PF We should map points for each window accordingly! */
-                    if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN || Msg == WM_RBUTTONDOWN ||
-                        Msg == WM_LBUTTONUP || Msg == WM_MBUTTONUP || Msg == WM_RBUTTONUP)
-                    {
-                      POINTS pt = MAKEPOINTS(lParam);
-                      POINT point;
-
-                      point.x = pt.x;
-                      point.y = pt.y;
-
-                      MapWindowPoints(getWindowHandle(),parentwindow->getWindowHandle(), &point, 1);
-                      lParam = MAKELPARAM(point.x, point.y);
-                      wParam = MAKEWPARAM(Msg, 0 /* undefined according to MSDN, 0 under XP */);
-                    }
-                    else
-                    {
-                      lParam = getWindowHandle();
-                      wParam = MAKEWPARAM(Msg, getWindowId());
-                    }
-                    SendMessageA(parentwindow->getWindowHandle(), WM_PARENTNOTIFY, wParam, lParam);
+            /* Notify the parent window only */
+            parentwindow = window->getParent();
+            if(parentwindow) {
+                /* PF We should map points for each window accordingly! */
+                if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN || Msg == WM_RBUTTONDOWN ||
+                    Msg == WM_LBUTTONUP || Msg == WM_MBUTTONUP || Msg == WM_RBUTTONUP)
+                {
+                    POINTS pt = MAKEPOINTS(lParam);
+                    POINT point;
+
+                    point.x = pt.x;
+                    point.y = pt.y;
+
+                    MapWindowPoints(getWindowHandle(),parentwindow->getWindowHandle(), &point, 1);
+                    lParam = MAKELPARAM(point.x, point.y);
+                    wParam = MAKEWPARAM(Msg, 0 /* undefined according to MSDN, 0 under XP */);
                 }
+                else
+                {
+                    lParam = getWindowHandle();
+                    wParam = MAKEWPARAM(Msg, getWindowId());
+                }
+                SendMessageA(parentwindow->getWindowHandle(), WM_PARENTNOTIFY, wParam, lParam);
+            }
 
         }