From 75760561c371dac59fea2dafce786b6eaa376742 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 15 Sep 2016 06:22:42 +0200 Subject: [PATCH] Rebase against 4931e6f92bc7e0c229a057ebf2e000f8f5aa1edd. --- ...-appmodel-runtime-l1-1-1-Add-new-dll.patch | 8 +-- ...-ms-win-core-apiquery-l1-1-0-Add-dll.patch | 55 ------------------- ...d-stub-for-ApiSetQueryApiSetPresence.patch | 24 +++++--- patches/patchinstall.sh | 55 +++++++++---------- 4 files changed, 46 insertions(+), 96 deletions(-) delete mode 100644 patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch b/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch index f41a2b60..3782edc2 100644 --- a/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch @@ -1,4 +1,4 @@ -From e79975433e5173ffc592f77bc65a16ec18ee5ce8 Mon Sep 17 00:00:00 2001 +From a5a9755806495033845a8dd1fd4fa0cba1a5df01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 13:37:26 +0100 Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll. create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec diff --git a/configure.ac b/configure.ac -index 33a6e21..703b29b 100644 +index 74378bf..ec20e74 100644 --- a/configure.ac +++ b/configure.ac @@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) @@ -21,9 +21,9 @@ index 33a6e21..703b29b 100644 WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1) + WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in new file mode 100644 index 0000000..289d96f @@ -74,7 +74,7 @@ index 0000000..2e5fbf1 +@ stub VerifyPackageId +@ stub VerifyPackageRelativeApplicationId diff --git a/tools/make_specfiles b/tools/make_specfiles -index eb07239..dc8b9fe 100755 +index ce4eaa1..3caf362 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -125,6 +125,7 @@ my @dll_groups = diff --git a/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch deleted file mode 100644 index 01c4228f..00000000 --- a/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 385c915d6c0b7408d6d3514f5aa8cde2ec10bcc3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 15 Jan 2016 13:45:05 +0100 -Subject: api-ms-win-core-apiquery-l1-1-0: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in | 1 + - .../api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec | 1 + - tools/make_specfiles | 1 + - 4 files changed, 4 insertions(+) - create mode 100644 dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in - create mode 100644 dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec - -diff --git a/configure.ac b/configure.ac -index 703b29b..d3a6c249 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2651,6 +2651,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) - WINE_CONFIG_DLL(amstream,,[clean]) - WINE_CONFIG_TEST(dlls/amstream/tests) - WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1) -+WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) -diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in -new file mode 100644 -index 0000000..492a265 ---- /dev/null -+++ b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-apiquery-l1-1-0.dll -diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec -new file mode 100644 -index 0000000..1d99dd7 ---- /dev/null -+++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec -@@ -0,0 +1 @@ -+@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence -diff --git a/tools/make_specfiles b/tools/make_specfiles -index dc8b9fe..8a0307e 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -254,6 +254,7 @@ my @dll_groups = - "msvcrt", - "ntdll", - "ntoskrnl.exe", -+ "api-ms-win-core-apiquery-l1-1-0", - "api-ms-win-core-rtlsupport-l1-1-0", - "api-ms-win-core-rtlsupport-l1-2-0", - ], --- -2.9.0 - diff --git a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch b/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch index dafc8a58..973fb102 100644 --- a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch +++ b/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch @@ -1,18 +1,26 @@ -From 455be0d2473a895b51e83d4d8c882724fef6b118 Mon Sep 17 00:00:00 2001 +From cf007e14398fed6d26eea0f5f78bebb22c9fc55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 13:17:31 +0100 Subject: ntdll: Add stub for ApiSetQueryApiSetPresence. --- - dlls/ntdll/misc.c | 11 +++++++++++ - dlls/ntdll/ntdll.spec | 1 + - 2 files changed, 12 insertions(+) + .../api-ms-win-core-apiquery-l1-1-0.spec | 2 +- + dlls/ntdll/misc.c | 11 +++++++++++ + dlls/ntdll/ntdll.spec | 1 + + 3 files changed, 13 insertions(+), 1 deletion(-) +diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec +index 6d63b5b..1d99dd7 100644 +--- a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec ++++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec +@@ -1 +1 @@ +-@ stub ApiSetQueryApiSetPresence ++@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index 4517aec..5ad121d 100644 +index de14e80..2f4cfa0 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c -@@ -444,3 +444,14 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, +@@ -435,3 +435,14 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, debugstr_a(MofResourceName), RegistrationHandle); return ERROR_SUCCESS; } @@ -28,7 +36,7 @@ index 4517aec..5ad121d 100644 + return TRUE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 0c23514..7cb46d3 100644 +index d9937b3..11ca926 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -3,6 +3,7 @@ @@ -40,5 +48,5 @@ index 0c23514..7cb46d3 100644 @ stub CsrAllocateCapturePointer @ stub CsrAllocateMessagePointer -- -2.6.4 +2.9.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 54e67667..cf2f07f2 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "4e9cc305bb1a758eb70419318c7c41c2918fc180" + echo "4931e6f92bc7e0c229a057ebf2e000f8f5aa1edd" } # Show version information @@ -2644,37 +2644,35 @@ fi # | # | Modified files: # | * configure.ac, dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in, dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win- -# | appmodel-runtime-l1-1-1.spec, dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in, dlls/api-ms-win-core-apiquery-l1-1-0 -# | /api-ms-win-core-apiquery-l1-1-0.spec, dlls/api-ms-win-core-heap-l2-1-0/Makefile.in, dlls/api-ms-win-core-heap-l2-1-0 -# | /api-ms-win-core-heap-l2-1-0.spec, dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0 -# | /api-ms-win-core-quirks-l1-1-0.spec, dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in, dlls/api-ms-win-core- -# | shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec, dlls/api-ms-win-rtcore-ntuser- -# | draw-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec, dlls/api- -# | ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser- -# | window-l1-1-0.spec, dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms- -# | win-shcore-obsolete-l1-1-0.spec, dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-stream-l1-1-0 -# | /api-ms-win-shcore-stream-l1-1-0.spec, dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in, dlls/api-ms-win-shcore- -# | thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec, 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-kernel32-package-current-l1-1-0/Makefile.in, dlls/ext-ms-win-kernel32 -# | -package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec, dlls/ext-ms-win-ntuser- -# | mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec, dlls/ext-ms-win- -# | rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser- -# | syscolors-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser- -# | sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls -# | /ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, 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/feclient/Makefile.in, dlls/feclient/feclient.spec, dlls/feclient/main.c, dlls/iertutil/Makefile.in, -# | dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, -# | dlls/kernelbase/misc.c, dlls/shcore/Makefile.in, dlls/shcore/main.c, dlls/shcore/shcore.spec, dlls/shlwapi/shlwapi.spec, -# | dlls/uiautomationcore/Makefile.in, dlls/uiautomationcore/main.c, dlls/uiautomationcore/uiautomationcore.spec, -# | include/Makefile.in, include/shellscalingapi.h, include/uiautomationcoreapi.h, tools/make_specfiles +# | appmodel-runtime-l1-1-1.spec, dlls/api-ms-win-core-heap-l2-1-0/Makefile.in, dlls/api-ms-win-core-heap-l2-1-0/api-ms-win- +# | core-heap-l2-1-0.spec, dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win- +# | core-quirks-l1-1-0.spec, dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in, dlls/api-ms-win-core-shlwapi- +# | obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec, dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in, +# | dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec, dlls/api-ms-win-rtcore-ntuser- +# | window-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec, dlls +# | /api-ms-win-shcore-obsolete-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore- +# | obsolete-l1-1-0.spec, dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win- +# | shcore-stream-l1-1-0.spec, dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-thread-l1-1-0/api- +# | ms-win-shcore-thread-l1-1-0.spec, 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-kernel32-package-current-l1-1-0/Makefile.in, dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win- +# | kernel32-package-current-l1-1-0.spec, dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser- +# | mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext- +# | ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser- +# | sysparams-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser- +# | sysparams-l1-1-0.spec, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms- +# | win-uxtheme-themes-l1-1-0.spec, 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/feclient/Makefile.in, dlls/feclient/feclient.spec, +# | dlls/feclient/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, +# | dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, dlls/shcore/Makefile.in, +# | dlls/shcore/main.c, dlls/shcore/shcore.spec, dlls/shlwapi/shlwapi.spec, dlls/uiautomationcore/Makefile.in, +# | dlls/uiautomationcore/main.c, dlls/uiautomationcore/uiautomationcore.spec, include/Makefile.in, +# | include/shellscalingapi.h, include/uiautomationcoreapi.h, tools/make_specfiles # | if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then patch_apply api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch patch_apply api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch - patch_apply api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch 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/0007-shcore-Add-dll.patch @@ -2702,7 +2700,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then echo '+ { "Michael Müller", "kernelbase: Add dll and add stub for QuirkIsEnabled.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-core-quirks-l1-1-0: Add dll.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-appmodel-runtime-l1-1-1: Add new dll.", 1 },'; - echo '+ { "Michael Müller", "api-ms-win-core-apiquery-l1-1-0: Add dll.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-core-heap-l2-1-0: Add dll.", 1 },'; echo '+ { "Michael Müller", "iertutil: Add dll and add stub for ordinal 811.", 1 },'; echo '+ { "Sebastian Lackner", "shcore: Add dll.", 1 },'; @@ -4814,7 +4811,7 @@ fi # | * ntdll-EtwRegisterTraceGuids # | # | Modified files: -# | * dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec +# | * dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec, dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec # | if test "$enable_ntdll_ApiSetQueryApiSetPresence" -eq 1; then patch_apply ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch