June 2011 - Wine-Devel - list.winehq.org

Re: d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN.

by GOUJON Alexandre

On 06/28/2011 10:59 AM, Tijl Coosemans wrote: > On Tuesday 28 June 2011 00:40:09 Alexandre Julliard wrote: >> Dylan Smith<dylan.ah.smith(a)gmail.com> writes: >>> @@ -4834,7 +4834,7 @@ static void test_create_skin_info(void) >>> for (i = 0; i< num_influences; i++) { >>> ok(exp_vertices[i] == vertices[i], >>> "influence[%d]: expected vertex %u, got %u\n", i, exp_vertices[i], vertices[i]); >>> - ok(exp_weights[i] == weights[i], >>> + ok((isnan(exp_weights[i])&& isnan(weights[i])) || exp_weights[i] == weights[i], >> I put this in for now to fix the tests, but isnan() isn't really >> portable, we should try to find a better way. > You can replace isnan(x) with (x != x), but isnan is specified by the > ISO C99 standard, so it should be portable. "Wine adheres to standard C89/C90. Code should be written so that it works with as many compilers as possible, so you should avoid compiler-specific constructs, C99 and C++. " from http://wiki.winehq.org/SubmittingPatches.

June 28, 2011

Re: d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN.

by Tijl Coosemans

On Tuesday 28 June 2011 00:40:09 Alexandre Julliard wrote: > Dylan Smith <dylan.ah.smith(a)gmail.com> writes: >> @@ -4834,7 +4834,7 @@ static void test_create_skin_info(void) >> for (i = 0; i < num_influences; i++) { >> ok(exp_vertices[i] == vertices[i], >> "influence[%d]: expected vertex %u, got %u\n", i, exp_vertices[i], vertices[i]); >> - ok(exp_weights[i] == weights[i], >> + ok((isnan(exp_weights[i]) && isnan(weights[i])) || exp_weights[i] == weights[i], > > I put this in for now to fix the tests, but isnan() isn't really > portable, we should try to find a better way. You can replace isnan(x) with (x != x), but isnan is specified by the ISO C99 standard, so it should be portable.

June 28, 2011

Re: [PATCH] comctl32: Fixed strncpy (Coverity)

by Michael Stefaniuc

Hello Marcus, On 06/28/2011 09:15 AM, Marcus Meissner wrote: > This is a 2 CHAR buffer, and we copy in 1 CHAR and \0. So just do that > via strcpy() and dont confuse the static checker. > > CID 1194 > > Ciao, Marcus > --- > dlls/comctl32/tests/treeview.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c > index 324473d..faa9553 100644 > --- a/dlls/comctl32/tests/treeview.c > +++ b/dlls/comctl32/tests/treeview.c > @@ -1225,7 +1225,7 @@ static void test_itemedit(void) > r = TreeView_SelectItem(hTree, NULL); > expect(TRUE, r); > /* alter text */ > - strncpy(buff, "x", sizeof(buff)/sizeof(CHAR)); > + strcpy(buff, "x"); > r = SendMessage(edit, WM_SETTEXT, 0, (LPARAM)buff); What about r = SendMessage(edit, WM_SETTEXT, 0, (LPARAM)"x"); No strcpy involved. > expect(TRUE, r); > r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); bye michael

June 28, 2011

Re: d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN.

by Alexandre Julliard

Dylan Smith <dylan.ah.smith(a)gmail.com> writes: > @@ -4834,7 +4834,7 @@ static void test_create_skin_info(void) > for (i = 0; i < num_influences; i++) { > ok(exp_vertices[i] == vertices[i], > "influence[%d]: expected vertex %u, got %u\n", i, exp_vertices[i], vertices[i]); > - ok(exp_weights[i] == weights[i], > + ok((isnan(exp_weights[i]) && isnan(weights[i])) || exp_weights[i] == weights[i], I put this in for now to fix the tests, but isnan() isn't really portable, we should try to find a better way. -- Alexandre Julliard julliard(a)winehq.org

June 27, 2011

Re: [2/2] gdiplus: Implement GdipMeasureDriverString.

by Alexandre Julliard

"Vincent Povirk" <vincent(a)codeweavers.com> writes: > From 520906b62d02cb9c886404caa03d1fcb634f574b Mon Sep 17 00:00:00 2001 > From: Vincent Povirk <vincent(a)codeweavers.com> > Date: Mon, 27 Jun 2011 13:24:39 -0500 > Subject: [PATCH 2/3] gdiplus: Implement GdipMeasureDriverString. It doesn't work here: ../../../tools/runtest -q -P wine -M gdiplus.dll -T ../../.. -p gdiplus_test.exe.so graphics.c && touch graphics.ok graphics.c:3110: Test failed: Expected 7.00, got 8.00 make: *** [graphics.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

June 27, 2011

Re: ws2_32: return an error in SO_CONNECT_TIME stub

by Austin English

On Sun, Mar 27, 2011 at 21:41, Dmitry Timoshkov <dmitry(a)codeweavers.com> wrote: > Austin English <austinenglish(a)gmail.com> wrote: > >> @@ -2554,7 +2554,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, >> } >> *(DWORD*)optval = pretendtime++; >> *optlen = sizeof(DWORD); >> - return ret; >> + return SOCKET_ERROR; >> } > > Filling out optval and optlen but returning SOCKET_ERROR doesn't make > sense. Probably Eye-Fi doesn't change the return value. What kind of > socket both of the applications do pass? For MFSX: trace:winsock:WS_getsockopt socket: 0220, level 0xffff, name 0x700c, ptr 0x32eac0, len 4 fixme:winsock:WS_getsockopt WS_SO_CONNECT_TIME - faking results trace:winsock:WS_getsockopt socket: 0224, level 0xffff, name 0x700c, ptr 0x32eac0, len 4 trace:winsock:WS_getsockopt socket: 0228, level 0xffff, name 0x700c, ptr 0x32eac0, len 4 trace:winsock:WS_getsockopt socket: 022c, level 0xffff, name 0x700c, ptr 0x32eac0, len 4 trace:winsock:WS_getsockopt socket: 0230, level 0xffff, name 0x700c, ptr 0x32eac0, len 4 (full log attached, 280K uncompressed). I don't have access to Eye-Fi, Marcus? -- -Austin

June 27, 2011

Re: oleaut32: Implement ICreateTypeInfo2 SetHelpStringContext

by Michael Stefaniuc

Hello Alistair, Alistair Leslie-Hughes wrote: > Changelog: > oleaut32: Implement ICreateTypeInfo2 SetHelpStringContext > > dlls/oleaut32/typelib2.c | 9 +++++++-- > 1 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c > index e9c7613..459547f 100644 > --- a/dlls/oleaut32/typelib2.c > +++ b/dlls/oleaut32/typelib2.c > @@ -3067,8 +3067,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext( > ICreateTypeInfo2* iface, /* [I] The typeinfo on which to set the help string context. */ > ULONG dwHelpStringContext) /* [I] The help string context. */ > { > - FIXME("(%p,%d), stub!\n", iface, dwHelpStringContext); > - return E_OUTOFMEMORY; > + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; please do not add any more of those cast but add a impl_from_ICreateTypeInfo2() helper as per the COM guidline at http://wiki.winehq.org/COMGuideline. Bonus points for doing the COM cleanup too ;) thanks bye michael

June 27, 2011

Re: [docs] winedev: A hint for patch separation

by André Hentschel

Am 27.06.2011 11:55, schrieb Jerome Leclanche: > That sounds like we want people to avoid testing wine. How about > "Patches must not break building Wine nor its testsuite. Adding dead > code should also be avoided."? </bikeshed> Yes, sounds better. -- Best Regards, André Hentschel

June 27, 2011

Re: [PATCH 5/5] jscript/tests: Add tests with values related to INT_MAX

by Jacek Caban

On 06/26/11 18:28, Detlef Riekenberg wrote: > How can we force tests to use VT_UI4? It's not JScript builtin type, you need to extend tests host object for that. > -- > By by ... Detlef > --- > dlls/jscript/tests/lang.js | 31 +++++++++++++++++++++++++++++++ > 1 files changed, 31 insertions(+), 0 deletions(-) > > diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js > index b54eef2..b96788b 100644 > --- a/dlls/jscript/tests/lang.js > +++ b/dlls/jscript/tests/lang.js > @@ -306,6 +306,37 @@ tmp = 3/2; > ok(tmp === 1.5, "3/2 !== 1.5"); > ok(getVT(tmp) === "VT_R8", "getVT(3/2) !== VT_R8"); > > +/* 0x7fffffff is 2147483647 is INT_MAX */ > +tmp = 2147483647*-1; 0x... is correct jscript syntax, why not use it? Jacek

June 27, 2011

Re: [docs] winedev: A hint for patch separation

by Jerome Leclanche

That sounds like we want people to avoid testing wine. How about "Patches must not break building Wine nor its testsuite. Adding dead code should also be avoided."? </bikeshed> J. Leclanche 2011/6/26 André Hentschel <nerv(a)dawncrow.de>: > --- > en/winedev-coding.sgml | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml > index eacf6d8..8b0f0d9 100644 > --- a/en/winedev-coding.sgml > +++ b/en/winedev-coding.sgml > @@ -207,6 +207,10 @@ code > is your friend! > </para> > <para> > + Every patch must not break building and testing Wine and > + adding dead code should be avoided. > + </para> > + <para> > Save yourself some embarrassment and run your patched code > against more than just your current test example. Experience > will tell you how much effort to apply here. If there are > -- > > Best Regards, André Hentschel > > >

June 27, 2011