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

Re: [PATCH 1/8] ddraw/tests: Add some tests for draw parameter validation.

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=22460 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

April 22, 2016

Re: How do I register a DirectShow class?

by Alex Henrie

2016-04-22 10:06 GMT-06:00 Andrew Eikum <aeikum(a)codeweavers.com>: > You have to also add the class to qedit_classes.idl. It should then be > automatically added to the registry next time you start Wine. 2016-04-22 10:06 GMT-06:00 Vincent Povirk <vincent(a)codeweavers.com>: > You need to add it to qedit_classes.idl, then run a prefix update. That worked, thank you! -Alex

April 22, 2016

Re: How do I register a DirectShow class?

by Vincent Povirk

You need to add it to qedit_classes.idl, then run a prefix update.

April 22, 2016

Re: How do I register a DirectShow class?

by Andrew Eikum

On Fri, Apr 22, 2016 at 09:59:08AM -0600, Alex Henrie wrote: > Hi, > > I've been trying to fix > <https://bugs.winehq.org/show_bug.cgi?id=32473>, you can see my work > at <https://github.com/alexhenrie/wine/commits/master>. > > I defined the AMTimeline class and its interfaces and I added a > complete stub implementation, but I'm still getting the same error: > > err:ole:CoGetClassObject class {78530b75-61f9-11d2-8cad-00a024580902} > not registered > err:ole:CoGetClassObject no class object > {78530b75-61f9-11d2-8cad-00a024580902} could be created for context > 0x1 > > What am I missing? You have to also add the class to qedit_classes.idl. It should then be automatically added to the registry next time you start Wine. Andrew

April 22, 2016

Re: [PATCH 1/2] d3dx9: Add 'exp' preshader opcode.

by Paul Gofman

On 04/22/2016 05:15 PM, Matteo Bruni wrote: > >> + 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). I am not sure I understand how do you see this original bytecode: is it a pointer inside the effect blob to the code to be altered, the whole effect blob pointer or something else? > 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. I can put it in the array but do we need to make this too generic? I. e. support other argument counts besides 1 and 2? I know just one opcode which has more opcodes and we are unlikely to encounter much more. I was planning to test d3dts_dotswiz separately outside of this infrastructure. I can get rid of _SIZE define (as actually it can be computed from arguments count), but how do you see getting rid of _POS?

April 22, 2016

How do I register a DirectShow class?

by Alex Henrie

Hi, I've been trying to fix <https://bugs.winehq.org/show_bug.cgi?id=32473>, you can see my work at <https://github.com/alexhenrie/wine/commits/master>. I defined the AMTimeline class and its interfaces and I added a complete stub implementation, but I'm still getting the same error: err:ole:CoGetClassObject class {78530b75-61f9-11d2-8cad-00a024580902} not registered err:ole:CoGetClassObject no class object {78530b75-61f9-11d2-8cad-00a024580902} could be created for context 0x1 What am I missing? -Alex

April 22, 2016

Re: [PATCH] qedit: List parameters in order in create function traces.

by Alex Henrie

2016-04-22 6:17 GMT-06:00 Andrew Eikum <aeikum(a)codeweavers.com>: > Thanks. Just for my own information, are you working in this area? I'm > working on video embedding in Office 2010 (Bug 40179) at the moment. I've been trying to fix bug 32473. I actually had a question for you, but I'll send it as a separate email because it's not related to this patch. -Alex

April 22, 2016

Re: [v6 PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers

by Nikolay Sivov

On 22.04.2016 10:55, Alistair Leslie-Hughes wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=10347 > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/comctl32/tests/tooltips.c | 39 +++++++++++++++++++++++++++++++++++++++ > dlls/comctl32/tooltips.c | 5 ++++- > 2 files changed, 43 insertions(+), 1 deletion(-) > > diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c > index 3382fce..db3d3c4 100644 > --- a/dlls/comctl32/tests/tooltips.c > +++ b/dlls/comctl32/tests/tooltips.c > @@ -446,6 +446,45 @@ static void test_gettext(void) > r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); > ok(!r, "Adding the tool to the tooltip succeeded!\n"); > > + /* lpszText with an invalid address */ > + toolinfoW.cbSize = sizeof(TTTOOLINFOW); > + toolinfoW.hwnd = notify; > + toolinfoW.hinst = GetModuleHandleA(NULL); > + toolinfoW.uFlags = 0; > + toolinfoW.uId = 0; > + toolinfoW.lpszText = (LPWSTR)0xdeadbeef; > + toolinfoW.lParam = 0; > + GetClientRect(hwnd, &toolinfoW.rect); > + r = SendMessageA(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); > + ok(!r, "Adding the tool to the tooltip succeeded!\n"); > + > + /* lpszText with an callback address */ > + toolinfoW.cbSize = sizeof(TTTOOLINFOW); > + toolinfoW.hwnd = notify; > + toolinfoW.hinst = GetModuleHandleA(NULL); > + toolinfoW.uFlags = 0; > + toolinfoW.uId = 0; > + toolinfoW.lpszText = LPSTR_TEXTCALLBACKW; > + toolinfoW.lParam = 0; > + GetClientRect(hwnd, &toolinfoW.rect); > + r = SendMessageA(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); > + todo_wine ok(!r, "Adding the tool to the tooltip succeeded!\n"); > + This is broken, 'notify' is invalid at this point, take a look at a patch I sent couple days ago. Also these tests don't work for me even with valid string pointers, and with reduce cbSize and invalid pointers they crash on Windows. So the whole idea might be wrong. > if (0) /* crashes on NT4 */ > { > toolinfoW.hwnd = NULL; > diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c > index 8bf6919..804e9ed 100644 > --- a/dlls/comctl32/tooltips.c > +++ b/dlls/comctl32/tooltips.c > @@ -1038,7 +1038,10 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > infoPtr->hwndSelf, ti->hwnd, ti->uId, > (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); > > - if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) > + if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && isW > + && !TOOLTIPS_IsCallbackString(ti->lpszText, isW) > + && !(ti->lpszText && IS_INTRESOURCE(ti->lpszText)) > + && IsBadStringPtrW(ti->lpszText, sizeof(WCHAR)) ) > return FALSE; Text check is wrong.

April 22, 2016

Re: [PATCH 1/2] d3dx9: Add 'exp' preshader opcode.

by Matteo Bruni

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.

April 22, 2016

Re: [PATCH] kernel32/tests: Add initial tests for GetConsoleFontInfo (v2)

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=22458 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2703919542 console.c:1445: Test failed: [15] Expected output count to be 0, got 2703919542 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2703919542 console.c:1689: Test failed: [13] Expected output count to be 0, got 2703919542 console.c:1689: Test failed: [15] Expected output count to be 0, got 2703919542 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2703919542 === 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 1919911434 console.c:1445: Test failed: [15] Expected output count to be 0, got 1919911434 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1919911434 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 1919911434 console.c:1689: Test failed: [15] Expected output count to be 0, got 1919911434 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1919911434 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 418781008 console.c:1445: Test failed: [15] Expected output count to be 0, got 418781008 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 418781008 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 418781008 console.c:1689: Test failed: [15] Expected output count to be 0, got 418781008 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 418781008 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

April 22, 2016