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

Re: shell32/tests: Add traces to the WaitForInputIdle() hooking process.

by Francois Gouget

On Fri, 29 Jan 2016, Henri Verbeet wrote: > On 29 January 2016 at 00:54, Francois Gouget <fgouget(a)codeweavers.com> wrote: > > * There is a set of traces showing WaitForInputIdle() being > > replaced with our own implementation: > > shlexec.c:2318: Hooked USER32.dll.WaitForInputIdle > > > > * And then traces showing our implementation being called: > > shlexec.c:2258: WaitForInputIdle() waiting for dde event > > > > Except that on Windows 10 we never get the second set of traces which > > means we failed to override WaitForInputIdle(). > > > I'm hardly an expert on shell32, but any chance the hooking worked > fine and WaitForInputIdle() is just not getting called? Would > explicitly specifying SEE_MASK_WAITFORINPUTIDLE make it any better? Thanks! I had not seen this option. Also it should really not be needed but it does solve the problem on Windows 10... and kinda breaks the tests on Vista to Windows 8. https://testbot.winehq.org/JobDetails.pl?Key=20082 To wit: * DDE implies doing a WaitForInputIdle(). So Windows 10 should really be doing it without being told, just like all the previous Windows versions before it. * But we also know that WaitForInputIdle() does not work on console applications like our confomance tests. So maybe Windows 10 detects the target executable is a console application and skips this call. It's either that or assuming DDE is totally broken on Windows 10 which seems unlikely (maybe I'll test it at some point). * On all versions from Vista to Windows 8.1, adding SEE_MASK_WAITFORINPUTIDLE causes WaitForInputIdle() to be called twice when DDE is involved. This further 'proves' that this flag should not be needed. * This is why the flag breaks our tests: unlike the real implementation our WaitForInputIdle() replacement blocks every time it is called. Fortunately that's a simple fix. * On Windows XP and 2003, even with the extra flag, WaitForInputIdle() is called only once. * It would really be better to do our DDE tests with a GUI target application. I have no idea how to do that though. -- Francois Gouget <fgouget(a)codeweavers.com>

Jan. 29, 2016

Re: [PATCH 1/3] gdiplus: Implement GdipGetPenTransform

by Nikolay Sivov

On Friday, 29 January 2016, Alistair Leslie-Hughes < leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com > <javascript:;>> > --- > dlls/gdiplus/gdiplus_private.h | 6 ++++++ > dlls/gdiplus/pen.c | 9 ++++----- > dlls/gdiplus/tests/pen.c | 6 +++--- > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/dlls/gdiplus/gdiplus_private.h > b/dlls/gdiplus/gdiplus_private.h > index 1af0bd0..1ed1e5e 100644 > --- a/dlls/gdiplus/gdiplus_private.h > +++ b/dlls/gdiplus/gdiplus_private.h > @@ -71,6 +71,11 @@ static inline BOOL heap_free(void *mem) > return HeapFree(GetProcessHeap(), 0, mem); > } > > +static inline void copy_matrix(GpMatrix *in, GpMatrix *out) > +{ > + memcpy(out, in, 6 * sizeof(REAL)); > +} > + Simple assignment could be used instead of this helper.

Jan. 29, 2016

Re: [PATCH 6/6] d3d10core/tests: Test the creation of textures with invalid multisample settings.

