Ken Thomases : winemac: Don' t check the state of the SC_MINIMIZE item of the window menu when asked to minimize .

Alexandre Julliard julliard at winehq.org
Mon Dec 30 13:05:59 CST 2013


Module: wine
Branch: master
Commit: 2c6ad1829d4fe77278dc6f8cc2f496a59fb62849
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2c6ad1829d4fe77278dc6f8cc2f496a59fb62849

Author: Ken Thomases <ken at codeweavers.com>
Date:   Sun Dec 29 21:33:07 2013 -0600

winemac: Don't check the state of the SC_MINIMIZE item of the window menu when asked to minimize.

The window menu items are not updated as the window state changes; they only
update when the menu is shown.  So the item state is not a reliable indicator
of whether minimization is allowed.

---

 dlls/winemac.drv/window.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index a4e730d..91a1d4d 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -2037,7 +2037,6 @@ void macdrv_app_deactivated(void)
 void macdrv_window_minimize_requested(HWND hwnd)
 {
     DWORD style;
-    HMENU hSysMenu;
 
     style = GetWindowLongW(hwnd, GWL_STYLE);
     if (!(style & WS_MINIMIZEBOX) || (style & (WS_DISABLED | WS_MINIMIZE)))
@@ -2046,17 +2045,6 @@ void macdrv_window_minimize_requested(HWND hwnd)
         return;
     }
 
-    hSysMenu = GetSystemMenu(hwnd, FALSE);
-    if (hSysMenu)
-    {
-        UINT state = GetMenuState(hSysMenu, SC_MINIMIZE, MF_BYCOMMAND);
-        if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED)))
-        {
-            TRACE("not minimizing win %p menu state 0x%08x\n", hwnd, state);
-            return;
-        }
-    }
-
     if (GetActiveWindow() != hwnd)
     {
         LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT),




More information about the wine-cvs mailing list