October 2018 - Wine-Commits

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

Oct. 24, 2018

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 Oct. 24, 2018

Oct. 24, 2018

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 : demos: Check return value of ID3D12Fence_SetEventOnCompletion() (Coverity).
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

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 : vkd3d: Store compiled Vulkan pipelines in d3d12_graphics_pipeline_state.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

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

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

Oct. 24, 2018

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 : vkd3d: Make pipeline state responsible for creating Vulkan pipelines.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

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

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

Oct. 24, 2018

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

Michael Stefaniuc : dswave: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: 82dbf75dc064bb03b5dfc5d8a82b9782a7272ce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82dbf75dc064bb03b5dfc5d8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:35 2018 +0200 dswave: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dswave_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index b02f372..f01e170 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -375,7 +375,7 @@ const char *debugstr_dmguid (const GUID *id) { if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -419,7 +419,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* dump whole DMUS_OBJECTDESC struct */

1 0

Michael Stefaniuc : dmstyle: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: b49cab9a17b2e26d71cb31d7a6047899b2a605d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49cab9a17b2e26d71cb31d7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:32 2018 +0200 dmstyle: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/dmutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index e551410..23cddc0 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -438,7 +438,7 @@ const char *debugstr_dmguid (const GUID *id) { unsigned int i; if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -482,7 +482,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) {

1 0

Michael Stefaniuc : dmloader: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: 47e57c58b6833c535fd387ffdec26448344de369 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47e57c58b6833c535fd387ff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:30 2018 +0200 dmloader: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/debug.c | 10 +++++----- dlls/dmloader/loader.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 9d48776..d072391 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -269,7 +269,7 @@ const char *debugstr_dmguid (const GUID *id) { unsigned int i; if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -416,7 +416,7 @@ const char *debugstr_dmreturn (DWORD code) { }; unsigned int i; - for (i = 0; i < sizeof(codes)/sizeof(codes[0]); i++) { + for (i = 0; i < ARRAY_SIZE(codes); i++) { if (code == codes[i].val) return codes[i].name; } @@ -461,7 +461,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* dump DMUS_CONTAINER flags */ @@ -469,7 +469,7 @@ static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINER_NOLOADS) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* dump DMUS_CONTAINED_OBJF flags */ @@ -477,7 +477,7 @@ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINED_OBJF_KEEP) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* Dump whole DMUS_OBJECTDESC struct */ diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 10a2151..8b979da 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -894,9 +894,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_LoadObjectFromFile(IDirectMusicLoad */ get_search_path(This, rguidClassID, wszLoaderSearchPath); /* search in current directory */ - if (!SearchPathW (NULL, pwzFilePath, NULL, sizeof(ObjDesc.wszFileName)/sizeof(WCHAR), ObjDesc.wszFileName, NULL) && + if (!SearchPathW(NULL, pwzFilePath, NULL, ARRAY_SIZE(ObjDesc.wszFileName), ObjDesc.wszFileName, NULL) && /* search in loader's search path */ - !SearchPathW (wszLoaderSearchPath, pwzFilePath, NULL, sizeof(ObjDesc.wszFileName)/sizeof(WCHAR), ObjDesc.wszFileName, NULL)) { + !SearchPathW(wszLoaderSearchPath, pwzFilePath, NULL, ARRAY_SIZE(ObjDesc.wszFileName), ObjDesc.wszFileName, NULL)) { /* cannot find file */ TRACE(": cannot find file\n"); return DMUS_E_LOADER_FAILEDOPEN;

1 0