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

Re: [PATCH 4/4] rpcrt4: Added RpcServerRegisterAuthInfoW failure test.
by Marvin 27 Jun '16

27 Jun '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=23875 Your paranoid android. === w864 (32 bit rpc) === rpc.c:815: Test failed: GUID does not appear to contain a MAC address: {6eb1cf99-3c79-11e6-be78-e71666c2e04a} === w864 (64 bit rpc) === rpc.c:815: Test failed: GUID does not appear to contain a MAC address: {f4f8b15d-3c7a-11e6-be78-e71666c2e04a}

1 0

Re: wordpad: Avoid buffer overrun in registry_set_filelist.
by Huw Davies 27 Jun '16

27 Jun '16

On Sun, Jun 26, 2016 at 11:42:31AM +0200, Thomas Faber wrote: > From e80a75cfe223a82eea4c55874975e54de4981282 Mon Sep 17 00:00:00 2001 > From: Thomas Faber <thomas.faber(a)reactos.org> > Date: Sun, 26 Jun 2016 10:59:08 +0200 > Subject: wordpad: Avoid buffer overrun in registry_set_filelist. > > Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> > --- > programs/wordpad/registry.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c > index bf2af5b..e047f37 100644 > --- a/programs/wordpad/registry.c > +++ b/programs/wordpad/registry.c > @@ -298,7 +298,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd) > if(!lstrcmpiW(pFiles[i], newFile)) > { > int j; > - for(j = 0; pFiles[j] && j < i; j++) > + for(j = 0; j < i && pFiles[j]; j++) > { > pFiles[i-j] = pFiles[i-j-1]; > } This looks odd to me. I don't see how this could avoid an overflow; pFiles[i] is valid at this point and so pFiles[j] will be ok if j == i. More confusingly though, is why pFiles[j] is in the test at all. Huw.

2 1

Re: d3d9/tests: Use SetRect() instead of open coding it.
by Marvin 27 Jun '16

27 Jun '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=23872 Your paranoid android. === w1064 (64 bit device) === device.c:4348: Test failed: cw is 0xf60, expected 0x7f. device.c:4357: Test failed: Callback cw is 0xf60, expected 0x7f.

2 1

Re: [PATCH 7/7] d3drm: Implement IDirect3DRM*::CreateViewport.
by Stefan Dösinger 27 Jun '16

27 Jun '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-06-24 um 22:49 schrieb Aaryaman Vasishta: > + hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + if (FAILED(hr)) > + { > + hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + } Afaics the if (FAILED(hr)) isn't necessary here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXcFm2AAoJEN0/YqbEcdMwbewP/11c9oFcbQjek33cW30miUka fO/BIk3qk6xpsz/CMF/DRmwQvqPObSnG5zsAXn4j1hsJM2y3EBRjLeZx1/CqyR9s uQ9JyN85zB2rEDkSpLFNaOIW0hnX7bFFnOmZlIlZPYRH1cqQSJcg5gcAq8EnLeIl ioWW0qK3ZREeRDZXEe0YxuwGqWE+HouUNzS/En9OrlZ9b76zfuRcH2rrGSw+2BPo Az8PzllV8v3Df/HxqYyeG9JxgjWElk2aQGfHP5BPUE/JF5+Ky2xEb6RvHVGJQ64P G/HKJGlKZT/VgQGCbJx6s5bNazBiJSyD4a6dj5IbEbWmnySJIbwW2DNXrcxKT9MO oz0NNyjMQAVkJx45QVvtxm+5QsJIbO6V/38h+zsPW0F6dGrYoqBXXSFbsbp4ge2G S2EC+bJVHsUwc2en52BaqJCRDYLSgxNaD2kL8ovZjLYBVi3jlfTP/OcIXYjam2I7 67b8VEeV7xBILU2uvhFxwpwLIgtVJ1b2QUyH3TjrKfClGu5lbe/VbASsrDjBaJV1 ZZMqcmn1JU/P24wQVWb2gfqN12ktvhEnnYznwz8zw7OKdpOUoKlOXr/06tlrMmei YfuGMZmJyxMJQSsfIVtoFH1HmqlZuk5QUjnjyShYDDf4TlKWZAtn4o4JJbt4n1J0 bOobnKLPsEGKSNhoZbnm =xbZw -----END PGP SIGNATURE-----

2 1

Vacation
by Alexandre Julliard 25 Jun '16

25 Jun '16

Folks, I'll be out on vacation next week, so there won't be any commits. Feel free to keep sending patches, I'll try to catch up when I get back, and make the next release on schedule two weeks from now. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] comdlg32: Optimize FILEDLG95_FILENAME_FillFromSelection.
by Henri Verbeet 25 Jun '16

25 Jun '16

On 23 June 2016 at 13:29, Lauri Kenttä <lauri.kentta(a)gmail.com> wrote: > This trades some memory for speed, but since currently selecting > 1000 files takes over a minute but the required memory for those > 1000 filenames is only 262 kB (worst case), this seems a reasonable > trade-off. > That's probably fine, but is there any reason this can't use the standard approach of just doubling the buffer size when you run out of space? If this is performance critical code, the multiple copies of the string related to GetName() probably don't help either.

2 1

Re: [PATCH 7/9] d3d11: Implement ID3D11UnorderedAccessView interface.
by Henri Verbeet 24 Jun '16

24 Jun '16

On 24 June 2016 at 11:46, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + switch (desc->ViewDimension) > + { > + case D3D11_UAV_DIMENSION_TEXTURE1DARRAY: > + if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count) I noticed too late for the other normalisation functions, but "ArraySize" is unsigned.

2 2

Re: [PATCH 3/9] d3d11: Implement d3d11_immediate_context_OMGetBlendState().
by Henri Verbeet 24 Jun '16

24 Jun '16

On 24 June 2016 at 11:45, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -4044,16 +4053,17 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, > ID3D10BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) > { > struct d3d_device *device = impl_from_ID3D10Device(iface); > + ID3D11BlendState *d3d11_blend_state; > + struct d3d_blend_state *object; > > TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", > iface, blend_state, blend_factor, sample_mask); > > - if ((*blend_state = device->blend_state ? (ID3D10BlendState *)&device->blend_state->ID3D10BlendState1_iface : NULL)) > - ID3D10BlendState_AddRef(*blend_state); > - wined3d_mutex_lock(); > - memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); > - *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); > - wined3d_mutex_unlock(); > + d3d11_immediate_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, > + &d3d11_blend_state, blend_factor, sample_mask); > + > + object = unsafe_impl_from_ID3D11BlendState(d3d11_blend_state); Why not just impl_from_ID3D11BlendState() here?

2 4

Re: Andrey Gusev : msvcp120/tests: Fix a typo in ok() message.
by Ken Thomases 23 Jun '16

23 Jun '16

On Jun 23, 2016, at 11:15 AM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c > index 7c94906..354b2d3 100644 > --- a/dlls/msvcp120/tests/msvcp120.c > +++ b/dlls/msvcp120/tests/msvcp120.c > @@ -592,7 +592,7 @@ static void test_xtime_get(void) > diff = p__Xtime_diff_to_millis2(&after, &before); > > ok(diff >= tests[i], > - "xtime_get() not functioning correctly, test: %d, expect: ge %d, got: %d\n", > + "xtime_get() not functioning correctly, test: %d, expect: %d, got: %d\n", > i, tests[i], diff); > } Too late on this one, but I think the "ge" was supposed to mean "greater than or equal to", given the actual test being performed. Probably best to replace it with ">=". -Ken

1 0

Re: kernel32/tests: Fix a typo in skip() message.
by Marvin 23 Jun '16

23 Jun '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=23833 Your paranoid android. === w1064 (32 bit locale) === locale.c:2370: Test failed: LCMapStringEx should fail with bad locale name locale.c:2371: Test failed: unexpected error code -559038737 locale.c:2462: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4192: Test failed: IsValidLocaleName should have failed locale.c:4194: Test failed: IsValidLocaleName should have failed locale.c:4577: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4579: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2370: Test failed: LCMapStringEx should fail with bad locale name locale.c:2371: Test failed: unexpected error code -559038737 locale.c:2462: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4192: Test failed: IsValidLocaleName should have failed locale.c:4194: Test failed: IsValidLocaleName should have failed locale.c:4577: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4579: Test failed: For id 7, Expected IVC, got ''

1 0