diff --git a/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch b/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch index 7cb9ae44..1cfac986 100644 --- a/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch +++ b/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch @@ -1,4 +1,4 @@ -From 0d41f28599a8b37e38a09a2d41ded554b7f05baa Mon Sep 17 00:00:00 2001 +From 8467721c604c1ed81f31b6675b143e98321b368b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 13:01:15 +0100 Subject: kernelbase: Add dll and add stub for QuirkIsEnabled. @@ -22,7 +22,7 @@ index b9caed0..2beb34b 100644 +C_SRCS = \ + misc.c diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec -index bef97a0..cd33ef8 100644 +index f104030..8e62b4a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1,3 +1,6 @@ @@ -1379,7 +1379,7 @@ index bef97a0..cd33ef8 100644 @ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW - @ stub SetDefaultDllDirectories + @ stdcall SetDefaultDllDirectories(long) kernel32.SetDefaultDllDirectories +@ stub SetDynamicTimeZoneInformation @ stdcall SetEndOfFile(long) kernel32.SetEndOfFile @ stub SetEnvironmentStringsW @@ -1770,17 +1770,17 @@ index 6b6ead2..7c2a9d1 100644 422 stdcall -noname SHGlobalCounterCreateNamedA(str long) 423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long) diff --git a/tools/make_specfiles b/tools/make_specfiles -index 947cde7..a102a15 100755 +index f3b5c5e..8a7e514 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -196,6 +196,7 @@ my @dll_groups = +@@ -230,6 +230,7 @@ my @dll_groups = [ "kernel32", "advapi32", + "shlwapi", "user32", "kernelbase", - ], + "api-ms-win-core-bem-l1-1-0", -- 2.9.0 diff --git a/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch index 1f16d873..20fe9a23 100644 --- a/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From f0a7191902f7c386641557162c3d1dd2f7c2d615 Mon Sep 17 00:00:00 2001 +From 88298227180510b5eee8b129ae964f14bf565d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 13:07:09 +0100 Subject: api-ms-win-core-quirks-l1-1-0: Add dll. @@ -13,10 +13,10 @@ Subject: api-ms-win-core-quirks-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index f6b9039..27bcf28 100644 +index e97cd17..6d51b3f 100644 --- a/configure.ac +++ b/configure.ac -@@ -2710,6 +2710,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) +@@ -2717,6 +2717,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) @@ -46,11 +46,11 @@ index 0000000..54ce373 +@ stub QuirkIsEnabledForPackage2 +@ stub QuirkIsEnabledForProcess diff --git a/tools/make_specfiles b/tools/make_specfiles -index 750b433..0552726 100755 +index 8a7e514..3316f76 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -216,6 +216,10 @@ my @dll_groups = - "kernelbase", +@@ -236,6 +236,10 @@ my @dll_groups = + "api-ms-win-core-bem-l1-1-0", ], [ + "kernelbase", 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 b86cf39f..240dc3d8 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 d0c465d355d6110e6f92478e9b4ccf18cd1bc89a Mon Sep 17 00:00:00 2001 +From e08bd12d12e5e3159ce9efa848cad6118951ff5e 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 ee1542f..63a6b59 100644 +index 6d51b3f..9be829f 100644 --- a/configure.ac +++ b/configure.ac @@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) @@ -22,8 +22,8 @@ index ee1542f..63a6b59 100644 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-appcompat-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) 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,17 +74,17 @@ index 0000000..2e5fbf1 +@ stub VerifyPackageId +@ stub VerifyPackageRelativeApplicationId diff --git a/tools/make_specfiles b/tools/make_specfiles -index b9e64fe..b35134c 100755 +index 3316f76..5a58eed 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -136,6 +136,7 @@ my @dll_groups = +@@ -137,6 +137,7 @@ my @dll_groups = ], [ "kernel32", + "api-ms-win-appmodel-runtime-l1-1-1", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", - "api-ms-win-core-atoms-l1-1-0", + "api-ms-win-core-appcompat-l1-1-1", -- 2.9.0 diff --git a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch index 7573e88b..37a76496 100644 --- a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From b194c2382cd05b16b8913c98c900a3667b4d55de Mon Sep 17 00:00:00 2001 +From 49eb261c42d89a4c755914a40af797eb0b04d816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 17:02:41 +0100 Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll. @@ -13,11 +13,11 @@ Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 3ba635d..139844c 100644 +index e8b9c2a..736c744 100644 --- a/configure.ac +++ b/configure.ac -@@ -2796,6 +2796,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) +@@ -2801,6 +2801,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) + WINE_CONFIG_DLL(api-ms-win-service-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) @@ -41,10 +41,10 @@ index 0000000..edb8143 +@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA +@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW diff --git a/tools/make_specfiles b/tools/make_specfiles -index f7e81e2..e16a378 100755 +index 6fb6376..c19993d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -266,6 +266,10 @@ my @dll_groups = +@@ -270,6 +270,10 @@ my @dll_groups = "shcore", ], [ diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 3b6ee758..d3367fef 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "c76c7d85d0be45edf72e63ae7eae51c018383070" + echo "f669dc69cdcaf08aa197c98f68a1dfb4f8a265b1" } # Show version information diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 95805952..37c9d9a5 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -4903,7 +4903,7 @@ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c -@@ -1495,7 +1495,11 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context +@@ -1514,7 +1514,11 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_vec4 correction_params = { /* Position is relative to the framebuffer, not the viewport. */ @@ -4915,7 +4915,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c context->render_offscreen ? 1.0f : -1.0f, 0.0f, 0.0f, -@@ -1601,6 +1605,13 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev +@@ -1620,6 +1624,13 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev { update_heap_entry(heap, i, priv->next_constant_version); } @@ -4929,7 +4929,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c } static void shader_glsl_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) -@@ -1613,6 +1624,13 @@ static void shader_glsl_update_float_pixel_constants(struct wined3d_device *devi +@@ -1632,6 +1643,13 @@ static void shader_glsl_update_float_pixel_constants(struct wined3d_device *devi { update_heap_entry(heap, i, priv->next_constant_version); }