diff --git a/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch b/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch index 5cf52afb..2434dbb3 100644 --- a/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch +++ b/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch @@ -1,4 +1,4 @@ -From e5b50178db3b0e1fdd7f4c3c88c2c6d4dd5ebd86 Mon Sep 17 00:00:00 2001 +From 296432e173a7d08f8f3b78df7c5a54d5ca2ca0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 4 Feb 2017 16:20:37 +0100 Subject: [PATCH] kernel32: Implement some processor group functions. @@ -87,7 +87,7 @@ index 96180bed4ec..a71d961eefa 100644 /*********************************************************************** diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec -index c01f132371e..cedd84efbc7 100644 +index 016c3022dcb..2f34e1c763c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -717,7 +717,7 @@ @@ -96,11 +96,11 @@ index c01f132371e..cedd84efbc7 100644 @ stdcall GetMaximumProcessorCount(long) -# @ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() - @ stdcall GetModuleFileNameA(long ptr long) - @ stdcall GetModuleFileNameW(long ptr long) - @ stdcall GetModuleHandleA(str) + @ stdcall -import GetModuleFileNameA(long ptr long) + @ stdcall -import GetModuleFileNameW(long ptr long) + @ stdcall -import GetModuleHandleA(str) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c -index 0892d842ff7..71d141df8ea 100644 +index 973c1a919bb..b5ff2c69869 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -91,6 +91,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void); @@ -119,7 +119,7 @@ index 0892d842ff7..71d141df8ea 100644 return TRUE; } -@@ -3880,6 +3882,26 @@ static void test_ProcThreadAttributeList(void) +@@ -3908,6 +3910,26 @@ static void test_ProcThreadAttributeList(void) pDeleteProcThreadAttributeList(&list); } @@ -146,7 +146,7 @@ index 0892d842ff7..71d141df8ea 100644 START_TEST(process) { HANDLE job; -@@ -3964,6 +3986,7 @@ START_TEST(process) +@@ -3992,6 +4014,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); @@ -155,10 +155,10 @@ index 0892d842ff7..71d141df8ea 100644 test_ProcThreadAttributeList(); test_SuspendProcessState(); diff --git a/include/winnt.h b/include/winnt.h -index fad4c7c47fa..a77633bcf7e 100644 +index 3f91ede6a68..9484bc0e14b 100644 --- a/include/winnt.h +++ b/include/winnt.h -@@ -6326,6 +6326,8 @@ typedef struct _GROUP_AFFINITY +@@ -6338,6 +6338,8 @@ typedef struct _GROUP_AFFINITY WORD Reserved[3]; } GROUP_AFFINITY, *PGROUP_AFFINITY; @@ -168,5 +168,5 @@ index fad4c7c47fa..a77633bcf7e 100644 { WORD Group; -- -2.20.1 +2.17.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 43240604..1619b208 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "5e8ded1646579a597c029531f2612930b17c7627" + echo "cf5ccf29a9ae341cebe03634b3c4220c0c59ea53" } # Show version information diff --git a/patches/wined3d-unset-flip-gdi/0001-wined3d-Dont-set-DDSCAPS_FLIP-for-gdi-renderer.patch b/patches/wined3d-unset-flip-gdi/0001-wined3d-Dont-set-DDSCAPS_FLIP-for-gdi-renderer.patch index d2df1038..45c5131b 100644 --- a/patches/wined3d-unset-flip-gdi/0001-wined3d-Dont-set-DDSCAPS_FLIP-for-gdi-renderer.patch +++ b/patches/wined3d-unset-flip-gdi/0001-wined3d-Dont-set-DDSCAPS_FLIP-for-gdi-renderer.patch @@ -1,4 +1,4 @@ -From f29cd7a5fe2f118e9d52c40a8a2ae102108c6f4b Mon Sep 17 00:00:00 2001 +From 1c2d05ef5e6417c26641f82c2d7ad43632ee237f Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 28 Jun 2019 14:27:10 +1000 Subject: [PATCH] wined3d: Dont set DDSCAPS_FLIP for gdi renderer @@ -7,45 +7,47 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47419 --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + - dlls/wined3d/directx.c | 1 - - 3 files changed, 2 insertions(+), 1 deletion(-) + dlls/wined3d/directx.c | 3 +-- + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c -index c8ebe34643..16c3f2175c 100644 +index 991997af849..200edf9960c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c -@@ -4355,6 +4355,7 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s +@@ -4399,6 +4399,7 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s const struct wined3d_gl_info *gl_info = &adapter->gl_info; - caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_FLIP - | WINEDDSCAPS_MIPMAP - | WINEDDSCAPS_TEXTURE - | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_COMPLEX + | WINEDDSCAPS_FRONTBUFFER + | WINEDDSCAPS_3DDEVICE diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c -index 0dc6458070..b316910c9b 100644 +index c3a1832e353..b02d1c84690 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c -@@ -315,6 +315,7 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s +@@ -298,6 +298,7 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s BOOL sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; - caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_FLIP - | WINEDDSCAPS_MIPMAP - | WINEDDSCAPS_TEXTURE - | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_COMPLEX + | WINEDDSCAPS_FRONTBUFFER + | WINEDDSCAPS_3DDEVICE diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c -index 7202a907ab..22479b30e2 100644 +index 4cae64a20e6..6a26fc2a0ae 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c -@@ -2177,7 +2177,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in +@@ -2194,8 +2194,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in + caps->ddraw_caps.ssb_color_key_caps = ckey_caps; + caps->ddraw_caps.ssb_fx_caps = fx_caps; - caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA - | WINEDDSCAPS_BACKBUFFER -- | WINEDDSCAPS_FLIP - | WINEDDSCAPS_FRONTBUFFER - | WINEDDSCAPS_OFFSCREENPLAIN +- caps->ddraw_caps.dds_caps = WINEDDSCAPS_FLIP +- | WINEDDSCAPS_OFFSCREENPLAIN ++ caps->ddraw_caps.dds_caps = WINEDDSCAPS_OFFSCREENPLAIN | WINEDDSCAPS_PALETTE + | WINEDDSCAPS_PRIMARYSURFACE + | WINEDDSCAPS_TEXTURE -- 2.17.1