October 2018 - Wine-commits

Józef Kucia : vkd3d-shader: Fix typo in vkd3d_dxbc_compiler_have_combined_sampler().
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: vkd3d Branch: master Commit: 049d21ad7a6fa059678d48b3945c6a186016cb7e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=049d21ad7a6fa059678d48b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 24 13:16:24 2018 +0200 vkd3d-shader: Fix typo in vkd3d_dxbc_compiler_have_combined_sampler(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0813f49..f6e5746 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2043,7 +2043,7 @@ static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_co { combined_sampler = &shader_interface->combined_samplers[i]; - if (!(resource || combined_sampler->resource_index == resource->idx[0].offset) + if ((!resource || combined_sampler->resource_index == resource->idx[0].offset) && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) return true; }

1 0

Józef Kucia : demos: Check return value of ID3D12Fence_SetEventOnCompletion() (Coverity).
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: vkd3d Branch: master Commit: a96cfa32a1e11a7fc39dbb09cd3da6c7a7fd50a0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a96cfa32a1e11a7fc39dbb0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 24 13:16:25 2018 +0200 demos: Check return value of ID3D12Fence_SetEventOnCompletion() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/gears.c | 3 ++- demos/triangle.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/demos/gears.c b/demos/gears.c index f7b8cad..72916dc 100644 --- a/demos/gears.c +++ b/demos/gears.c @@ -218,7 +218,8 @@ static void cxg_wait_for_previous_frame(struct cx_gears *cxg) if (ID3D12Fence_GetCompletedValue(fence->fence) < v) { - ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event); + hr = ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event); + assert(SUCCEEDED(hr)); demo_wait_event(fence->event, INFINITE); } diff --git a/demos/triangle.c b/demos/triangle.c index 15f348f..96ad837 100644 --- a/demos/triangle.c +++ b/demos/triangle.c @@ -142,7 +142,8 @@ static void cxt_wait_for_previous_frame(struct cx_triangle *cxt) if (ID3D12Fence_GetCompletedValue(fence->fence) < v) { - ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event); + hr = ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event); + assert(SUCCEEDED(hr)); demo_wait_event(fence->event, INFINITE); }

1 0

Józef Kucia : tests: Annotate fall-through switch case (Coverity).
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: vkd3d Branch: master Commit: 12707ff160b996d0b7eb440db578884e93ff74ce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12707ff160b996d0b7eb440… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 24 13:16:26 2018 +0200 tests: Annotate fall-through switch case (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a63e122..15cd282 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14534,6 +14534,7 @@ static void test_typed_uav_store(void) { default: trace("Unhandled format %#x.\n", tests[i].format); + /* fall-through */ case DXGI_FORMAT_R32_FLOAT: check_sub_resource_float(resource, 0, queue, command_list, tests[i].result.f, 2); break;

1 0

Józef Kucia : tests: Add option to select adapter.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: vkd3d Branch: master Commit: fb7b1c98804c96f9e0154f6eb51c7cdf5355c5b7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fb7b1c98804c96f9e0154f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 24 13:16:27 2018 +0200 tests: Add option to select adapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 15cd282..f5104a5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -826,47 +826,68 @@ static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture, got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); } +static bool use_warp_device; +static unsigned int use_adapter_idx; + #ifdef _WIN32 -static IUnknown *create_warp_adapter(void) +static IUnknown *create_warp_adapter(IDXGIFactory4 *factory) { - IDXGIFactory4 *factory; IUnknown *adapter; HRESULT hr; - hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to create IDXGIFactory4, hr %#x.\n", hr); - adapter = NULL; hr = IDXGIFactory4_EnumWarpAdapter(factory, &IID_IUnknown, (void **)&adapter); - IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get WARP adapter, hr %#x.\n", hr); return adapter; } + +static IUnknown *create_adapter(void) +{ + IUnknown *adapter = NULL; + IDXGIFactory4 *factory; + HRESULT hr; + + hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); + + if (use_warp_device && !(adapter = create_warp_adapter(factory))) + { + IDXGIFactory4_Release(factory); + return adapter; + } + + if (use_adapter_idx) + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + IDXGIFactory4_Release(factory); + if (FAILED(hr)) + trace("Failed to get adapter, hr %#x.\n", hr); + return adapter; +} #else -static IUnknown *create_warp_adapter(void) +static IUnknown *create_adapter(void) { return NULL; } #endif -static bool use_warp_device; - static ID3D12Device *create_device(void) { IUnknown *adapter = NULL; ID3D12Device *device; + HRESULT hr; - if (use_warp_device && !(adapter = create_warp_adapter())) + if ((use_warp_device || use_adapter_idx) && !(adapter = create_adapter())) { - trace("Failed to create WARP device.\n"); + trace("Failed to create adapter.\n"); return NULL; } - if (FAILED(D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) - return NULL; + hr = D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (adapter) + IUnknown_Release(adapter); - return device; + return SUCCEEDED(hr) ? device : NULL; } static bool broken_on_warp(bool condition) @@ -20596,6 +20617,8 @@ START_TEST(d3d12) enable_debug_layer = true; else if (!strcmp(argv[i], "--warp")) use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); } if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug)))

1 0