by Józef Kucia

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 | 48 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c > index ae755d3..de3b551 100644 > --- a/dlls/d3d10core/tests/device.c > +++ b/dlls/d3d10core/tests/device.c > @@ -5138,6 +5138,53 @@ done: > ok(!refcount, "Device has %u references left.\n", refcount); > } > > +static void test_invalid_multisample(void) > +{ > + D3D10_TEXTURE2D_DESC desc; > + ID3D10Texture2D *texture; > + UINT quality_level_count; > + ID3D10Device *device; > + ULONG refcount; > + HRESULT hr; > + > + if (!(device = create_device())) > + { > + skip("Failed to create device.\n"); > + return; > + } > + > + ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); > + desc.Width = 128; > + desc.Height = 128; > + desc.MipLevels = 1; > + desc.ArraySize = 1; > + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; > + desc.SampleDesc.Count = 2; > + desc.SampleDesc.Quality = 0; > + desc.Usage = D3D10_USAGE_DEFAULT; > + desc.BindFlags = D3D10_BIND_RENDER_TARGET; > + desc.CPUAccessFlags = 0; > + desc.MiscFlags = 0; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + if (quality_level_count) > + { > + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); > + ID3D10Texture2D_Release(texture); > + desc.SampleDesc.Quality = quality_level_count; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + } > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + > + /* We assume 15 samples multisampling is never supported in practice. */ > + desc.SampleDesc.Count = 15; > + desc.SampleDesc.Quality = 0; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + > + refcount = ID3D10Device_Release(device); > + ok(!refcount, "Device has %u references left.\n", refcount); > +} > + > START_TEST(device) > { > test_feature_level(); > @@ -5168,4 +5215,5 @@ START_TEST(device) > test_copy_subresource_region(); > test_multisample_init(); > test_checkmultisamplequalitylevels(); > + test_invalid_multisample(); > } > -- > 2.4.10 > > > This is fine by me but it could be considered to be merged into test_create_texture2d().

Jan. 29, 2016

Re: [PATCH 2/6] d3d11: Implement d3d10_device_CheckMultisampleQualityLevels().

by Józef Kucia

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().

Jan. 29, 2016

RE: [PATCH] user32/tests: Add some expected WPARAM values to the SetFocusComboBox sequences

by Hugh McMaster

On Fri, 29 Jan 2016 03:27:13 -0600, Marvin wrote: > > 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 These are unrelated failures. -- Hugh McMaster

Jan. 29, 2016

Re: [PATCH 4/7] ddraw/tests: Add tests for invalid render states.

by Józef Kucia

On Thu, Jan 28, 2016 at 2:51 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > 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? > GetRenderState() returns the expected values but it fails for some invalid state values with DDERR_INVALIDPARAMS. A ddraw7 device is also usable after setting invalid states (I was able to draw something after setting invalid states). Nevertheless, I doubt it's enough indication of anything.

Jan. 29, 2016

Re: [PATCH] user32/tests: Add some expected WPARAM values to the SetFocusComboBox sequences

by Marvin

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

Jan. 29, 2016

Re: [PATCH 3/3] bcrypt: Added BCRYPT_ALGORITHM_NAME property implementation.

by Hans Leidekker

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.

Jan. 29, 2016

Re: shell32/tests: Add traces to the WaitForInputIdle() hooking process.

by Henri Verbeet

On 29 January 2016 at 00:54, Francois Gouget <fgouget(a)codeweavers.com> wrote: > * There is a set of traces showing WaitForInputIdle() being > replaced with our own implementation: > shlexec.c:2318: Hooked USER32.dll.WaitForInputIdle > > * And then traces showing our implementation being called: > shlexec.c:2258: WaitForInputIdle() waiting for dde event > > Except that on Windows 10 we never get the second set of traces which > means we failed to override WaitForInputIdle(). > I'm hardly an expert on shell32, but any chance the hooking worked fine and WaitForInputIdle() is just not getting called? Would explicitly specifying SEE_MASK_WAITFORINPUTIDLE make it any better?

Jan. 29, 2016

Re: [5/6] shell32/tests: Test environment variable inheritance with ShellExecute().

by Francois Gouget

On Thu, 28 Jan 2016, Marvin wrote: [...] > === 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 The usual occasional timeout-induced failures for this VM. > === 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 So the ShlexecVar lines are new but in fact it's caused by the same DDE failures we have had all along on Windows 10. As explained in the email below the issue appears to be that hooking WaitForInputIdle() has not effect on Windows 10. So ShellExecute() does not wait for the child process to do the DDE exchange and returns too early. This results in a race between the parent and child process(es), both for the DDE exchange, and when checking the content of the child result file. https://www.winehq.org/pipermail/wine-devel/2016-January/111496.html -- Francois Gouget <fgouget(a)codeweavers.com>

Jan. 29, 2016