wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Francois Gouget : testbot/build: Simplify Build.pl by reusing the patch analyser.
by Alexandre Julliard 29 May '18

29 May '18

Module: tools Branch: master Commit: 6641ea6dea6368169786b3018525abb9f23775fa URL: https://source.winehq.org/git/tools.git/?a=commit;h=6641ea6dea6368169786b30… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 29 00:42:30 2018 +0200 testbot/build: Simplify Build.pl by reusing the patch analyser. Also better identify patches that require rebuilding the native tools. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 41 +++++------------------------------ testbot/lib/WineTestBot/PatchUtils.pm | 31 +++++++++++++++++++++----- 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index c72489c..5e6b370 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -40,6 +40,7 @@ sub BEGIN } use WineTestBot::Config; +use WineTestBot::PatchUtils; sub InfoMsg(@) { @@ -74,39 +75,6 @@ sub ApplyPatch($) { my ($PatchFile) = @_; - my ($NeedMakeMakefiles, $NeedAutoconf, $HasConfigure, $NeedBuildNative); - if (open (FH, "<$PatchFile")) - { - my $Line; - while (defined($Line = <FH>) && - (!$NeedMakeMakefiles || !$NeedAutoconf || !$HasConfigure || - !$NeedBuildNative)) - { - if ($Line =~ m=^diff.*(?:aclocal\.m4|configure\.ac)=) - { - $NeedAutoconf = 1; - } - elsif ($Line =~ m=^diff.*configure=) - { - $HasConfigure = 1; - } - elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || - $Line =~ m=diff.*tools/make_makefiles=) - { - $NeedMakeMakefiles = 1; - } - elsif ($Line =~ m=^diff.*tools/makedep\.c=) - { - $NeedMakeMakefiles = $NeedBuildNative = 1; - } - elsif ($Line =~ m=^diff.*tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)=) - { - $NeedBuildNative = 1; - } - } - close FH; - } - InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . " git apply --verbose $PatchFile && " . @@ -118,7 +86,8 @@ sub ApplyPatch($) return -1; } - if ($NeedMakeMakefiles) + my $Impacts = GetPatchImpact($PatchFile, "nounits"); + if ($Impacts->{Makefiles}) { InfoMsg "Running make_makefiles\n"; system("( cd $DataDir/wine && set -x && " . @@ -131,7 +100,7 @@ sub ApplyPatch($) } } - if ($NeedAutoconf && !$HasConfigure) + if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) { InfoMsg "Running autoconf\n"; system("( cd $DataDir/wine && set -x && " . @@ -144,7 +113,7 @@ sub ApplyPatch($) } } - return $NeedBuildNative; + return $Impacts->{Tools}; } my $ncpus; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 74599ba..8dde61b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -86,8 +86,8 @@ sub _AddTest($$$) }; } - # Assume makefile modifications may break the build but not the tests. - return if ($File eq "Makefile.in"); + # Assume makefile modifications may break the build but not the tests + return if ($File eq "Makefile.in" or $Impacts->{NoUnits}); if (!$Tests->{$Module}->{Files}) { @@ -118,18 +118,37 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($) +sub GetPatchImpact($;$) { - my ($PatchFileName) = @_; + my ($PatchFileName, $NoUnits) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); - my $Impacts = { Tests => {} }; + my $Impacts = { + NoUnits => $NoUnits, + Tests => {}, + }; my ($Path, $Change); while (my $Line = <$fh>) { - if ($Line =~ m=^--- /dev/null$=) + if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) + { + $Impacts->{Autoconf} = 1; + } + elsif ($Line =~ m=^--- \w+/configure$=) + { + $Impacts->{HasConfigure} = 1; + } + elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) + { + $Impacts->{Makefiles} = $Impacts->{Tools} = 1; + } + elsif ($Line =~ m=^--- \w+/tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)$=) + { + $Impacts->{Tools} = 1; + } + elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new"; }

1 0