Józef Kucia : vkd3d: Make pipeline state responsible for creating Vulkan pipelines.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: vkd3d Branch: master Commit: cfef9066965d924be8b380b994a406dfb2bdcaa5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cfef9066965d924be8b380b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 24 13:16:28 2018 +0200 vkd3d: Make pipeline state responsible for creating Vulkan pipelines. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 149 ++------------------------------------------- libs/vkd3d/state.c | 148 +++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 7 +++ 3 files changed, 157 insertions(+), 147 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cfef9066965d924be8b…

1 0

Józef Kucia : vkd3d: Store compiled Vulkan pipelines in d3d12_graphics_pipeline_state.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: vkd3d Branch: master Commit: 8f07e147113b27b5c5144cd6533be0aef554a51b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8f07e147113b27b5c5144cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 24 13:16:29 2018 +0200 vkd3d: Store compiled Vulkan pipelines in d3d12_graphics_pipeline_state. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 116 ------------------------------------------ libs/vkd3d/state.c | 122 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 21 -------- 3 files changed, 105 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8f07e147113b27b5c51…

1 0

Francois Gouget : testbot/build: Remove the build-xxx -> wine-xxx transition code.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: tools Branch: master Commit: 6e1b1dae85b70f383fd224fedf74187152386839 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6e1b1dae85b70f383fd224f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 24 01:45:10 2018 +0200 testbot/build: Remove the build-xxx -> wine-xxx transition code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 16 ---------------- testbot/bin/build/WineReconfig.pl | 8 -------- 2 files changed, 24 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 8e50e2f..b720788 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -53,14 +53,6 @@ sub BuildNative($) { my ($NoRm) = @_; - # FIXME Temporary code to ensure compatibility during the transition - my $OldDir = "build-native"; - if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-native") - { - rename("$DataDir/$OldDir", "$DataDir/wine-native"); - # Add a symlink from compatibility with older server-side TestBot scripts - symlink("wine-native", "$DataDir/$OldDir"); - } mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); # Rebuild from scratch to make sure cruft will not accumulate @@ -85,14 +77,6 @@ sub BuildCross($$$) my ($TaskMissions, $NoRm, $Build) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); - # FIXME Temporary code to ensure compatibility during the transition - my $OldDir = $Build eq "exe32" ? "build-mingw32" : "build-mingw64"; - if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") - { - rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); - # Add a symlink from compatibility with older server-side TestBot scripts - symlink("wine-$Build", "$DataDir/$OldDir"); - } mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # Rebuild from scratch to make sure cruft will not accumulate diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 74fe4ea..f46408b 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,14 +54,6 @@ sub BuildWine($$$$) my ($TaskMissions, $NoRm, $Build, $Extras) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); - # FIXME Temporary code to ensure compatibility during the transition - my $OldDir = "build-$Build"; - if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") - { - rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); - # Add a symlink from compatibility with older server-side TestBot scripts - symlink("wine-$Build", "$DataDir/$OldDir"); - } mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not

1 0

Francois Gouget : crypt32/tests: Avoid an unneeded strlen() call.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 4f36c83fa3973ee2c4ee88cfc175ae66b98b810f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f36c83fa3973ee2c4ee88cf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:46:14 2018 +0200 crypt32/tests: Avoid an unneeded strlen() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 2da2a87..cea9481 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1017,7 +1017,7 @@ static void compareNameValues(const CERT_NAME_VALUE *expected, static void compareRDNAttrs(const CERT_RDN_ATTR *expected, const CERT_RDN_ATTR *got) { - if (expected->pszObjId && strlen(expected->pszObjId)) + if (expected->pszObjId && *expected->pszObjId) { ok(got->pszObjId != NULL, "Expected OID %s, got NULL\n", expected->pszObjId);

1 0

Francois Gouget : winebus.sys: Avoid an unneeded strlen() call.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: a0536cab0326da35713e43859fc9631bf6fc8122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0536cab0326da35713e4385… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:51:32 2018 +0200 winebus.sys: Avoid an unneeded strlen() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dabda6a..64b245e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1084,7 +1084,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, else if (strcmp(key, "HID_UNIQ") == 0) { /* The caller has to free the serial number */ - if (strlen(value)) + if (*value) { *serial_number = (WCHAR*)strdupAtoW(value); found_serial = 1;

1 0

Francois Gouget : winemenubuilder: Avoid unneeded lstrlenA() calls.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: f18d35753a0b6f5df702b177fd2fa56eb1fb7e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f18d35753a0b6f5df702b177… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:54:15 2018 +0200 winemenubuilder: Avoid unneeded lstrlenA() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9adfed6..26710e9 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1468,13 +1468,13 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con wine_get_config_dir(), path, args); fprintf(file, "Type=Application\n"); fprintf(file, "StartupNotify=true\n"); - if (descr && lstrlenA(descr)) + if (descr && *descr) fprintf(file, "Comment=%s\n", descr); - if (workdir && lstrlenA(workdir)) + if (workdir && *workdir) fprintf(file, "Path=%s\n", workdir); - if (icon && lstrlenA(icon)) + if (icon && *icon) fprintf(file, "Icon=%s\n", icon); - if (wmclass && lstrlenA(wmclass)) + if (wmclass && *wmclass) fprintf(file, "StartupWMClass=%s\n", wmclass); fclose(file);

1 0