winex11-SC_KEYMENU: Remove.

As per https://bugs.winehq.org/show_bug.cgi?id=41544#c11
This commit is contained in:
Zebediah Figura 2018-02-27 23:56:03 -06:00
parent c81dad1373
commit d3bcb61436
3 changed files with 0 additions and 96 deletions

View File

@ -445,7 +445,6 @@ patch_enable_all ()
enable_winex11_ClipCursor="$1"
enable_winex11_DefaultDisplayFrequency="$1"
enable_winex11_MWM_Decorations="$1"
enable_winex11_SC_KEYMENU="$1"
enable_winex11_UpdateLayeredWindow="$1"
enable_winex11_WM_WINDOWPOSCHANGING="$1"
enable_winex11_Window_Groups="$1"
@ -1570,9 +1569,6 @@ patch_enable ()
winex11-MWM_Decorations)
enable_winex11_MWM_Decorations="$2"
;;
winex11-SC_KEYMENU)
enable_winex11_SC_KEYMENU="$2"
;;
winex11-UpdateLayeredWindow)
enable_winex11_UpdateLayeredWindow="$2"
;;
@ -9275,21 +9271,6 @@ if test "$enable_winex11_MWM_Decorations" -eq 1; then
) >> "$patchlist"
fi
# Patchset winex11-SC_KEYMENU
# |
# | This patchset fixes the following Wine bugs:
# | * [#21918] Send SC_KEYMENU on managed windows
# |
# | Modified files:
# | * dlls/user32/tests/msg.c, dlls/winex11.drv/window.c
# |
if test "$enable_winex11_SC_KEYMENU" -eq 1; then
patch_apply winex11-SC_KEYMENU/0001-winex11-Send-SC_KEYMENU-on-managed-windows.patch
(
printf '%s\n' '+ { "Alex Henrie", "winex11: Send SC_KEYMENU on managed windows.", 1 },';
) >> "$patchlist"
fi
# Patchset winex11-UpdateLayeredWindow
# |
# | This patchset fixes the following Wine bugs:
@ -9517,24 +9498,6 @@ if test "$enable_wininet_ParseX509EncodedCertificateForListBoxEntry" -eq 1; then
) >> "$patchlist"
fi
# Patchset wininet-Redirect
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * wininet-Cleanup
# |
# | This patchset fixes the following Wine bugs:
# | * [#41398] Return failure when handling http redirect without hostname
# |
# | Modified files:
# | * dlls/wininet/tests/http.c
# |
if test "$enable_wininet_Redirect" -eq 1; then
patch_apply wininet-Redirect/0001-wininet-Return-failure-when-handling-http-redirect-w.patch
(
printf '%s\n' '+ { "Michael Müller", "wininet: Return failure when handling http redirect without hostname.", 1 },';
) >> "$patchlist"
fi
# Patchset winmm-Delay_Import_Depends
# |
# | This patchset fixes the following Wine bugs:

View File

@ -1,58 +0,0 @@
From f178746e3950e20c97e6dbe598775e805ef13eea Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sat, 21 May 2016 17:55:58 -0600
Subject: winex11: Send SC_KEYMENU on managed windows.
---
dlls/user32/tests/msg.c | 5 ++---
dlls/winex11.drv/window.c | 11 -----------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 52cf901..bb9691c 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -7997,8 +7997,7 @@ static void test_accelerators(void)
keybd_event(VK_MENU, 0, 0, 0);
keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0);
pump_msg_loop(hwnd, 0);
- /* this test doesn't pass in Wine for managed windows */
- ok_sequence(WmAltPressRelease, "Alt press/release", TRUE);
+ ok_sequence(WmAltPressRelease, "Alt press/release", FALSE);
trace("testing VK_F1 press/release\n");
keybd_event(VK_F1, 0, 0, 0);
@@ -8018,7 +8017,7 @@ static void test_accelerators(void)
keybd_event(VK_F10, 0, 0, 0);
keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0);
pump_msg_loop(hwnd, 0);
- ok_sequence(WmVkF10Seq, "VK_F10 press/release", TRUE);
+ ok_sequence(WmVkF10Seq, "VK_F10 press/release", FALSE);
trace("testing SHIFT+F10 press/release\n");
keybd_event(VK_SHIFT, 0, 0, 0);
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 06ce26e..4c3632d 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2750,17 +2750,6 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam )
default: dir = _NET_WM_MOVERESIZE_SIZE_KEYBOARD; break;
}
break;
-
- case SC_KEYMENU:
- /* prevent a simple ALT press+release from activating the system menu,
- * as that can get confusing on managed windows */
- if ((WCHAR)lparam) goto failed; /* got an explicit char */
- if (GetMenu( hwnd )) goto failed; /* window has a real menu */
- if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) goto failed; /* no system menu */
- TRACE( "ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam );
- release_win_data( data );
- return 0;
-
default:
goto failed;
}
--
2.8.0

View File

@ -1 +0,0 @@
Fixes: [21918] Send SC_KEYMENU on managed windows