July 2011 - Wine-devel - list.winehq.org

Re: kernel32/tests/debugger: remove win9x hacks
by Dmitry Timoshkov 27 Jul '11

27 Jul '11

Austin English <austinenglish(a)gmail.com> wrote: > - if (disposition == REG_CREATED_NEW_KEY) > - win_skip("'dbg,event,order' test doesn't finish on Win9x/WinMe\n"); > - else > - crash_and_debug(hkey, test_exe, "dbg,event,order"); > + crash_and_debug(hkey, test_exe, "dbg,event,order"); You should check 'disposition' instead of removing it altogether. -- Dmitry.

1 0

Re: kernel32/tests/atom: remove win9x hacks
by Dmitry Timoshkov 27 Jul '11

27 Jul '11

Austin English <austinenglish(a)gmail.com> wrote: > len = GlobalGetAtomNameA( (ATOM)i, buf, 2); > - if (!len) /* the NT way */ > - { > - ok(GetLastError() == (i ? ERROR_MORE_DATA : ERROR_INVALID_PARAMETER) || > - GetLastError() == 0xdeadbeef, /* the Win 9x way */ > - "wrong error conditions %u for %u\n", GetLastError(), i); > - } > - else /* the Win 9x way */ > - { > - ok(GetLastError() == 0xdeadbeef, > - "wrong error conditions %u for %u\n", GetLastError(), i); > - } > + ok(GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INVALID_PARAMETER, > + "wrong error conditions %u for %u\n", GetLastError(), i); > } You should add an ok(!len) check here. > len = GlobalGetAtomNameA(atom, out, 10); > - if (!len) /* the NT way */ > - { > - ok(GetLastError() == ERROR_MORE_DATA, "wrong error code (%u instead of %u)\n", GetLastError(), ERROR_MORE_DATA); > - } > - else /* the Win9x way */ > - { > - ok(GetLastError() == 0xdeadbeef, "wrong error code (%u instead of %u)\n", GetLastError(), 0xdeadbeef); > - } > + ok(GetLastError() == ERROR_MORE_DATA, "wrong error code (%u instead of %u)\n", GetLastError(), ERROR_MORE_DATA); And here. -- Dmitry.

1 0

Re: gdi32/tests/mapping: remove win9x hacks
by Dmitry Timoshkov 27 Jul '11

27 Jul '11

Austin English <austinenglish(a)gmail.com> wrote: > - if (is_win9x) > - { > - expect_viewport_ext(hdc, dpi_x, dpi_y); > - expect_window_ext(hdc, 254, -254); > - } > - else > - { > - expect_viewport_ext(hdc, res_x, -res_y); > - ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); > - ok( rough_match( size.cx, size_cx * 10 ) || > - rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ > - "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); > - ok( rough_match( size.cy, size_cy * 10 ) || > - rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ > - "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); > - } > + ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); > + ok( rough_match( size.cx, size_cx * 10 ) || > + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ > + "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); > + ok( rough_match( size.cy, size_cy * 10 ) || > + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ > + "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); > expect_world_transform(hdc, 1.0, 1.0); > expect_LPtoDP(hdc, MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); You've lost 'expect_viewport_ext(hdc, res_x, -res_y);' from the 'else' block. -- Dmitry.

1 0

Re: kernel32/tests/sync: remove win9x hacks
by Marvin 27 Jul '11

27 Jul '11

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 http://testbot.winehq.org/JobDetails.pl?Key=12916 Your paranoid android. === W7PRO (32 bit sync) === sync.c:849: Test failed: ChangeTimerQueueTimer

1 0

Re: [3/3] ddraw/tests: Add a couple of fog tests.
by Marvin 26 Jul '11

26 Jul '11

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 http://testbot.winehq.org/JobDetails.pl?Key=12866 Your paranoid android. === WINEBUILD (build) === Make failed

2 1

Re: [3/3] d3d9/tests: Add a couple of fog tests.
by Marvin 26 Jul '11

