From 52b5c903039716b3883640bfb70926e208ef0fdf Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 6 May 2017 02:06:45 +0200 Subject: [PATCH] Rebase against 9f55292085392579568ff81b8adb926b32a8d99a. --- ...pmodel-usercontext-l1-1-0-Add-dll-and-a.patch | 16 ++++++++-------- ...-Add-stub-for-ApiSetQueryApiSetPresence.patch | 16 ++++++++-------- patches/patchinstall.sh | 2 +- patches/wined3d-CSMT_Main/9999-IfDefined.patch | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) 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 index 7ae68d10..46728d19 100644 --- 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 @@ -1,4 +1,4 @@ -From 08231829bbfa686e537a0c94f3aa4ede92a7817b Mon Sep 17 00:00:00 2001 +From 23e58d6cb2f258da259a1efce72fd2e1d58a530b 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: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for @@ -15,20 +15,20 @@ Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c diff --git a/configure.ac b/configure.ac -index bdd390c..6264ede 100644 +index 1d1846dbb7..e9cf69d3fe 100644 --- a/configure.ac +++ b/configure.ac -@@ -3020,6 +3020,7 @@ WINE_CONFIG_DLL(esent) +@@ -3045,6 +3045,7 @@ WINE_CONFIG_DLL(esent) WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) +WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0) + WINE_CONFIG_DLL(ext-ms-win-authz-context-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-domainjoin-netjoin-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) - WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) 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 0000000..16eee75 +index 0000000000..16eee7588f --- /dev/null +++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in @@ -0,0 +1,4 @@ @@ -38,7 +38,7 @@ index 0000000..16eee75 + 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 0000000..7642d15 +index 0000000000..7642d156c9 --- /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 @@ @@ -47,7 +47,7 @@ index 0000000..7642d15 +@ 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 0000000..7a9e75f +index 0000000000..7a9e75f710 --- /dev/null +++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c @@ -0,0 +1,35 @@ @@ -87,5 +87,5 @@ index 0000000..7a9e75f + return S_OK; +} -- -2.9.0 +2.12.2 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 6be959e1..5157bf6e 100644 --- a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch +++ b/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch @@ -1,4 +1,4 @@ -From 66e1fd2fc1c0a3b55597603b123f0c599faa2b75 Mon Sep 17 00:00:00 2001 +From 07428b41767dfbbc3de78e32690527a9bc154260 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. @@ -10,19 +10,19 @@ Subject: ntdll: Add stub for ApiSetQueryApiSetPresence. 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 6d63b5bf43f..1d99dd71320 100644 +index 6d63b5bf43..1d99dd7132 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 40a878539a6..55a93938dcd 100644 +index f6d95b7802..c20d0812d8 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c -@@ -457,3 +457,14 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) - FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); - return ERROR_SUCCESS; +@@ -474,3 +474,14 @@ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descri + FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); + return FALSE; } + +/********************************************************************* @@ -36,7 +36,7 @@ index 40a878539a6..55a93938dcd 100644 + return TRUE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 28dc60c40a2..076d0d280fe 100644 +index f8b139a458..59c9978986 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -3,6 +3,7 @@ @@ -48,5 +48,5 @@ index 28dc60c40a2..076d0d280fe 100644 @ stub CsrAllocateCapturePointer @ stub CsrAllocateMessagePointer -- -2.11.0 +2.12.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index ea8405ff..8e1481d0 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "10db51d5c26f0a71956989ecff83da90f4d94fda" + echo "9f55292085392579568ff81b8adb926b32a8d99a" } # Show version information diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 0013c222..b5380147 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -854,7 +854,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) -@@ -4199,6 +4202,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev +@@ -4222,6 +4225,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } @@ -862,7 +862,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c if (dst_texture->sub_resources[dst_sub_resource_idx].map_count) { WARN("Destination sub-resource %u is mapped.\n", dst_sub_resource_idx); -@@ -4209,6 +4213,19 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev +@@ -4232,6 +4236,19 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev { WARN("Source sub-resource %u is mapped.\n", src_sub_resource_idx); return WINED3DERR_INVALIDCALL; @@ -882,7 +882,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c } if (!src_box) -@@ -5242,3 +5259,58 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL +@@ -5265,3 +5282,58 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL else return CallWindowProcA(proc, window, message, wparam, lparam); }