Hugh McMaster : regedit: Pass NULL instead of the address of an empty WCHAR.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: c7718d31c7887079206f1a9566bb413619008147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7718d31c7887079206f1a95… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 28 13:48:07 2018 +0000 regedit: Pass NULL instead of the address of an empty WCHAR. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 89a5ec0..3e5b9dd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -192,9 +192,8 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, DWORD valueDataLen; LPWSTR buffer = NULL; LONG lRet; - WCHAR empty = 0; - lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, lpType, 0, &valueDataLen); + lRet = RegQueryValueExW(hKey, valueName, NULL, lpType, NULL, &valueDataLen); if (lRet) { if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ if (len) *len = 1; @@ -413,12 +412,11 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) BOOL result = FALSE; LONG lRet; HKEY hKey; - WCHAR empty = 0; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet) return FALSE; - lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); + lRet = RegDeleteValueW(hKey, valueName); if (lRet && valueName) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); }

1 0

Hugh McMaster : regedit: Confirm whether to delete a registry value from framewnd.c.
by Alexandre Julliard 28 May '18

28 May '18

1 0

Józef Kucia : odbccp32: Fix memory leak in SQLGetInstalledDrivers() (Coverity).
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: e034ba1b591a2b843b902055a51da50c4371cea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e034ba1b591a2b843b902055… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:38:42 2018 +0200 odbccp32: Fix memory leak in SQLGetInstalledDrivers() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 862237c..f54674c 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -572,7 +572,10 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) ret = SQLGetInstalledDriversW(wbuf, size, &written); if (!ret) + { + heap_free(wbuf); return FALSE; + } *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL);

1 0

Józef Kucia : dxgi: Add IDXGISwapChain3 interface stub for D3D12.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 7d99d74572072ae60f1a5bf9cf986a01be86cec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d99d74572072ae60f1a5bf9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:27 2018 +0200 dxgi: Add IDXGISwapChain3 interface stub for D3D12. 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> --- dlls/dxgi/dxgi_private.h | 7 +- dlls/dxgi/factory.c | 8 + dlls/dxgi/swapchain.c | 546 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 560 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d99d74572072ae60f1a…

1 0

Józef Kucia : dxgi: Factor out d3d11_swapchain_create () function.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 02c49ea3c03b6403204a099587df0d895e36d7b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c49ea3c03b6403204a0995… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:26 2018 +0200 dxgi: Factor out d3d11_swapchain_create() function. 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> --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 56 ++++-------------------------------------- dlls/dxgi/swapchain.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 51 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 559a834..900906c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -173,6 +173,8 @@ struct d3d11_swapchain IDXGIOutput *target; }; +HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 6986804..5c47c6d 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -250,8 +250,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) { - struct wined3d_swapchain *wined3d_swapchain; - struct wined3d_swapchain_desc wined3d_desc; unsigned int min_buffer_count; IWineDXGIDevice *dxgi_device; HRESULT hr; @@ -275,22 +273,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - min_buffer_count = 1; - break; - case DXGI_SWAP_EFFECT_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; min_buffer_count = 1; break; case DXGI_SWAP_EFFECT_FLIP_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; - min_buffer_count = 2; - break; - case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; min_buffer_count = 2; break; @@ -305,49 +293,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_INVALID_CALL; } - if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) - { - ERR("This is not the device we're looking for\n"); - return hr; - } - - if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) - FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) - FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) - FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); - if (fullscreen_desc && fullscreen_desc->Scaling) - FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); - - wined3d_desc.backbuffer_width = swapchain_desc->Width; - wined3d_desc.backbuffer_height = swapchain_desc->Height; - wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); - wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; - wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); - wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, - &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.device_window = window; - wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; - wined3d_desc.enable_auto_depth_stencil = FALSE; - wined3d_desc.auto_depth_stencil_format = 0; - wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); - wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; - wined3d_desc.auto_restore_display_mode = TRUE; - - hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, FALSE, &wined3d_swapchain); - IWineDXGIDevice_Release(dxgi_device); - if (FAILED(hr)) + if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { - WARN("Failed to create swapchain, hr %#x.\n", hr); + hr = d3d11_swapchain_create(dxgi_device, window, swapchain_desc, fullscreen_desc, swapchain); + IWineDXGIDevice_Release(dxgi_device); return hr; } - wined3d_mutex_lock(); - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - wined3d_mutex_unlock(); - - return S_OK; + ERR("This is not the device we're looking for.\n"); + return DXGI_ERROR_UNSUPPORTED; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForCoreWindow(IWineDXGIFactory *iface, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index c85b742..7401a2e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -733,3 +733,66 @@ cleanup: IWineDXGIDevice_Release(swapchain->device); return hr; } + +HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) +{ + struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_desc wined3d_desc; + HRESULT hr; + + if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); + if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); + + switch (swapchain_desc->SwapEffect) + { + case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; + break; + case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + break; + default: + WARN("Invalid swap effect %#x.\n", swapchain_desc->SwapEffect); + return DXGI_ERROR_INVALID_CALL; + } + + wined3d_desc.backbuffer_width = swapchain_desc->Width; + wined3d_desc.backbuffer_height = swapchain_desc->Height; + wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); + wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; + wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); + wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, + &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); + wined3d_desc.device_window = window; + wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; + wined3d_desc.enable_auto_depth_stencil = FALSE; + wined3d_desc.auto_depth_stencil_format = 0; + wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); + wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; + wined3d_desc.auto_restore_display_mode = TRUE; + + if (FAILED(hr = IWineDXGIDevice_create_swapchain(device, &wined3d_desc, FALSE, &wined3d_swapchain))) + { + WARN("Failed to create swapchain, hr %#x.\n", hr); + return hr; + } + + wined3d_mutex_lock(); + *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + wined3d_mutex_unlock(); + + return S_OK; +}

