Changeset 6773 for trunk/src

Timestamp:

Sep 20, 2001, 2:57:15 PM (24 years ago)

Author:

sandervl

Message:

WM_MOUSEACTIVATE & WM_NEXTMENU fixes

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.36 2001-09-19 15:39:48 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.37 2001-09-20 12:57:15 sandervl Exp $*/
 /*
  * Menu functions
@@ -2519 +2519 @@
         (vk == VK_RIGHT && menu->FocusedItem == menu->nItems - 1))
     {
+        MDINEXTMENU next_menu;
         HMENU hNewMenu;
         HWND  hNewWnd;
         UINT  id = 0;
-        LRESULT l = SendMessageA( pmt->hOwnerWnd, WM_NEXTMENU, vk,
-                (IS_SYSTEM_MENU(menu)) ? GetSubMenu(pmt->hTopMenu,0) : pmt->hTopMenu );
-
-        //TRACE("%04x [%04x] -> %04x [%04x]\n",
-        //             (UINT16)pmt->hCurrentMenu, (UINT16)pmt->hOwnerWnd, LOWORD(l), HIWORD(l) );
-
-        if( l == 0 )
+
+        next_menu.hmenuIn = (IS_SYSTEM_MENU(menu)) ? GetSubMenu(pmt->hTopMenu,0) : pmt->hTopMenu;
+        next_menu.hmenuNext = 0;
+        next_menu.hwndNext = 0;
+
+        SendMessageW( pmt->hOwnerWnd, WM_NEXTMENU, vk, (LPARAM)&next_menu );
+
+        dprintf(("%04x [%04x] -> %04x [%04x]\n",
+              pmt->hCurrentMenu, pmt->hOwnerWnd, next_menu.hmenuNext, next_menu.hwndNext ));
+
+        if (!next_menu.hmenuNext || !next_menu.hwndNext)
         {
             hNewWnd = pmt->hOwnerWnd;
@@ -2559 +2564 @@
         else    /* application returned a new menu to switch to */
         {
-            hNewMenu = LOWORD(l); hNewWnd = HIWORD(l);
+            hNewMenu = next_menu.hmenuNext;
+            hNewWnd = next_menu.hwndNext;
 
             if( IsMenu(hNewMenu) && IsWindow(hNewWnd) )

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.282 2001-09-19 15:39:50 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.283 2001-09-20 12:57:15 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1077 +1077 @@
                                                 MAKELONG( lastHitTestVal, msg->message) );
 
+                dprintf2(("WM_MOUSEACTIVATE returned %d", ret));
 #if 0
                 if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
                          eatMsg = TRUE;
 #endif
-                if(((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT))
+                //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()) )
                 {