26 Jul '11

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 http://testbot.winehq.org/JobDetails.pl?Key=12862 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: comctl32: Remove dead increments (clang)
by Marcus Meissner 26 Jul '11

26 Jul '11

On Tue, Jul 26, 2011 at 09:15:57PM +0200, André Hentschel wrote: > --- > dlls/comctl32/propsheet.c | 1 - > dlls/comctl32/rebar.c | 2 -- > 2 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c > index f711399..3dd0713 100644 > --- a/dlls/comctl32/propsheet.c > +++ b/dlls/comctl32/propsheet.c > @@ -543,7 +543,6 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, > /* Extract the caption */ > psInfo->proppage[index].pszText = p; > TRACE("Tab %d %s\n",index,debugstr_w( p )); > - p += lstrlenW( p ) + 1; > > if (dwFlags & PSP_USETITLE) > { > diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c > index 99bde77..8d4e6f3 100644 > --- a/dlls/comctl32/rebar.c > +++ b/dlls/comctl32/rebar.c > @@ -1576,8 +1576,6 @@ REBAR_SizeToHeight(REBAR_INFO *infoPtr, int height) > iRow++; > } > } > - else > - extra -= REBAR_SizeChildrenToHeight(infoPtr, first_visible(infoPtr), infoPtr->uNumBands, extra / infoPtr->uNumRows, &fChanged); > > if (fChanged) > REBAR_Layout(infoPtr); REBAR_SizeChildrenToHeight might set fChanged here, or? Ciao, Marcus

1 0

Re: comctl32: Remove dead increments (clang)
by Reece Dunn 26 Jul '11

26 Jul '11

2011/7/26 André Hentschel <nerv(a)dawncrow.de>: > --- a/dlls/comctl32/rebar.c > +++ b/dlls/comctl32/rebar.c > @@ -1576,8 +1576,6 @@ REBAR_SizeToHeight(REBAR_INFO *infoPtr, int height) > iRow++; > } > } > - else > - extra -= REBAR_SizeChildrenToHeight(infoPtr, first_visible(infoPtr), infoPtr->uNumBands, extra / infoPtr->uNumRows, &fChanged); IIUC, this should not remove the |REBAR_SizeChildrenToHeight| call, only the |extra -=| bit as |REBAR_SizeChildrenToHeight| is updating the |infoPtr| output parameter. - Reece

1 0

d3d8/tests: make sure to use return values (LLVM/Clang)
by Austin English 26 Jul '11

26 Jul '11

-- -Austin

4 8

Re: richedit: Implement WB_DELIMITER and remove todo_wine's in tests.
by Paul Vriens 26 Jul '11

26 Jul '11

On 07/26/2011 03:36 AM, James McKenzie wrote: > if (wbuf[0] == 0x20 || wbuf[0] == 0xf020) > - todo_wine > - ok(result == delimiter_tests[i].isdelimiter, > - "wanted ISDELIMITER_W(0x%x) %d, got %d\n", > - delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); > + ok(result == delimiter_tests[i].isdelimiter, > + "wanted ISDELIMITER_W(0x%x) %d, got %d\n", > + delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); > else > ok(result == delimiter_tests[i].isdelimiter, > "wanted ISDELIMITER_W(0x%x) %d, got %d\n", > @@ -7122,10 +7121,9 @@ static void test_EM_FINDWORDBREAK_A(void) > SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); > result = SendMessage(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0); > if (buf[0] == 0x20) > - todo_wine > - ok(result == delimiter_tests[i].isdelimiter, > - "wanted ISDELIMITER_A(0x%x) %d, got %d\n", > - delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); > + ok(result == delimiter_tests[i].isdelimiter, > + "wanted ISDELIMITER_A(0x%x) %d, got %d\n", > + delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); > else Hi James, I think that the if/else was introduced to accommodate the todo_wine(). I guess you can remove more lines as the 'if' now contains the same code as the 'else'. -- Cheers, Paul.

1 0