1 0

Józef Kucia : dxgi: Rename dxgi_swapchain to d3d11_swapchain.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: eae33d5595ad525b335aa5cb5229b0a8ae854bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae33d5595ad525b335aa5cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 14:40:25 2018 +0200 dxgi: Rename dxgi_swapchain to d3d11_swapchain. We will have more than one implementation of IDXGISwapChain. 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> --- dlls/dxgi/device.c | 8 +- dlls/dxgi/dxgi_private.h | 4 +- dlls/dxgi/swapchain.c | 186 +++++++++++++++++++++++------------------------ 3 files changed, 99 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eae33d5595ad525b335a…

1 0

Józef Kucia : d3d10core/tests: Check return value of CheckMultisampleQualityLevels() (Coverity).
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 47dea5ba8fad532580cb47f93f4dc2510a01c5df URL: https://source.winehq.org/git/wine.git/?a=commit;h=47dea5ba8fad532580cb47f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:19 2018 +0200 d3d10core/tests: Check return value of CheckMultisampleQualityLevels() (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> --- dlls/d3d10core/tests/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 99a375e..2687ec5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1844,7 +1844,8 @@ static void test_create_texture2d(void) check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); ID3D10Texture2D_Release(texture); - ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); desc.ArraySize = 1; desc.SampleDesc.Count = 2; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); @@ -9578,7 +9579,8 @@ static void test_check_multisample_quality_levels(void) return; } - ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); if (!quality_levels) { skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping test.\n");

1 0

Józef Kucia : d3d11/tests: Check return value of CheckMultisampleQualityLevels() (Coverity).
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: f2c9e04c49d4fafa78a9994d50bb4b15d47ccaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c9e04c49d4fafa78a9994d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:18 2018 +0200 d3d11/tests: Check return value of CheckMultisampleQualityLevels() (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> --- dlls/d3d11/tests/d3d11.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index aa48365..1043722 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2381,7 +2381,8 @@ static void test_create_texture2d(void) check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); ID3D11Texture2D_Release(texture); - ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); desc.ArraySize = 1; desc.SampleDesc.Count = 2; hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); @@ -12298,7 +12299,8 @@ static void test_check_multisample_quality_levels(void) return; } - ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); if (!quality_levels) { skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping test.\n");

1 0

Józef Kucia : d3d11/tests: Add test for clearing 3D render target views.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: faec0676074aa8dd7791f329116155f63c2af516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faec0676074aa8dd7791f329… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 28 11:33:17 2018 +0200 d3d11/tests: Add test for clearing 3D render target views. 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> --- dlls/d3d11/tests/d3d11.c | 315 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 223 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=faec0676074aa8dd7791…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018