From 63aff53684968221158cc144fa932c5411765d0a Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 1 Dec 2023 17:23:49 -0600 Subject: [PATCH] Rebase against 369b540abf32869df8e9b28e283d795ae92b6a05. --- ...d-implicit-cast-of-interface-pointer.patch | 10 +++---- ...CurrentControlSet-Control-Video-regi.patch | 14 ++++----- ...er-Allow-videoconvert-to-parallelize.patch | 29 ------------------- ...user-configured-keyboard-layout-if-a.patch | 18 ++++++------ ...fixed-X11-keycode-to-scancode-conver.patch | 16 +++++----- ...keyboard-scancode-auto-detection-by-.patch | 10 +++---- staging/upstream-commit | 2 +- 7 files changed, 35 insertions(+), 64 deletions(-) delete mode 100644 patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch diff --git a/patches/Compiler_Warnings/0024-d3d9-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0024-d3d9-Avoid-implicit-cast-of-interface-pointer.patch index 26d67a8f..67f348cc 100644 --- a/patches/Compiler_Warnings/0024-d3d9-Avoid-implicit-cast-of-interface-pointer.patch +++ b/patches/Compiler_Warnings/0024-d3d9-Avoid-implicit-cast-of-interface-pointer.patch @@ -1,4 +1,4 @@ -From 3dd0480317fe0ed3951daf1cf5757204d11a1ae5 Mon Sep 17 00:00:00 2001 +From bd5dfbb4768404c53ad623a2c0b3c3b9d635b562 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 22 Mar 2016 21:55:12 +0100 Subject: [PATCH] d3d9: Avoid implicit cast of interface pointer. @@ -8,10 +8,10 @@ Subject: [PATCH] d3d9: Avoid implicit cast of interface pointer. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c -index d3662f8..ebc3413 100644 +index 4de7d2eb99e..9a4ab3601e3 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c -@@ -25,17 +25,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +@@ -77,17 +77,17 @@ static void d3d9_texture_preload(struct d3d9_texture *texture) static inline struct d3d9_texture *impl_from_IDirect3DTexture9(IDirect3DTexture9 *iface) { @@ -31,7 +31,7 @@ index d3662f8..ebc3413 100644 + return CONTAINING_RECORD((IDirect3DBaseTexture9 *)iface, struct d3d9_texture, IDirect3DBaseTexture9_iface); } - static void STDMETHODCALLTYPE srv_wined3d_object_destroyed(void *parent) + /* wined3d critical section must be taken by the caller. */ -- -1.9.1 +2.42.0 diff --git a/patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch b/patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch index bfbaf890..07eef4cd 100644 --- a/patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch +++ b/patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch @@ -1,4 +1,4 @@ -From 221afbcd2a31e7df7e8eddcf7380e4448f420888 Mon Sep 17 00:00:00 2001 +From febea756ed65a18437819c8fcc66a127835210be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 9 Jan 2016 16:57:49 +0100 Subject: [PATCH] explorer: Create CurrentControlSet\Control\Video registry key @@ -14,10 +14,10 @@ Signed-off-by: Michael Müller 2 files changed, 12 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c -index 9e051056eed..1f710f6ee04 100644 +index 30a79368c94..fc2069c389a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c -@@ -1329,6 +1329,13 @@ static void test_reg_create_key(void) +@@ -1310,6 +1310,13 @@ static void test_reg_create_key(void) RegDeleteKeyA(hkey1, ""); RegCloseKey(hkey1); @@ -32,18 +32,18 @@ index 9e051056eed..1f710f6ee04 100644 hkey1 = NULL; ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c -index 9945f689313..d996108c145 100644 +index 9a58f13d887..081b1fcb303 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -844,6 +844,7 @@ static BOOL get_default_enable_shell( const WCHAR *name ) - static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid ) + static void load_graphics_driver( const WCHAR *driver, GUID *guid ) { static const WCHAR device_keyW[] = L"System\\CurrentControlSet\\Control\\Video\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\0000"; + static const WCHAR video_keyW[] = L"System\\CurrentControlSet\\Control\\Video\\0000"; WCHAR buffer[MAX_PATH], libname[32], *name, *next; WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; -@@ -900,6 +901,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid ) +@@ -900,6 +901,10 @@ static void load_graphics_driver( const WCHAR *driver, GUID *guid ) TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(libname) ); @@ -55,5 +55,5 @@ index 9945f689313..d996108c145 100644 guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); -- -2.40.1 +2.42.0 diff --git a/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch b/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch deleted file mode 100644 index 2d2b5ed6..00000000 --- a/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 612c0266b7a8cec562f82f1a2aaf55cffc15f35e Mon Sep 17 00:00:00 2001 -From: Zebediah Figura -Date: Wed, 21 Oct 2020 16:03:21 -0500 -Subject: [PATCH] winegstreamer: Allow videoconvert to parallelize. - -Not sure if this should be called a hack. It's not the *best* solution to the problem, but it's not a wrong one either. - -Signed-off-by: Zebediah Figura ---- - dlls/winegstreamer/wg_parser.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c -index dfb3da9a4ab..2135dea456b 100644 ---- a/dlls/winegstreamer/wg_parser.c -+++ b/dlls/winegstreamer/wg_parser.c -@@ -842,6 +842,9 @@ static bool stream_create_post_processing_elements(struct wg_parser_stream *stre - || !append_element(parser->container, element, &first, &last)) - return false; - -+ /* Let GStreamer choose a default number of threads. */ -+ gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); -+ - /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ - if (!(element = create_element("videoflip", "good")) - || !append_element(parser->container, element, &first, &last)) --- -2.39.2 - diff --git a/patches/winex11-Fixed-scancodes/0005-winex11-Use-the-user-configured-keyboard-layout-if-a.patch b/patches/winex11-Fixed-scancodes/0005-winex11-Use-the-user-configured-keyboard-layout-if-a.patch index ddeeb8f0..a9f049d2 100644 --- a/patches/winex11-Fixed-scancodes/0005-winex11-Use-the-user-configured-keyboard-layout-if-a.patch +++ b/patches/winex11-Fixed-scancodes/0005-winex11-Use-the-user-configured-keyboard-layout-if-a.patch @@ -1,4 +1,4 @@ -From d277822336764e01d8edfef93332738dfbd678a3 Mon Sep 17 00:00:00 2001 +From 4c7d3e59dc62e62aac5ce273494e1a7cb5349bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Fri, 6 Jan 2023 08:09:11 +0100 Subject: [PATCH] winex11: Use the user configured keyboard layout if any. @@ -94,18 +94,18 @@ index 1846bd923a5..fe87ae2235d 100644 syms = (keysyms_per_keycode > 4) ? 4 : keysyms_per_keycode; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index da501ad4618..9549d427583 100644 +index 52260474ad2..f6baca922ef 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h -@@ -444,6 +444,7 @@ extern BOOL use_primary_selection; +@@ -447,6 +447,7 @@ extern BOOL use_take_focus; + extern BOOL use_primary_selection; extern BOOL use_system_cursors; - extern BOOL show_systray; extern BOOL grab_fullscreen; +extern int keyboard_layout; extern BOOL usexcomposite; extern BOOL managed_mode; extern BOOL decorated_mode; -@@ -703,6 +704,7 @@ extern void init_recursive_mutex( pthread_mutex_t *mutex ); +@@ -707,6 +708,7 @@ extern void init_recursive_mutex( pthread_mutex_t *mutex ); /* keyboard.c */ @@ -114,18 +114,18 @@ index da501ad4618..9549d427583 100644 #define DEPTH_COUNT 3 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c -index 73b2237778b..3ac9b24d941 100644 +index b83365861d4..842f03be998 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c -@@ -75,6 +75,7 @@ BOOL use_primary_selection = FALSE; +@@ -75,6 +75,7 @@ BOOL use_take_focus = TRUE; + BOOL use_primary_selection = FALSE; BOOL use_system_cursors = TRUE; - BOOL show_systray = TRUE; BOOL grab_fullscreen = FALSE; +int keyboard_layout = -1; BOOL managed_mode = TRUE; BOOL decorated_mode = TRUE; BOOL private_color_map = FALSE; -@@ -574,6 +575,9 @@ static void setup_options(void) +@@ -571,6 +572,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "GrabFullscreen", buffer, sizeof(buffer) )) grab_fullscreen = IS_OPTION_TRUE( buffer[0] ); diff --git a/patches/winex11-Fixed-scancodes/0008-winex11-Support-fixed-X11-keycode-to-scancode-conver.patch b/patches/winex11-Fixed-scancodes/0008-winex11-Support-fixed-X11-keycode-to-scancode-conver.patch index 697902f3..1ba500df 100644 --- a/patches/winex11-Fixed-scancodes/0008-winex11-Support-fixed-X11-keycode-to-scancode-conver.patch +++ b/patches/winex11-Fixed-scancodes/0008-winex11-Support-fixed-X11-keycode-to-scancode-conver.patch @@ -1,4 +1,4 @@ -From 8eed5c775bd6138ba5acb838a37ca7579697f65c Mon Sep 17 00:00:00 2001 +From c61fac8a28ccc3f6bfb1e502cfc1e4027fe2d2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Wed, 30 Nov 2022 18:46:00 +0100 Subject: [PATCH] winex11: Support fixed X11 keycode to scancode conversion. @@ -85,11 +85,11 @@ index dbc1e1ea689..6a71da1a5d9 100644 const char *ksname; keysym = XkbKeycodeToKeysym( display, keyc, 0, 0 ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index 193e34037e3..367eb7b5f97 100644 +index f6baca922ef..e11c48dd3e2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h -@@ -445,6 +445,7 @@ extern BOOL use_system_cursors; - extern BOOL show_systray; +@@ -448,6 +448,7 @@ extern BOOL use_primary_selection; + extern BOOL use_system_cursors; extern BOOL grab_fullscreen; extern int keyboard_layout; +extern BOOL keyboard_scancode_detect; @@ -97,18 +97,18 @@ index 193e34037e3..367eb7b5f97 100644 extern BOOL managed_mode; extern BOOL decorated_mode; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c -index 3ac9b24d941..60f624d4aec 100644 +index 842f03be998..782989dab4b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c -@@ -76,6 +76,7 @@ BOOL use_system_cursors = TRUE; - BOOL show_systray = TRUE; +@@ -76,6 +76,7 @@ BOOL use_primary_selection = FALSE; + BOOL use_system_cursors = TRUE; BOOL grab_fullscreen = FALSE; int keyboard_layout = -1; +BOOL keyboard_scancode_detect = TRUE; BOOL managed_mode = TRUE; BOOL decorated_mode = TRUE; BOOL private_color_map = FALSE; -@@ -582,6 +583,9 @@ static void setup_options(void) +@@ -579,6 +580,9 @@ static void setup_options(void) if (p) set_reg_string_value( hkey, "KeyboardLayoutList", p, len * sizeof(WCHAR) ); free( p ); diff --git a/patches/winex11-Fixed-scancodes/0009-winex11-Disable-keyboard-scancode-auto-detection-by-.patch b/patches/winex11-Fixed-scancodes/0009-winex11-Disable-keyboard-scancode-auto-detection-by-.patch index 9b8ff1b1..46cf0ebb 100644 --- a/patches/winex11-Fixed-scancodes/0009-winex11-Disable-keyboard-scancode-auto-detection-by-.patch +++ b/patches/winex11-Fixed-scancodes/0009-winex11-Disable-keyboard-scancode-auto-detection-by-.patch @@ -1,4 +1,4 @@ -From fea8e9e597fd7b92166b2e78321506b884051d99 Mon Sep 17 00:00:00 2001 +From cdb9c20dfeede2240d102ac2f407f58591b3ec2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Fri, 6 Jan 2023 11:31:36 +0100 Subject: [PATCH] winex11: Disable keyboard scancode auto-detection by default. @@ -11,11 +11,11 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c -index 802bbae7815..26cf404731b 100644 +index 782989dab4b..3bee214e09b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c -@@ -76,7 +76,7 @@ BOOL use_system_cursors = TRUE; - BOOL show_systray = TRUE; +@@ -76,7 +76,7 @@ BOOL use_primary_selection = FALSE; + BOOL use_system_cursors = TRUE; BOOL grab_fullscreen = FALSE; int keyboard_layout = -1; -BOOL keyboard_scancode_detect = TRUE; @@ -37,5 +37,5 @@ index a9d83b45f00..3ee20d49874 100644 else CheckDlgButton( dialog, IDC_KEYBOARD_SCANCODE_DETECT, BST_UNCHECKED ); free( buffer ); -- -2.40.1 +2.42.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 16f6eef1..bf856ba8 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -1e4db62e0ba0b8595748c94b032dfb0064207de1 +369b540abf32869df8e9b28e283d795ae92b6a05