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

Re: [PATCH] comctl32/tooltips: Cut tooltip text at first tab char unless TTS_NOPREFIX is used
by Dmitry Timoshkov 02 May '16

02 May '16

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -316,49 +318,40 @@ static void test_gettext(void) > toolinfoA.lParam = 0xdeadbeef; > GetClientRect(hwnd, &toolinfoA.rect); > r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); > - if (r) > - { > - toolinfoA.hwnd = NULL; > - toolinfoA.uId = 0x1234ABCD; > - toolinfoA.lpszText = bufA; > - SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); > - ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); > > - toolinfoA.lpszText = bufA; > - SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); > - ok(toolinfoA.lpszText == NULL, > - "expected NULL, got %p\n", toolinfoA.lpszText); 'r' is assigned but not used. Perhaps it would be a good idea to test return value of every SendMessage() call. -- Dmitry.

1 0

Re: dwmapi: Return S_OK in DwmSetWindowAttribute stub.
by Nikolay Sivov 02 May '16

02 May '16

On 02.05.2016 16:06, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > Signed-off-by: Michael Müller <michael(a)fds-team.de> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/dwmapi/dwmapi_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c > index 155d7d3..8c3472a 100644 > --- a/dlls/dwmapi/dwmapi_main.c > +++ b/dlls/dwmapi/dwmapi_main.c > @@ -126,7 +126,7 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr > > if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); > > - return E_NOTIMPL; > + return S_OK; > } > > /********************************************************************** > What application is that for?

2 1

Re: [PATCH 2/2 v2] mshtml: Make it possible to clear timer and interval with any of clearTimeout and clearInterval functions
by Marvin 02 May '16

02 May '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=22785 Your paranoid android. === wxppro (32 bit events) === events.c:1388: timeout The test timed out === w2003std (32 bit events) === events.c:1388: timeout The test timed out === wvistau64 (32 bit events) === events.c:1388: timeout The test timed out === w2008s64 (32 bit events) === events.c:1388: timeout === w7u (32 bit events) === events.c:1388: timeout === w7pro64 (32 bit events) === events.c:1388: timeout === w8 (32 bit events) === events.c:1388: timeout === w864 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === wvistau64 (64 bit events) === events.c:1388: timeout === w2008s64 (64 bit events) === events.c:1388: timeout === w7pro64 (64 bit events) === events.c:1388: timeout === w864 (64 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (64 bit events) === events.c:1388: timeout events.c:1388: timeout

1 0

Re: [PATCH 1/2 v2] mshtml: Fix HTMLWindow3_setInterval behavior on 0 msec intervals
by Marvin 02 May '16

02 May '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=22784 Your paranoid android. === wxppro (32 bit events) === events.c:1388: timeout === w2003std (32 bit events) === events.c:1388: timeout === wvistau64 (32 bit events) === events.c:1388: timeout === w2008s64 (32 bit events) === events.c:1388: timeout === w7u (32 bit events) === events.c:1388: timeout === w7pro64 (32 bit events) === events.c:1388: timeout === w8 (32 bit events) === events.c:1388: timeout === w864 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === wvistau64 (64 bit events) === events.c:1388: timeout === w2008s64 (64 bit events) === events.c:1388: timeout === w7pro64 (64 bit events) === events.c:1388: timeout === w864 (64 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (64 bit events) === events.c:1388: timeout events.c:1388: timeout

1 0

Re: [PATCH] po: update Norwegian translation
by Nikolay Sivov 02 May '16

02 May '16

On 30.04.2016 17:18, Kim Malmo wrote: > I have added missing translations and fixed up the fuzzy ones. I've also > fixed some minor typos and spelling errors in the old translation. > > The undertaking that might stand out here however, is I've tried to make > it more consistent with itself, and more consistent with the original > english text. One thing I want to point out is the (former) usage of > « and » signs. First of all the are no longer present on Norwegian > keyboards, second and perhaps most importantly, they look hideous with > whatever is the default Wine font. For consistency what I've done is the > following: > > * For %1 (or similar) in the english text I have used %1 or '%1' depending > on context. In some cases it makes sense to wrap handles or operations > in Norwegian. > > * For '%1' (or similar) in the english text I have used '%1' > > * All cases of «%1» (or similar) has been changed to %1 or '%1' depending > on context. > > For parts of the translation I have tried to make the context and meaning > more clear. There are also quite a few changes to make it more conformant > with Microsoft's Norwegian Bokmål Style Guide. Hi, thank you for this major update. Regarding quotation marks, it's really up to target language to use one of several styles of quotation marks and quotation formatting. Original English text is only a reference, not something to follow. User guide you mentioned, mostly tells to omit quotation marks (p. 58), and use straight double quotes if they are necessary. The fact that '«' and '»' are missing from default keyboard layout is unfortunate but can't alone be a reason not to use them, if traditional typographical rules tell so. What about default Wine font problems with them? I see no such thing when testing in clean prefix, but it could certainly depend on dpi/font size (Wine's Tahoma is simplistic) and actual font you're using. > > Signed-off-by: Kim Malmo <berencamlost(a)msn.com>

3 3

Re: [v2 1/2] d3dx9: Add 'exp' preshader opcode.
by Matteo Bruni 01 May '16

01 May '16

2016-04-25 10:52 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > + op_step = 2 + (args_count + 1) * 3; You could instead calculate that in the caller and pass it in place of args_count. Or, probably better, you could pass the entire op_tests[] table entry to the function, you're currently passing all the fields one by one anyway. > + for (i = 0; i < 4; ++i) > + todo_wine_if(todo && todo[i]) > + ok(compare_float(v[i], ((float *)expected_result)[i], ulps), > + "Operation %s, component %u, expected %#x (%g), got %#x (%g).\n", op_mnem, > + i, expected_result[i], ((float *)expected_result)[i], ((unsigned int *)v)[i], v[i]); todo currently can never be NULL. > + for (i = 0; i < ARRAY_SIZE(op_tests); ++i) > + test_preshader_op(device, test_effect_preshader_effect_blob, sizeof test_effect_preshader_effect_blob, > + blob_position[op_tests[i].args_count].pos, blob_position[op_tests[i].args_count].result_index, > + op_tests[i].mnem, op_tests[i].opcode, op_tests[i].args_count, > + op_tests[i].expected_result, &op_tests[i].fvect1, &op_tests[i].fvect2, > + op_tests[i].ulps, op_tests[i].todo); Parenthesis around sizeof operand, please.

1 0

Re: [PATCH 1/2] d3dx9: Add 'exp' preshader opcode.
by Matteo Bruni 01 May '16

01 May '16

2016-04-21 10:56 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -43,6 +43,7 @@ enum pres_ops > PRESHADER_OP_SIN, > PRESHADER_OP_COS, > PRESHADER_OP_RSQ, > + PRESHADER_OP_EXP, > }; > #define PRES_OPCODE_MASK 0x7ff00000 > #define PRES_OPCODE_SHIFT 20 > @@ -119,6 +121,7 @@ static const struct op_info pres_op_info[] = > {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ > {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ > {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ > + {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ > }; It might make sense to keep the array sorted by opcode (which requires either adding the enum into the table or, most likely, reordering the enum too). That way you can binary search into it in the future, if necessary. No particular hurry for that though. > +static void test_preshader_op(IDirect3DDevice9 *device, const char *op_mnem, > + unsigned int opcode, unsigned int args_count, unsigned int *expected_result, > + D3DXVECTOR4 *fvect1, D3DXVECTOR4 *fvect2, unsigned int ulps, BOOL *todo) > +{ > + DWORD test_effect_blob[ARRAY_SIZE(test_effect_preshader_effect_blob)]; It's not a huge array but it seems better to avoid putting it on the stack nonetheless - i.e. please allocate it dynamically with HeapAlloc(). > + HRESULT hr; > + ID3DXEffect *effect; > + D3DLIGHT9 light; > + unsigned int i, npasses; passes_count? > + float *v; > + unsigned int op_pos, op_step, result_index; > + D3DXHANDLE param; > + > + if (args_count == 1) > + { > + op_pos = TEST_EFFECT_PRESHADER_OP0_POS; > + op_step = TEST_EFFECT_PRESHADER_OP0_INS_SIZE; > + result_index = 0; > + } > + else if (args_count == 2) > + { > + op_pos = TEST_EFFECT_PRESHADER_OPMUL_POS; > + op_step = TEST_EFFECT_PRESHADER_OPMUL_INS_SIZE; > + result_index = 2; > + } > + else > + { > + return; > + } That doesn't seem particularly nice, especially WRT extending this test later on. It seems better to have the "original" bytecode and these variables you compute here passed in from the caller (maybe stored in a struct together with the opcode parameters). test_effect_preshader_ops() should probably be table-based. At that point the *_POS and *_SIZE defines might become unnecessary; if they stay they should probably be named after the argument count (which is the actually interesting part, the original operation is going to change for the test and can be figured out from the light index) instead. > + memcpy(test_effect_blob, test_effect_preshader_effect_blob, sizeof test_effect_blob); > + for (i = 0; i < 4; i++) ++i, for consistency.

2 2

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture.
by Stefan Dösinger 01 May '16

01 May '16

> Am 28.04.2016 um 20:17 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > @@ -198,13 +198,24 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > + > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; > > if (FAILED(hr = d3drm_texture_create(&object))) > + { > + d3drm_texture_destroy(object); > return hr; > + } > + object->d3drm = iface; > + object->initialized = TRUE; > + object->image = image; > > *texture = &object->IDirect3DRMTexture_iface; > > + IDirect3DRM_AddRef(iface); > + > return D3DRM_OK; > } > Is there anything wrong with calling Texture3::InitFromImage here, or even calling IDirect3DRM3::CreateTexture? in D3DRM1::CreateTexture and D3DRM2::CreateTexture?

2 3

Re: comdlg32: check for overflow before dereferencing (resend)
by Sebastian Lackner 01 May '16

01 May '16

On 01.05.2016 17:30, Pierre Schweitzer wrote: > - while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen)) > + while ((nStrCharCount <= nStrLen) && (lpstrEdit[nStrCharCount]!='"')) The change looks correct, but while you are just it, you might also want to fix the operator here. It probably should be <, otherwise the loop will also copy the terminating \0 character. Same for the comparison a couple of lines above.

2 1

Fw: [PATCH 2/2] kernel32/tests: Add tests for SetConsoleFont
by Hugh McMaster 01 May '16

01 May '16

On Sunday, 1 May 2016 10:19 PM, 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=22777 > > Your paranoid android. > > === w8 (32 bit console) === > console.c:1445: Test failed: [13] Expected output count to be 0, got 4115832529 > console.c:1445: Test failed: [15] Expected output count to be 0, got 4115832529 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4115832529 > console.c:1689: Test failed: [13] Expected output count to be 0, got 4115832529 > console.c:1689: Test failed: [15] Expected output count to be 0, got 4115832529 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4115832529 > > === w864 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 3160603465 > console.c:1445: Test failed: [15] Expected output count to be 0, got 3160603465 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3160603465 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 3160603465 > console.c:1689: Test failed: [15] Expected output count to be 0, got 3160603465 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3160603465 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 2978365710 > console.c:1445: Test failed: [15] Expected output count to be 0, got 2978365710 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2978365710 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 2978365710 > console.c:1689: Test failed: [15] Expected output count to be 0, got 2978365710 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2978365710 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w864 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 These are existing failures.

1 0