From c50463197f9d268b268baaf341885314d3723bb5 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 31 Aug 2017 23:11:13 +0200 Subject: [PATCH] Rebase against e06b7693d6f0980b1db2fa3b9920c7a925ceb8be. --- ...-Fix-length-parameter-for-ZeroMemory.patch | 25 ---------- ...s-Avoid-compiler-warnings-with-GCC-7.patch | 34 -------------- ...2-Avoid-compiler-warnings-with-GCC-7.patch | 46 ------------------- ...are-test_texture-for-non-2d-textures.patch | 32 ++++++------- .../0001-ntdll-Add-dummy-apiset-to-PEB.patch | 20 ++++---- ...ll-Fill-process-kernel-and-user-time.patch | 26 +++++------ patches/patchinstall.sh | 15 ++---- ...ined3d-Remaining-UAV-counter-changes.patch | 19 ++------ 8 files changed, 48 insertions(+), 169 deletions(-) delete mode 100644 patches/Compiler_Warnings/0004-fusion-Fix-length-parameter-for-ZeroMemory.patch delete mode 100644 patches/Compiler_Warnings/0005-fusion-tests-Avoid-compiler-warnings-with-GCC-7.patch delete mode 100644 patches/Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch diff --git a/patches/Compiler_Warnings/0004-fusion-Fix-length-parameter-for-ZeroMemory.patch b/patches/Compiler_Warnings/0004-fusion-Fix-length-parameter-for-ZeroMemory.patch deleted file mode 100644 index 9f4f5156..00000000 --- a/patches/Compiler_Warnings/0004-fusion-Fix-length-parameter-for-ZeroMemory.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2b5e9f330770221eee2eda2aab251eba8d370a60 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 4 Jun 2017 13:17:54 +0200 -Subject: fusion: Fix length parameter for ZeroMemory. - ---- - dlls/fusion/tests/asmname.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c -index 5fb14a48291..21cd4874edc 100644 ---- a/dlls/fusion/tests/asmname.c -+++ b/dlls/fusion/tests/asmname.c -@@ -358,7 +358,7 @@ static void test_assembly_name_props_line(IAssemblyName *name, - to_widechar(expect, vals[i].val); - - size = MAX_PATH; -- ZeroMemory(str, MAX_PATH); -+ ZeroMemory(str, sizeof(str)); - hr = IAssemblyName_GetProperty(name, i, str, &size); - to_multibyte(val, str); - --- -2.13.0 - diff --git a/patches/Compiler_Warnings/0005-fusion-tests-Avoid-compiler-warnings-with-GCC-7.patch b/patches/Compiler_Warnings/0005-fusion-tests-Avoid-compiler-warnings-with-GCC-7.patch deleted file mode 100644 index 0ef9b22a..00000000 --- a/patches/Compiler_Warnings/0005-fusion-tests-Avoid-compiler-warnings-with-GCC-7.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3e59710a3091a4a61b7cce00606ed23b7b66dfda Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 4 Jun 2017 12:55:31 +0200 -Subject: fusion/tests: Avoid compiler warnings with GCC 7. - ---- - dlls/fusion/tests/asmenum.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c -index 1dc34a286e5..8b95f2a6bd5 100644 ---- a/dlls/fusion/tests/asmenum.c -+++ b/dlls/fusion/tests/asmenum.c -@@ -223,7 +223,7 @@ typedef struct _tagASMNAME - static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path) - { - WIN32_FIND_DATAA ffd; -- CHAR buf[MAX_PATH]; -+ CHAR buf[MAX_PATH + 37]; - CHAR disp[MAX_PATH]; - ASMNAME *name; - HANDLE hfind; -@@ -248,7 +248,7 @@ static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path) - else if (depth == 1) - { - char culture[MAX_PATH]; -- char dll[MAX_PATH], exe[MAX_PATH]; -+ char dll[MAX_PATH + 6], exe[MAX_PATH + 6]; - - /* Directories with no dll or exe will not be enumerated */ - sprintf(dll, "%s\\%s\\%s.dll", path, ffd.cFileName, parent); --- -2.13.0 - diff --git a/patches/Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch b/patches/Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch deleted file mode 100644 index 0b5f6b31..00000000 --- a/patches/Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 67ed53ca67214d7dbdea7f342b9f2ff0356a220b Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 4 Jun 2017 12:59:10 +0200 -Subject: kernel32: Avoid compiler warnings with GCC 7. - ---- - dlls/kernel32/oldconfig.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c -index 6c80dc614f0..3e628757283 100644 ---- a/dlls/kernel32/oldconfig.c -+++ b/dlls/kernel32/oldconfig.c -@@ -290,7 +290,8 @@ static void create_hardware_branch(void) - { - if (strncmp(dent->d_name, "hd", 2) == 0) - { -- sprintf(cStr, procname_ide_media, dent->d_name); -+ result = snprintf(cStr, sizeof(cStr), procname_ide_media, dent->d_name); -+ if (result < 0 || result >= sizeof(cStr)) continue; - procfile = fopen(cStr, "r"); - if (!procfile) - { -@@ -306,7 +307,8 @@ static void create_hardware_branch(void) - if (nType == DRIVE_UNKNOWN) continue; - } - -- sprintf(cStr, procname_ide_model, dent->d_name); -+ result = snprintf(cStr, sizeof(cStr), procname_ide_model, dent->d_name); -+ if (result < 0 || result >= sizeof(cStr)) continue; - procfile = fopen(cStr, "r"); - if (!procfile) - { -@@ -322,7 +324,8 @@ static void create_hardware_branch(void) - cDevModel[strlen(cDevModel) - 1] = 0; - } - -- sprintf(cUnixDeviceName, "/dev/%s", dent->d_name); -+ result = snprintf(cUnixDeviceName, sizeof(cUnixDeviceName), "/dev/%s", dent->d_name); -+ if (result < 0 || result >= sizeof(cUnixDeviceName)) continue; - scsi_addr.PortNumber = (dent->d_name[2] - 'a') / 2; - scsi_addr.PathId = 0; - scsi_addr.TargetId = (dent->d_name[2] - 'a') % 2; --- -2.13.0 - diff --git a/patches/d3d11-ID3D11Texture1D/0019-d3d11-tests-Prepare-test_texture-for-non-2d-textures.patch b/patches/d3d11-ID3D11Texture1D/0019-d3d11-tests-Prepare-test_texture-for-non-2d-textures.patch index a88c0297..0e5653ce 100644 --- a/patches/d3d11-ID3D11Texture1D/0019-d3d11-tests-Prepare-test_texture-for-non-2d-textures.patch +++ b/patches/d3d11-ID3D11Texture1D/0019-d3d11-tests-Prepare-test_texture-for-non-2d-textures.patch @@ -1,4 +1,4 @@ -From 40d6f33a858061a8449c6b90a795efe926a119bb Mon Sep 17 00:00:00 2001 +From 493acad9e14688b4acb817ac1daa59b2f21ef809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 25 Aug 2016 20:06:28 +0200 Subject: d3d11/tests: Prepare test_texture for non 2d textures. @@ -8,10 +8,10 @@ Subject: d3d11/tests: Prepare test_texture for non 2d textures. 1 file changed, 87 insertions(+), 53 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index 6013ae94323..d5d41721bce 100644 +index a9d03322283..daf5dbdbd55 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c -@@ -6213,6 +6213,7 @@ static void test_texture(void) +@@ -6245,6 +6245,7 @@ static void test_texture(void) }; struct texture { @@ -19,7 +19,7 @@ index 6013ae94323..d5d41721bce 100644 UINT width; UINT height; UINT miplevel_count; -@@ -6224,7 +6225,7 @@ static void test_texture(void) +@@ -6256,7 +6257,7 @@ static void test_texture(void) D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; struct d3d11_test_context test_context; const struct texture *current_texture; @@ -28,7 +28,7 @@ index 6013ae94323..d5d41721bce 100644 D3D11_SAMPLER_DESC sampler_desc; const struct shader *current_ps; D3D_FEATURE_LEVEL feature_level; -@@ -6232,7 +6233,7 @@ static void test_texture(void) +@@ -6264,7 +6265,7 @@ static void test_texture(void) ID3D11DeviceContext *context; ID3D11SamplerState *sampler; struct resource_readback rb; @@ -37,7 +37,7 @@ index 6013ae94323..d5d41721bce 100644 struct vec4 ps_constant; ID3D11PixelShader *ps; ID3D11Device *device; -@@ -6593,6 +6594,7 @@ static void test_texture(void) +@@ -6625,6 +6626,7 @@ static void test_texture(void) }; static const struct texture rgba_texture = { @@ -45,7 +45,7 @@ index 6013ae94323..d5d41721bce 100644 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, { {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, -@@ -6600,33 +6602,51 @@ static void test_texture(void) +@@ -6632,33 +6634,51 @@ static void test_texture(void) {rgba_level_2, sizeof(*rgba_level_2), 0}, } }; @@ -120,7 +120,7 @@ index 6013ae94323..d5d41721bce 100644 4, 4, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM, { {red_data, 6 * sizeof(*red_data)}, -@@ -6634,11 +6654,14 @@ static void test_texture(void) +@@ -6666,11 +6686,14 @@ static void test_texture(void) {blue_data, 5 * sizeof(*blue_data)}, } }; @@ -138,7 +138,7 @@ index 6013ae94323..d5d41721bce 100644 {{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}}; static const DWORD red_colors[] = { -@@ -6936,12 +6959,12 @@ static void test_texture(void) +@@ -6968,12 +6991,12 @@ static void test_texture(void) ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); @@ -157,7 +157,7 @@ index 6013ae94323..d5d41721bce 100644 sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; -@@ -6999,7 +7022,7 @@ static void test_texture(void) +@@ -7031,7 +7054,7 @@ static void test_texture(void) if (current_texture != test->texture) { if (texture) @@ -166,7 +166,7 @@ index 6013ae94323..d5d41721bce 100644 if (srv) ID3D11ShaderResourceView_Release(srv); -@@ -7007,16 +7030,23 @@ static void test_texture(void) +@@ -7039,16 +7062,23 @@ static void test_texture(void) if (current_texture) { @@ -198,7 +198,7 @@ index 6013ae94323..d5d41721bce 100644 ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); } else -@@ -7070,7 +7100,7 @@ static void test_texture(void) +@@ -7102,7 +7132,7 @@ static void test_texture(void) ID3D11ShaderResourceView_Release(srv); ID3D11SamplerState_Release(sampler); if (texture) @@ -206,8 +206,8 @@ index 6013ae94323..d5d41721bce 100644 + ID3D11Resource_Release(texture); ID3D11PixelShader_Release(ps); - if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_10_1) -@@ -7115,26 +7145,30 @@ static void test_texture(void) + if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_11_0) +@@ -7147,26 +7177,30 @@ static void test_texture(void) if (current_texture != test->texture) { @@ -246,7 +246,7 @@ index 6013ae94323..d5d41721bce 100644 ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); -@@ -7159,7 +7193,7 @@ static void test_texture(void) +@@ -7191,7 +7225,7 @@ static void test_texture(void) release_resource_readback(&rb); } ID3D11PixelShader_Release(ps); @@ -256,5 +256,5 @@ index 6013ae94323..d5d41721bce 100644 ID3D11SamplerState_Release(sampler); -- -2.12.2 +2.14.1 diff --git a/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch b/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch index 63a57717..cf32d278 100644 --- a/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch +++ b/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch @@ -1,4 +1,4 @@ -From 4f48082aac2ff759f0806371acbec167b95df13a Mon Sep 17 00:00:00 2001 +From b97e38f96a743c0aa44572ae8dbc477375e0d64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 3 Apr 2017 01:06:26 +0200 Subject: ntdll: Add dummy apiset to PEB. @@ -12,7 +12,7 @@ Subject: ntdll: Add dummy apiset to PEB. create mode 100644 include/apiset.h diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index ccbc41d6ac..ab23ec127a 100644 +index 08318ebeeb4..88d315f1e9c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -69,6 +69,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH]; @@ -22,20 +22,20 @@ index ccbc41d6ac..ab23ec127a 100644 +static API_SET_NAMESPACE_ARRAY apiset_map; static int nb_threads = 1; + static RTL_CRITICAL_SECTION peb_lock; +@@ -388,6 +389,7 @@ HANDLE thread_init(void) -@@ -352,6 +353,7 @@ HANDLE thread_init(void) - peb = addr; - + peb->FastPebLock = &peb_lock; peb->ProcessParameters = ¶ms; + peb->ApiSetMap = &apiset_map; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->FlsBitmap = &fls_bitmap; diff --git a/include/Makefile.in b/include/Makefile.in -index 5065815c6d..c663902804 100644 +index fcdd8b323ce..7e005f6bb1e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -201,6 +201,7 @@ HEADER_SRCS = \ +@@ -208,6 +208,7 @@ HEADER_SRCS = \ advpub.h \ af_irda.h \ amaudio.h \ @@ -45,7 +45,7 @@ index 5065815c6d..c663902804 100644 atlbase.h \ diff --git a/include/apiset.h b/include/apiset.h new file mode 100644 -index 0000000000..5f911717ee +index 00000000000..5f911717eea --- /dev/null +++ b/include/apiset.h @@ -0,0 +1,33 @@ @@ -83,7 +83,7 @@ index 0000000000..5f911717ee + API_SET_NAMESPACE_ENTRY Array[1]; +} API_SET_NAMESPACE_ARRAY, *PAPI_SET_NAMESPACE_ARRAY; diff --git a/include/winternl.h b/include/winternl.h -index dbef76921c..d6f47ad3ba 100644 +index df20da58c3c..f3f9b047e50 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -23,6 +23,7 @@ @@ -104,5 +104,5 @@ index dbef76921c..d6f47ad3ba 100644 PRTL_BITMAP TlsBitmap; /* 040/078 */ ULONG TlsBitmapBits[2]; /* 044/080 */ -- -2.11.0 +2.14.1 diff --git a/patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch b/patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch index d833fd0c..1294807f 100644 --- a/patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch +++ b/patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch @@ -1,4 +1,4 @@ -From 2578dfb02f0a8781970f5c7d967b1d07ae433e2f Mon Sep 17 00:00:00 2001 +From 3868624c41bc318ee89c5c5183d3ca9ef483f6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 9 Mar 2017 16:27:23 +0100 Subject: ntdll: Fill process kernel and user time. @@ -10,10 +10,10 @@ Subject: ntdll: Fill process kernel and user time. 3 files changed, 56 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c -index fc8e3b1eb4..6b67397471 100644 +index fbd0fdf51a9..cac95325541 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c -@@ -1922,6 +1922,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( +@@ -1927,6 +1927,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_PROCESS_INFORMATION* spi = SystemInformation; SYSTEM_PROCESS_INFORMATION* last = NULL; @@ -21,7 +21,7 @@ index fc8e3b1eb4..6b67397471 100644 HANDLE hSnap = 0; WCHAR procname[1024]; WCHAR* exename; -@@ -1959,7 +1960,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( +@@ -1964,7 +1965,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (Length >= len + procstructlen) { @@ -30,7 +30,7 @@ index fc8e3b1eb4..6b67397471 100644 * vmCounters, ioCounters */ -@@ -1977,6 +1978,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( +@@ -1982,6 +1983,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( /* spi->ti will be set later on */ @@ -41,10 +41,10 @@ index fc8e3b1eb4..6b67397471 100644 len += procstructlen; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 5e4c39e8bd..443c86000d 100644 +index c97b1e1f73f..260e7030dae 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -266,4 +266,7 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN; +@@ -245,4 +245,7 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN; NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); @@ -53,12 +53,12 @@ index 5e4c39e8bd..443c86000d 100644 + LARGE_INTEGER *kernel, LARGE_INTEGER *user) DECLSPEC_HIDDEN; #endif diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index 91a59517b3..29b6513f38 100644 +index 00d03f103ce..1c6cab3aa28 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c -@@ -71,6 +71,53 @@ static RTL_BITMAP tls_expansion_bitmap; - static RTL_BITMAP fls_bitmap; - static int nb_threads = 1; +@@ -80,6 +80,53 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = + }; + static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 }; + +BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck, @@ -110,7 +110,7 @@ index 91a59517b3..29b6513f38 100644 /*********************************************************************** * get_unicode_string * -@@ -1009,42 +1056,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, +@@ -989,42 +1036,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, #ifdef __linux__ /* only /proc provides exact values for a specific thread */ if (unix_pid != -1 && unix_tid != -1) @@ -155,5 +155,5 @@ index 91a59517b3..29b6513f38 100644 /* get values for current process instead */ -- -2.11.0 +2.14.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 57ddfa4e..e4f8e935 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "844b57e4d800bfb260c1694ed54a02b9f5ad1f47" + echo "e06b7693d6f0980b1db2fa3b9920c7a925ceb8be" } # Show version information @@ -2927,16 +2927,12 @@ fi # | Modified files: # | * dlls/amstream/mediastreamfilter.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, dlls/d3d8/texture.c, # | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/font.c, -# | dlls/dwrite/layout.c, dlls/fusion/tests/asmenum.c, dlls/fusion/tests/asmname.c, dlls/kernel32/oldconfig.c, -# | dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/ole32/storage32.h, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, -# | dlls/vbscript/vbdisp.c, dlls/wined3d/glsl_shader.c, dlls/ws2_32/tests/sock.c, dlls/wsdapi/msgparams.c, -# | include/wine/list.h, include/wine/rbtree.h, include/winnt.h, tools/makedep.c +# | dlls/dwrite/layout.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/ole32/storage32.h, dlls/oleaut32/oleaut.c, +# | dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, dlls/wined3d/glsl_shader.c, dlls/ws2_32/tests/sock.c, +# | dlls/wsdapi/msgparams.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h, tools/makedep.c # | if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch - patch_apply Compiler_Warnings/0004-fusion-Fix-length-parameter-for-ZeroMemory.patch - patch_apply Compiler_Warnings/0005-fusion-tests-Avoid-compiler-warnings-with-GCC-7.patch - patch_apply Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch patch_apply Compiler_Warnings/0009-ws2_32-tests-Work-around-an-incorrect-detection-in-G.patch patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch patch_apply Compiler_Warnings/0019-dsound-Avoid-implicit-cast-of-interface-pointer.patch @@ -2955,9 +2951,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0032-wsdapi-Avoid-implicit-cast-of-interface-pointer.patch ( printf '%s\n' '+ { "Sebastian Lackner", "ole32: Fix compilation with recent versions of gcc.", 1 },'; - printf '%s\n' '+ { "Sebastian Lackner", "fusion: Fix length parameter for ZeroMemory.", 1 },'; - printf '%s\n' '+ { "Sebastian Lackner", "fusion/tests: Avoid compiler warnings with GCC 7.", 1 },'; - printf '%s\n' '+ { "Sebastian Lackner", "kernel32: Avoid compiler warnings with GCC 7.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "ws2_32/tests: Work around an incorrect detection in GCC 7.", 1 },'; printf '%s\n' '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "dsound: Avoid implicit cast of interface pointer.", 1 },'; diff --git a/patches/wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch b/patches/wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch index 4e80cbf3..9327453f 100644 --- a/patches/wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch +++ b/patches/wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch @@ -1,4 +1,4 @@ -From 851cedf6dc2daff577d1f301878be82a6e5e17ce Mon Sep 17 00:00:00 2001 +From 13401363be8ff9e23972450a115b212ce3059b07 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 9 Aug 2017 06:32:43 +0200 Subject: wined3d: Remaining UAV counter changes. @@ -9,9 +9,9 @@ Content-Transfer-Encoding: 8bit Based on patches by Michael Müller and Józef Kucia. --- dlls/d3d11/device.c | 3 +++ - dlls/wined3d/cs.c | 4 +++- + dlls/wined3d/cs.c | 2 ++ dlls/wined3d/device.c | 6 ++++++ - 3 files changed, 12 insertions(+), 1 deletion(-) + 3 files changed, 11 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ced9a13a8ae..2ccd71d5111 100644 @@ -28,18 +28,9 @@ index ced9a13a8ae..2ccd71d5111 100644 uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c -index 8961dfe1467..1a9a508fc21 100644 +index 6ea2fd27a7c..fcceccb6425 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c -@@ -1319,7 +1319,7 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con - - device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline)); - -- if (op->initial_count != ~0u) -+ if (op->view && op->initial_count != ~0u) - wined3d_unordered_access_view_set_counter(op->view, op->initial_count); - } - @@ -2276,6 +2276,7 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void * context_release(context); @@ -74,5 +65,5 @@ index 31955badb10..1822ee1ef37 100644 } -- -2.13.1 +2.14.1