From 8a3506501609ad8fdb9509d98140daf05ca54385 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 27 Apr 2022 18:54:14 -0500 Subject: [PATCH] api-ms-win-Stub_DLLs: Remove ext-ms-win-* patches. No known application is helped by these patches. If one is found they will be trivial to rewrite. --- ...pal-l1-1-0-Add-dll-and-add-stub-for-.patch | 94 ------------------- ...del-usercontext-l1-1-0-Add-dll-and-a.patch | 91 ------------------ ...pal-l1-1-0-Add-stub-for-GetThemeServ.patch | 41 -------- patches/api-ms-win-Stub_DLLs/definition | 5 - patches/patchinstall.sh | 19 ---- 5 files changed, 250 deletions(-) delete mode 100644 patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch delete mode 100644 patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch delete mode 100644 patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch delete mode 100644 patches/api-ms-win-Stub_DLLs/definition diff --git a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch deleted file mode 100644 index 09dc37a6..00000000 --- a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 49de5f50cf6eb5a3c4ab07be05ca25f96991ab8a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 17 Jan 2016 17:07:35 +0100 -Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for - XamlBehaviorEnabled. - ---- - configure.ac | 1 + - dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in | 4 +++ - .../ext-ms-win-xaml-pal-l1-1-0.spec | 6 ++++ - dlls/ext-ms-win-xaml-pal-l1-1-0/main.c | 35 +++++++++++++++++++ - 4 files changed, 46 insertions(+) - create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in - create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec - create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c - -diff --git a/configure.ac b/configure.ac -index 7fb2da63a0b..e9ea24f2680 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2572,6 +2572,7 @@ WINE_CONFIG_MAKEFILE(dlls/evr) - WINE_CONFIG_MAKEFILE(dlls/evr/tests) - WINE_CONFIG_MAKEFILE(dlls/explorerframe) - WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests) -+WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/faultrep) - WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) - WINE_CONFIG_MAKEFILE(dlls/feclient) -diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in -new file mode 100644 -index 00000000000..6382d85272b ---- /dev/null -+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in -@@ -0,0 +1,4 @@ -+MODULE = ext-ms-win-xaml-pal-l1-1-0.dll -+ -+C_SRCS = \ -+ main.c -diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec -new file mode 100644 -index 00000000000..c167f5e753e ---- /dev/null -+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec -@@ -0,0 +1,6 @@ -+@ stub CreatePhoneAppBarProxy -+@ stub CreateWinTextBoxProxy -+@ stub GetThemeServices -+@ stdcall XamlBehaviorEnabled(ptr) -+@ stub XamlPalInitialize -+@ stub XamlPalUninitialize -diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c -new file mode 100644 -index 00000000000..3e282758f41 ---- /dev/null -+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c -@@ -0,0 +1,35 @@ -+/* -+ * ext-ms-win-xaml-pal-l1-1-0 -+ * -+ * Copyright 2016 Michael Müller -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#include -+#include -+ -+#include "windef.h" -+#include "winbase.h" -+#include "winuser.h" -+#include "wine/debug.h" -+ -+WINE_DEFAULT_DEBUG_CHANNEL(xaml); -+ -+BOOL WINAPI XamlBehaviorEnabled(void *unknown) -+{ -+ FIXME("(%p): stub\n", unknown); -+ return TRUE; -+} --- -2.34.1 - diff --git a/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch b/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch deleted file mode 100644 index 0545bed3..00000000 --- a/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch +++ /dev/null @@ -1,91 +0,0 @@ -From adf1cce491f1580f73599ba2ec951a4004b4e091 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 17 Jan 2016 17:12:45 +0100 -Subject: [PATCH] ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub - for UserContextExtInitialize. - ---- - configure.ac | 1 + - .../Makefile.in | 4 +++ - ...xt-ms-win-appmodel-usercontext-l1-1-0.spec | 3 ++ - .../main.c | 35 +++++++++++++++++++ - 4 files changed, 43 insertions(+) - create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in - create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec - create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c - -diff --git a/configure.ac b/configure.ac -index e9ea24f2680..54c8fcb183b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2572,6 +2572,7 @@ WINE_CONFIG_MAKEFILE(dlls/evr) - WINE_CONFIG_MAKEFILE(dlls/evr/tests) - WINE_CONFIG_MAKEFILE(dlls/explorerframe) - WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests) -+WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-appmodel-usercontext-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/faultrep) - WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) -diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in -new file mode 100644 -index 00000000000..16eee7588ff ---- /dev/null -+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in -@@ -0,0 +1,4 @@ -+MODULE = ext-ms-win-appmodel-usercontext-l1-1-0.dll -+ -+C_SRCS = \ -+ main.c -diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec -new file mode 100644 -index 00000000000..7642d156c94 ---- /dev/null -+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec -@@ -0,0 +1,3 @@ -+@ stub UserContextExtCleanup -+@ stdcall UserContextExtInitialize() -+@ stub UserContextExtSetToken -diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c -new file mode 100644 -index 00000000000..7a9e75f7109 ---- /dev/null -+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c -@@ -0,0 +1,35 @@ -+/* -+ * ext-ms-win-appmodel-usercontext-l1-1-0 -+ * -+ * Copyright 2016 Michael Müller -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#include -+#include -+ -+#include "windef.h" -+#include "winbase.h" -+#include "winuser.h" -+#include "wine/debug.h" -+ -+WINE_DEFAULT_DEBUG_CHANNEL(usercontext); -+ -+HRESULT WINAPI UserContextExtInitialize(void) -+{ -+ FIXME("(): stub\n"); -+ return S_OK; -+} --- -2.34.1 - diff --git a/patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch b/patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch deleted file mode 100644 index 73f8b7fe..00000000 --- a/patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 751d2904a1ac0831cab220eaedbbd01ba8a14356 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Thu, 21 Jan 2016 00:40:29 +0100 -Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add stub for GetThemeServices. - ---- - dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec | 2 +- - dlls/ext-ms-win-xaml-pal-l1-1-0/main.c | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec -index c167f5e..042e037 100644 ---- a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec -+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec -@@ -1,6 +1,6 @@ - @ stub CreatePhoneAppBarProxy - @ stub CreateWinTextBoxProxy --@ stub GetThemeServices -+@ stdcall GetThemeServices(ptr) - @ stdcall XamlBehaviorEnabled(ptr) - @ stub XamlPalInitialize - @ stub XamlPalUninitialize -diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c -index 3e28275..45353ba 100644 ---- a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c -+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c -@@ -33,3 +33,11 @@ BOOL WINAPI XamlBehaviorEnabled(void *unknown) - FIXME("(%p): stub\n", unknown); - return TRUE; - } -+ -+HRESULT WINAPI GetThemeServices(void **interface) -+{ -+ FIXME("(%p): stub\n", interface); -+ -+ *interface = NULL; -+ return E_NOTIMPL; -+} --- -1.9.1 - diff --git a/patches/api-ms-win-Stub_DLLs/definition b/patches/api-ms-win-Stub_DLLs/definition deleted file mode 100644 index e98f2d28..00000000 --- a/patches/api-ms-win-Stub_DLLs/definition +++ /dev/null @@ -1,5 +0,0 @@ -Fixes: Add ext-ms-win-xaml-pal-l1-1-0 dll and XamlBehaviourEnabled() stub -Fixes: Add ext-ms-win-xaml-pal-l1-1-0.GetThemeServices() stub -Fixes: Add ext-ms-win-appmodel-usercontext-l1-1-0 dll and UserContextExtInitialize() stub -Fixes: Add iertutil dll -Fixes: Return dummy interface in some uiautomationcore functions \ No newline at end of file diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e10c28bc..cdd102fe 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -86,7 +86,6 @@ patch_enable_all () enable_Pipelight="$1" enable_Staging="$1" enable_advapi32_LsaLookupPrivilegeName="$1" - enable_api_ms_win_Stub_DLLs="$1" enable_cmd_launch_association="$1" enable_comctl32_rebar_capture="$1" enable_comctl32_version_6="$1" @@ -286,9 +285,6 @@ patch_enable () advapi32-LsaLookupPrivilegeName) enable_advapi32_LsaLookupPrivilegeName="$2" ;; - api-ms-win-Stub_DLLs) - enable_api_ms_win_Stub_DLLs="$2" - ;; cmd-launch-association) enable_cmd_launch_association="$2" ;; @@ -1430,21 +1426,6 @@ if test "$enable_advapi32_LsaLookupPrivilegeName" -eq 1; then patch_apply advapi32-LsaLookupPrivilegeName/0001-advapi32-Fix-error-code-when-calling-LsaOpenPolicy-f.patch fi -# Patchset api-ms-win-Stub_DLLs -# | -# | Modified files: -# | * configure.ac, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext- -# | ms-win-appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-xaml- -# | pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml- -# | pal-l1-1-0/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c -# | -if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then - patch_apply api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch - patch_apply api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch - patch_apply api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch - patch_apply api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch -fi - # Patchset cmd-launch-association # | # | This patchset fixes the following Wine bugs: