January 2016 - Wine-devel - list.winehq.org

Re: [PATCH 2/6] d3d11: Implement d3d10_device_CheckMultisampleQualityLevels().
by Józef Kucia 29 Jan '16

29 Jan '16

On Fri, Jan 29, 2016 at 12:51 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/d3d10core/tests/device.c | 5 ++--- > dlls/d3d11/device.c | 33 +++++++++++++++++++++++++++++++-- > 2 files changed, 33 insertions(+), 5 deletions(-) > > diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c > index 92ae1cf..d267471 100644 > --- a/dlls/d3d10core/tests/device.c > +++ b/dlls/d3d10core/tests/device.c > @@ -5002,7 +5002,7 @@ static void test_multisample_init(void) > } > > hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); > - todo_wine ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); > + ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); > if (!count) > { > skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); > @@ -5032,7 +5032,6 @@ static void test_multisample_init(void) > hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &multi); > ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > > - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)backbuffer, 0, > (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); > > @@ -5052,7 +5051,7 @@ static void test_multisample_init(void) > break; > } > release_texture_readback(&rb); > - ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); > + todo_wine ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); > > ID3D10RenderTargetView_Release(rtview); > ID3D10Texture2D_Release(backbuffer); > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c > index 785e537..e7d2521 100644 > --- a/dlls/d3d11/device.c > +++ b/dlls/d3d11/device.c > @@ -4501,10 +4501,39 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckFormatSupport(ID3D10Device1 * > static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D10Device1 *iface, > DXGI_FORMAT format, UINT sample_count, UINT *quality_level_count) > { > - FIXME("iface %p, format %s, sample_count %u, quality_level_count %p stub!\n", > + struct d3d_device *device = impl_from_ID3D10Device(iface); > + HRESULT hr; > + > + TRACE("iface %p, format %s, sample_count %u, quality_level_count %p.\n", > iface, debug_dxgi_format(format), sample_count, quality_level_count); > > - return E_NOTIMPL; > + if (!quality_level_count) > + return E_INVALIDARG; > + > + *quality_level_count = 0; > + > + if (!sample_count) > + return E_FAIL; > + if (sample_count == 1) > + { > + *quality_level_count = 1; > + return S_OK; > + } > + if (sample_count > 32) > + return E_FAIL; > + > + if (sample_count > 16) > + { > + FIXME("sample_count %u not handled yet.\n", sample_count); > + return S_OK; > + } > + hr = wined3d_device_check_multisample_quality_levels(device->wined3d_device, > + wined3dformat_from_dxgi_format(format), sample_count, quality_level_count); > + if (hr == WINED3DERR_INVALIDCALL) > + return E_INVALIDARG; > + if (hr == WINED3DERR_NOTAVAILABLE) > + return S_OK; > + return hr; > } I think you could simply call d3d11_device_CheckFormatSupport() from d3d10_device_CheckFormatSupport(). We do it that way for some ID3D10Device methods, e.g. d3d10_device_CreateBlendState1().

1 0

Re: [PATCH] user32/tests: Add some expected WPARAM values to the SetFocusComboBox sequences
by Marvin 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20077 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

2 1

Re: [PATCH 4/7] ddraw/tests: Add tests for invalid render states.
by Henri Verbeet 29 Jan '16

29 Jan '16

On 28 January 2016 at 00:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > Tested on Windows 7 and 10. > > A similar test crashes in ddraw1. > > I'm also not sure if this test is safe for ddraw7 as it seems to crash > with higher values. Yeah, it probably corrupts memory in ddraw7. What does GetRenderState() do?

2 1

Re: [PATCH 3/3] bcrypt: Added BCRYPT_ALGORITHM_NAME property implementation.
by Hans Leidekker 29 Jan '16

29 Jan '16

Hi Jacek, > --- a/dlls/bcrypt/bcrypt_main.c > +++ b/dlls/bcrypt/bcrypt_main.c > @@ -182,11 +182,12 @@ enum alg_id > > struct { > ULONG hash_length; > + WCHAR alg_name[16]; > } alg_props[] = { > - /* ALG_ID_SHA1 */ { 20 }, > - /* ALG_ID_SHA256 */ { 32 }, > - /* ALG_ID_SHA384 */ { 48 }, > - /* ALG_ID_SHA512 */ { 64 } > + /* ALG_ID_SHA1 */ { 20, {'S','H','A','1'} }, > + /* ALG_ID_SHA256 */ { 32, {'S','H','A','2','5','6'} }, > + /* ALG_ID_SHA384 */ { 48, {'S','H','A','3','8','4'} }, > + /* ALG_ID_SHA512 */ { 64, {'S','H','A','5','1','2'} } > }; I would use BCRYPT_SHA1_ALGORITHM, etc here and make alg_props static const.

1 0

Re: [5/6] shell32/tests: Test environment variable inheritance with ShellExecute().
by Marvin 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20063 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1666: Test failed: WaitForSingleObject returned 258 shlexec.c:1695: Test failed: argvA3 expected 'QuotedLowerL', got 'Open' shlexec.c:1703: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD4FA.tmp\test file.shlexec', got 'C:\Users\winetest\AppData\Local\Temp\wtD4FA.tmp\test file.noassoc.shlexec' shlexec.c:1695: Test failed: argvA3 expected 'QuotedUpperL', got 'QuotedLowerL' shlexec.c:1666: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:1695: Test failed: argvA3 expected 'Open', but key not found or empty shlexec.c:1703: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD4FA.tmp\masked file.shlexec', but key not found or empty === w1064 (32 bit shlexec) === shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2424: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2426: Test failed: failed: rc=29 err=32 shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2424: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2426: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2424: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2426: Test failed: failed: rc=29 err=32 shlexec.c:2438: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt9FCE.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt9FCE.tmp\test file.sde")]' shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2426: Test failed: failed: rc=29 err=2

2 1

Re: [6/6] shell32/tests: Add server-side DDE checks.
by Marvin 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20064 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2433: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2435: Test failed: failed: rc=29 err=32 shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2433: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2435: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2433: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2435: Test failed: failed: rc=29 err=32 shlexec.c:2447: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt209B.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt209B.tmp\test file.sde")]' shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2435: Test failed: failed: rc=29 err=2

1 0

Re: [4/6] shell32/tests: Check for failures in the child process.
by Marvin 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20062 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2408: Test failed: failed: rc=29 err=2 shlexec.c:2408: Test failed: failed: rc=29 err=32 shlexec.c:2408: Test failed: failed: rc=29 err=2 shlexec.c:2408: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2408: Test failed: failed: rc=29 err=2 shlexec.c:2408: Test failed: failed: rc=29 err=32 shlexec.c:2408: Test failed: failed: rc=29 err=2 shlexec.c:2408: Test failed: failed: rc=29 err=32

1 0

Re: [3/6] shell32/tests: Check the child process exit code and close the process handle.
by Marvin 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20061 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2

1 0

Re: [2/6] shell32/tests: Declare childPrintf() as a printf-style function.
by Marvin 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20060 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2401: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt8341.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt8341.tmp\test file.sde")]' shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2

1 0

Re: [1/6] shell32/tests: Reorder the functions to avoid forward declarations.
by Marvin 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20059 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2

1 0