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

Timestamp:

Mar 30, 2012, 12:35:24 AM (13 years ago)

Author:

dmik

Message:

user32: Fix WM_MOUSEACTIVATE and WM_PARENTNOTIFY behavior.

In particular:

• Don't send these messages on mouse button release.
• Send WM_PARENTNOTIFY before WM_MOUSEACTIVATE.

Both changes reflect the actual behavior of Windows XP.

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1080 +1080 @@
 
     dprintf(("MsgButton %d at (%d,%d) %X %X", msg->message, msg->pt.x, msg->pt.y, msg->wParam, msg->lParam));
+
     switch(msg->message)
     {
@@ -1085 +1086 @@
         case WM_RBUTTONDBLCLK:
         case WM_MBUTTONDBLCLK:
-                if (!(windowClass && windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS))
-                {
-                    msg->message = msg->message - (WM_LBUTTONDBLCLK - WM_LBUTTONDOWN); //dblclick -> down
-                    return MsgButton(msg);
-                }
-                break;
+            if (!(windowClass && windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS))
+            {
+                msg->message = msg->message - (WM_LBUTTONDBLCLK - WM_LBUTTONDOWN); //dblclick -> down
+                return MsgButton(msg);
+            }
+            break;
         case WM_NCLBUTTONDBLCLK:
         case WM_NCRBUTTONDBLCLK:
         case WM_NCMBUTTONDBLCLK:
-                //Docs say CS_DBLCLKS style doesn't matter for non-client double clicks
-                fClick = TRUE;
-                break;
+            //Docs say CS_DBLCLKS style doesn't matter for non-client double clicks
+            fClick = TRUE;
+            break;
 
         case WM_LBUTTONDOWN:
         case WM_RBUTTONDOWN:
         case WM_MBUTTONDOWN:
+            if (getParent())
+            {
+                dprintf(("notifying parent: %X %X", msg->wParam, msg->lParam));
+                NotifyParent(msg->message, msg->wParam, /*0*/msg->lParam);
+            }
+            // fall through to set fClick
         case WM_NCLBUTTONDOWN:
         case WM_NCRBUTTONDOWN:
         case WM_NCMBUTTONDOWN:
-        case WM_LBUTTONUP:
-        case WM_MBUTTONUP:
-        case WM_RBUTTONUP:
-                fClick = TRUE;
-                break;
+            fClick = TRUE;
+            break;
     }
 
@@ -1150 +1154 @@
     SendMessageA(getWindowHandle(),WM_SETCURSOR, getWindowHandle(), MAKELONG(lastHitTestVal, msg->message));
 
-    switch(msg->message)
-    {
-        case WM_LBUTTONDOWN:
-        case WM_MBUTTONDOWN:
-        case WM_RBUTTONDOWN:
-        case WM_LBUTTONUP:
-        case WM_MBUTTONUP:
-        case WM_RBUTTONUP:
-        {
-            if (getParent())
-            {
-                dprintf(("notifying parent: %X %X", msg->wParam, msg->lParam));
-                NotifyParent(msg->message, msg->wParam, /*0*/msg->lParam);
-            }
-            break;
-        }
-    }
     return SendMessageA(getWindowHandle(),msg->message, msg->wParam, msg->lParam);
 }
@@ -2269 +2256 @@
                       MapWindowPoints(getWindowHandle(),parentwindow->getWindowHandle(), &point, 1);
                       lParam = MAKELPARAM(point.x, point.y);
+                      wParam = MAKEWPARAM(Msg, 0 /* undefined according to MSDN, 0 under XP */);
                     }
-                    SendMessageA(parentwindow->getWindowHandle(), WM_PARENTNOTIFY, MAKEWPARAM(Msg, getWindowId()), lParam );
+                    else
+                    {
+                      lParam = getWindowHandle();
+                      wParam = MAKEWPARAM(Msg, getWindowId());
+                    }
+                    SendMessageA(parentwindow->getWindowHandle(), WM_PARENTNOTIFY, wParam, lParam);
                 }