From aa366375633c6c5f6e0f015d64f9b228d2ccf548 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 8 Mar 2023 09:45:55 +1100 Subject: [PATCH] Rebase against 50f5f9af1c27c4380a7489596d20d8048f003365. --- ...ub-for-ITextPara-interface-and-implement-.patch | 14 +++++++------- ...e-Add-windows.networking.connectivity.idl.patch | 10 +++++----- .../0002-include-Add-windows.networking.idl.patch | 10 +++++----- ...dows.networking.connectivity-Add-stub-dll.patch | 12 ++++++------ ...e-input-config-options-to-a-dedicated-tab.patch | 12 ++++++------ staging/upstream-commit | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch b/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch index 6905ab77..b0970c54 100644 --- a/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch +++ b/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch @@ -1,4 +1,4 @@ -From 0ed959d4122e705d8728a7064ff260d2a6955af5 Mon Sep 17 00:00:00 2001 +From ff8f658065ac9b61fbbf3d2adc95fb63bf75bb6e Mon Sep 17 00:00:00 2001 From: Jactry Zeng Date: Sun, 10 Aug 2014 22:17:57 +0800 Subject: [PATCH] riched20: Stub for ITextPara interface and implement @@ -10,7 +10,7 @@ Subject: [PATCH] riched20: Stub for ITextPara interface and implement 2 files changed, 477 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c -index afecd34dc2a..6b94ee89902 100644 +index 90496742e36..7b7e4e49ef0 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -3563,6 +3563,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface) @@ -559,11 +559,11 @@ index afecd34dc2a..6b94ee89902 100644 } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c -index a01f4e21db8..e44ffc767e7 100644 +index fb5177b83e9..cde2a9ab4c3 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c -@@ -5439,6 +5439,274 @@ static void test_undo_control(void) - release_interfaces(&inst.hwnd, &reole, &inst.doc, &selection); +@@ -5565,6 +5565,274 @@ static void test_freeze(void) + release_interfaces(&hwnd, &reole, &doc, &selection); } +static void test_ITextRange_SetStart(void) @@ -837,7 +837,7 @@ index a01f4e21db8..e44ffc767e7 100644 START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in -@@ -5459,6 +5727,13 @@ START_TEST(richole) +@@ -5585,6 +5853,13 @@ START_TEST(richole) test_ITextRange_SetRange(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); @@ -852,5 +852,5 @@ index a01f4e21db8..e44ffc767e7 100644 test_IOleWindow_GetWindow(); test_IOleInPlaceSite_GetWindow(); -- -2.35.1 +2.39.2 diff --git a/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch b/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch index d0579a84..53373a23 100644 --- a/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch +++ b/patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch @@ -1,4 +1,4 @@ -From 3cf817bf6bc7a3c6c40b72eac0e7dbed0f2967b2 Mon Sep 17 00:00:00 2001 +From d25b2276d2e5bcc46998a29ce1607e0091372203 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 28 May 2021 12:34:37 +1000 Subject: [PATCH] include: Add windows.networking.connectivity.idl @@ -10,17 +10,17 @@ Subject: [PATCH] include: Add windows.networking.connectivity.idl create mode 100644 include/windows.networking.connectivity.idl diff --git a/include/Makefile.in b/include/Makefile.in -index c581fbd80f1..2bba6acea34 100644 +index 410aab03ac8..65e2a30c30f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -823,6 +823,7 @@ SOURCES = \ +@@ -824,6 +824,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.networking.connectivity.idl \ + windows.perception.spatial.idl \ + windows.perception.spatial.surfaces.idl \ windows.security.credentials.idl \ - windows.security.cryptography.idl \ - windows.storage.streams.idl \ diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl new file mode 100644 index 00000000000..3ccefca02fa diff --git a/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch b/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch index 4cadc08f..269d86d3 100644 --- a/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch +++ b/patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch @@ -1,4 +1,4 @@ -From 233f0289061fb756563c41de851064142839a455 Mon Sep 17 00:00:00 2001 +From 865590e19a61d9d20601cd1925be794e89c368d5 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 1 Jun 2021 10:26:28 +1000 Subject: [PATCH] include: Add windows.networking.idl @@ -11,17 +11,17 @@ Signed-off-by: Alistair Leslie-Hughes create mode 100644 include/windows.networking.idl diff --git a/include/Makefile.in b/include/Makefile.in -index 2bba6acea34..9d2034063e5 100644 +index 65e2a30c30f..798535839d1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -823,6 +823,7 @@ SOURCES = \ +@@ -824,6 +824,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.networking.idl \ windows.networking.connectivity.idl \ - windows.security.credentials.idl \ - windows.security.cryptography.idl \ + windows.perception.spatial.idl \ + windows.perception.spatial.surfaces.idl \ diff --git a/include/windows.networking.idl b/include/windows.networking.idl new file mode 100644 index 00000000000..67d8e6a8d0b diff --git a/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch b/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch index 79ac3124..6555ec24 100644 --- a/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch +++ b/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 7f3f9c61bf10459c607d29e4b359a6ed0894ccb6 Mon Sep 17 00:00:00 2001 +From 034dd5bc24c566781bd2012e84b58bb08abb2813 Mon Sep 17 00:00:00 2001 From: Esdras Tarsis Date: Wed, 2 Sep 2020 23:41:19 -0300 Subject: [PATCH] windows.networking.connectivity: Add stub dll. @@ -16,17 +16,17 @@ Signed-off-by: Esdras Tarsis create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity_main.c diff --git a/configure.ac b/configure.ac -index 6410f8a0e42..b34adab1ad3 100644 +index 1957181ee31..c9fd784fd50 100644 --- a/configure.ac +++ b/configure.ac -@@ -3128,6 +3128,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) +@@ -3127,6 +3127,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media) WINE_CONFIG_MAKEFILE(dlls/windows.media/tests) WINE_CONFIG_MAKEFILE(dlls/windows.networking) +WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity) + WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub) + WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub/tests) WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers) - WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers/tests) - WINE_CONFIG_MAKEFILE(dlls/windows.ui) diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in new file mode 100644 index 00000000000..6fc24a72feb @@ -93,5 +93,5 @@ index 00000000000..96ff0ea5af2 +} \ No newline at end of file -- -2.39.0 +2.39.2 diff --git a/patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch b/patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch index 340d7625..f2282698 100644 --- a/patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch +++ b/patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch @@ -1,7 +1,7 @@ -From acd27b95daa9e118fc2c1b4191fd9a7c828ae017 Mon Sep 17 00:00:00 2001 +From 311a382432c4dd6a6d2ded5e6c10c6fe83767646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Thu, 5 Jan 2023 21:16:38 +0100 -Subject: [PATCH 1/9] winecfg: Move input config options to a dedicated tab. +Subject: [PATCH] winecfg: Move input config options to a dedicated tab. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30984 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605 @@ -18,17 +18,17 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605 create mode 100644 programs/winecfg/input.c diff --git a/MAINTAINERS b/MAINTAINERS -index 276471287da..fa155217267 100644 +index 9d60385414f..a88bff34a92 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -179,6 +179,7 @@ F: dlls/user32/input.c +@@ -181,6 +181,7 @@ F: dlls/user32/input.c F: dlls/win32u/input.c F: dlls/win32u/rawinput.c F: server/queue.c +F: programs/winecfg/input.c Input methods - M: Aric Stewart + M: Rémi Bernon diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 80d2f1991dc..5c46b935234 100644 --- a/programs/winecfg/Makefile.in @@ -353,5 +353,5 @@ index 215cd6534a2..cd7b7552a1e 100644 break; } -- -2.39.1 +2.39.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index f66b0080..e6dd9f54 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -45e83cc8c28cece236f1537958f6e21b48193f2c +50f5f9af1c27c4380a7489596d20d8048f003365