June 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Improve grid drawing on LVS_EX_GRIDLINES style.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 39398aedc7ce83deb5d975bc80beee659884a351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39398aedc7ce83deb5d975bc8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 4 02:43:06 2009 +0400 comctl32/listview: Improve grid drawing on LVS_EX_GRIDLINES style. --- dlls/comctl32/listview.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 63500f2..b50bf2b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4166,10 +4166,11 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) { INT rgntype; INT y, itemheight; + INT col, index; HPEN hPen, hOldPen; RECT rcClip, rcItem = {0}; POINT Origin; - RANGE colRange; + RANGES colRanges; ITERATOR j; BOOL rmost = FALSE; @@ -4182,21 +4183,23 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) /* Get scroll info once before loop */ LISTVIEW_GetOrigin(infoPtr, &Origin); + colRanges = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); + /* narrow down the columns we need to paint */ - for(colRange.lower = 0; colRange.lower < DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.lower++) - { - LISTVIEW_GetHeaderRect(infoPtr, colRange.lower, &rcItem); - if (rcItem.right + Origin.x >= rcClip.left) break; - } - for(colRange.upper = DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.upper > 0; colRange.upper--) + for(col = 0; col < DPA_GetPtrCount(infoPtr->hdpaColumns); col++) { - LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem); - if (rcItem.left + Origin.x < rcClip.right) break; + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); + + LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); + if ((rcItem.right + Origin.x >= rcClip.left) && (rcItem.left + Origin.x < rcClip.right)) + ranges_additem(colRanges, index); } + /* is right most vertical line visible? */ if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) { - LISTVIEW_GetHeaderRect(infoPtr, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, &rcItem); + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); rmost = (rcItem.right + Origin.x < rcClip.right); } @@ -4205,11 +4208,11 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) hOldPen = SelectObject ( hdc, hPen ); /* draw the vertical lines for the columns */ - iterator_rangeitems(&j, colRange); + iterator_rangesitems(&j, colRanges); while(iterator_next(&j)) { LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); - if (rcItem.left == 0) continue; /* skip first column */ + if (rcItem.left == 0) continue; /* skip leftmost column */ rcItem.left += Origin.x; rcItem.right += Origin.x; rcItem.top = infoPtr->rcList.top; @@ -4222,8 +4225,14 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) /* draw rightmost grid line if visible */ if (rmost) { - MoveToEx (hdc, rcItem.right, rcItem.top, NULL); - LineTo (hdc, rcItem.right, rcItem.bottom); + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); + + rcItem.right += Origin.x; + + MoveToEx (hdc, rcItem.right, infoPtr->rcList.top, NULL); + LineTo (hdc, rcItem.right, infoPtr->rcList.bottom); } /* draw the horizontial lines for the rows */

1 0

Nikolay Sivov : comctl32/listview: Improve item visibility calculation for report view.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: f8904e156fafa6b25eb70d50bbb0029fd0e1a3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8904e156fafa6b25eb70d50b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 4 01:43:28 2009 +0400 comctl32/listview: Improve item visibility calculation for report view. --- dlls/comctl32/listview.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b83c697..63500f2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4096,7 +4096,8 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, INT rgntype; RECT rcClip, rcItem; POINT Origin, Position; - RANGE colRange; + RANGES colRanges; + INT col, index; ITERATOR j; TRACE("()\n"); @@ -4107,19 +4108,19 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* Get scroll info once before loop */ LISTVIEW_GetOrigin(infoPtr, &Origin); - + + colRanges = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); + /* narrow down the columns we need to paint */ - for(colRange.lower = 0; colRange.lower < DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.lower++) + for(col = 0; col < DPA_GetPtrCount(infoPtr->hdpaColumns); col++) { - LISTVIEW_GetHeaderRect(infoPtr, colRange.lower, &rcItem); - if (rcItem.right + Origin.x >= rcClip.left) break; - } - for(colRange.upper = DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.upper > 0; colRange.upper--) - { - LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem); - if (rcItem.left + Origin.x < rcClip.right) break; + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); + + LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); + if ((rcItem.right + Origin.x >= rcClip.left) && (rcItem.left + Origin.x < rcClip.right)) + ranges_additem(colRanges, index); } - iterator_rangeitems(&j, colRange); + iterator_rangesitems(&j, colRanges); /* in full row select, we _have_ to draw the main item */ if (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)

1 0

Alexandre Julliard : user32/tests: More systematically ignore the messages we don't care about.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 7b40a2fa95e5f5f3b8d31b8c65d1cdb5d7d953e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b40a2fa95e5f5f3b8d31b8c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 11:45:33 2009 +0200 user32/tests: More systematically ignore the messages we don't care about. --- dlls/user32/tests/win.c | 69 ++++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 43988b5..d45eba3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2634,6 +2634,17 @@ static void test_capture_3(HWND hwnd1, HWND hwnd2) ok (ret, "releasecapture did not return TRUE after second try.\n"); } +/* PeekMessage wrapper that ignores the messages we don't care about */ +static BOOL peek_message( MSG *msg ) +{ + BOOL ret; + do + { + ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + } while (ret && (msg->message == WM_TIMER || ignore_message(msg->message))); + return ret; +} + static void test_keyboard_input(HWND hwnd) { MSG msg; @@ -2652,40 +2663,31 @@ static void test_keyboard_input(HWND hwnd) flush_events( TRUE ); PostMessageA(hwnd, WM_KEYDOWN, 0, 0); - do - { - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - ok( ret, "no message available\n"); - } - while (ret && msg.message >= 0xc000); + ret = peek_message(&msg); + ok( ret, "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - do - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - while (ret && (msg.message == WM_TIMER || msg.message >= 0xc000)); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == hwnd, "wrong focus window %p\n", GetFocus()); PostThreadMessageA(GetCurrentThreadId(), WM_KEYDOWN, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = peek_message(&msg); + ok(ret, "no message available\n"); ok(!msg.hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == hwnd, "wrong focus window %p\n", GetFocus()); keybd_event(VK_SPACE, 0, 0, 0); - do - { - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - } while (ret && msg.message >= 0xc000); - if (!ret) + if (!peek_message(&msg)) { skip( "keybd_event didn't work, skipping keyboard test\n" ); return; } ok(msg.hwnd == hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); SetFocus(0); @@ -2694,25 +2696,28 @@ static void test_keyboard_input(HWND hwnd) flush_events( TRUE ); PostMessageA(hwnd, WM_KEYDOWN, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = peek_message(&msg); + ok(ret, "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == 0, "wrong focus window %p\n", GetFocus()); PostThreadMessageA(GetCurrentThreadId(), WM_KEYDOWN, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = peek_message(&msg); + ok(ret, "no message available\n"); ok(!msg.hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == 0, "wrong focus window %p\n", GetFocus()); keybd_event(VK_SPACE, 0, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = peek_message(&msg); + ok(ret, "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_SYSKEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); } @@ -2722,11 +2727,11 @@ static BOOL wait_for_message( MSG *msg ) for (;;) { - ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(msg); if (ret) { if (msg->message == WM_PAINT) DispatchMessage(msg); - else if (!ignore_message(msg->message)) break; + else break; } else if (MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ) == WAIT_TIMEOUT) break; } @@ -2779,9 +2784,7 @@ static void test_mouse_input(HWND hwnd) /* Check that setting the same position may generate WM_MOUSEMOVE */ SetCursorPos(x, y); msg.message = 0; - do - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - while (ret && msg.message >= 0xc000); /* skip registered messages */ + ret = peek_message(&msg); if (ret) { ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", @@ -2802,11 +2805,11 @@ static void test_mouse_input(HWND hwnd) /* FIXME: SetCursorPos in Wine generates additional WM_MOUSEMOVE message */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { - if (msg.message == WM_TIMER || msg.message >= 0xc000) continue; /* skip registered messages */ + if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); } - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); mouse_event(MOUSEEVENTF_MOVE, -1, -1, 0, 0); @@ -2866,7 +2869,7 @@ static void test_mouse_input(HWND hwnd) ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok(!ret, "message %04x available\n", msg.message); ShowWindow(popup, SW_HIDE); @@ -2894,10 +2897,10 @@ static void test_mouse_input(HWND hwnd) ok(ret, "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ok(peek_message(&msg), "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ok(peek_message(&msg), "no message available\n"); /* Test WM_MOUSEACTIVATE */ #define TEST_MOUSEACTIVATE(A,B) \

1 0

Piotr Caban : jscript: Remove NaN related FIXMEs.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: eb203a149b2d3a20525ddb2eca4edb2ae59f5887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb203a149b2d3a20525ddb2ec… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 3 21:11:20 2009 +0200 jscript: Remove NaN related FIXMEs. --- dlls/jscript/date.c | 5 +---- dlls/jscript/global.c | 4 ++-- dlls/jscript/jscript.h | 7 +++++++ dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 6 ++++++ 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 0dac085..53ff314 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -81,11 +81,8 @@ static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l', /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { - /* FIXME: Handle inf */ - if(8.64e15 < time || time < -8.64e15) { - FIXME("return NaN\n"); - return 0.0; + return ret_nan(); } return floor(time); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 01d9eb2..a714f8e 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -351,8 +351,8 @@ static HRESULT JSGlobal_parseInt(DispatchEx *dispex, LCID lcid, WORD flags, DISP HRESULT hres; if(!arg_cnt(dp)) { - FIXME("NAN\n"); - return E_NOTIMPL; + if(retv) num_set_nan(retv); + return S_OK; } if(arg_cnt(dp) >= 2) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4862b28..6cf3535 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -255,6 +255,13 @@ static inline void num_set_nan(VARIANT *v) #endif } +static inline DOUBLE ret_nan() +{ + VARIANT v; + num_set_nan(&v); + return V_R8(&v); +} + static inline void num_set_inf(VARIANT *v, BOOL positive) { V_VT(v) = VT_R8; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index eeceb1f..82c1043 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -254,8 +254,8 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP return hres; if(V_VT(&v) != VT_I4 || V_I4(&v) < 0 || V_I4(&v) >= length) { - FIXME("NAN\n"); - return E_FAIL; + if(retv) num_set_nan(&v); + return S_OK; } idx = V_I4(&v); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a17b067..2b6e0b2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -934,6 +934,12 @@ var date = new Date(); date = new Date(100); ok(date.getTime() === 100, "date.getTime() = " + date.getTime()); ok(Date.prototype.getTime() === 0, "date.prototype.getTime() = " + Date.prototype.getTime()); +date = new Date(8.64e15); +ok(date.getTime() === 8.64e15, "date.getTime() = " + date.getTime()); +date = new Date(8.64e15+1); +ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); +date = new Date(Infinity); +ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Andrew Talbot : comctl32: Various const qualifier fixes.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: b898f8dd582dc52bbf6b42ca5a19a12988edb21a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b898f8dd582dc52bbf6b42ca5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jun 3 21:47:16 2009 +0100 comctl32: Various const qualifier fixes. --- dlls/comctl32/comctl32.h | 6 +++--- dlls/comctl32/dpa.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 872638d..1f2f63e 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -183,15 +183,15 @@ DWORD WINAPI GetSize (LPVOID); INT WINAPI Str_GetPtrA (LPCSTR, LPSTR, INT); INT WINAPI Str_GetPtrW (LPCWSTR, LPWSTR, INT); -INT WINAPI DPA_GetPtrIndex (const HDPA, LPVOID); -BOOL WINAPI DPA_Grow (const HDPA, INT); +INT WINAPI DPA_GetPtrIndex (HDPA, LPCVOID); +BOOL WINAPI DPA_Grow (HDPA, INT); #define DPAM_NOSORT 0x0001 #define DPAM_INSERT 0x0004 #define DPAM_DELETE 0x0008 typedef PVOID (CALLBACK *PFNDPAMERGE)(DWORD,PVOID,PVOID,LPARAM); -BOOL WINAPI DPA_Merge (const HDPA, const HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM); +BOOL WINAPI DPA_Merge (HDPA, HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM); #define DPA_GetPtrCount(hdpa) (*(INT*)(hdpa)) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index a14c530..bbad10d 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -217,7 +217,7 @@ HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, * NOTES * No more information available yet! */ -BOOL WINAPI DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, +BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, LPARAM lParam) { @@ -381,7 +381,7 @@ BOOL WINAPI DPA_Destroy (const HDPA hdpa) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_Grow (const HDPA hdpa, INT nGrow) +BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow) { TRACE("(%p %d)\n", hdpa, nGrow); @@ -504,7 +504,7 @@ LPVOID WINAPI DPA_GetPtr (const HDPA hdpa, INT nIndex) * Success: index of the specified pointer * Failure: -1 */ -INT WINAPI DPA_GetPtrIndex (const HDPA hdpa, LPVOID p) +INT WINAPI DPA_GetPtrIndex (HDPA hdpa, LPCVOID p) { INT i;

1 0

Paul Vriens : ole32/tests: Fix remaining test failures on NT4 and below.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: cb81487707ce146823d5a5df1534e156329085be URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb81487707ce146823d5a5df1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 3 17:15:30 2009 +0200 ole32/tests: Fix remaining test failures on NT4 and below. --- dlls/ole32/tests/storage32.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e561861..29ff0c6 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1336,8 +1336,11 @@ static void test_simple(void) ok(upos.QuadPart == 3, "got %d\n", upos.u.LowPart); r = IStream_Stat(stm, &stat, STATFLAG_NONAME); - ok(r == S_OK, "got %08x\n", r); - ok(stat.cbSize.QuadPart == 3, "got %d\n", stat.cbSize.u.LowPart); + ok(r == S_OK || + broken(r == STG_E_INVALIDFUNCTION), /* NT4 and below */ + "got %08x\n", r); + if (r == S_OK) + ok(stat.cbSize.QuadPart == 3, "got %d\n", stat.cbSize.u.LowPart); pos.QuadPart = 1; r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); @@ -1345,8 +1348,11 @@ static void test_simple(void) ok(upos.QuadPart == 1, "got %d\n", upos.u.LowPart); r = IStream_Stat(stm, &stat, STATFLAG_NONAME); - ok(r == S_OK, "got %08x\n", r); - ok(stat.cbSize.QuadPart == 1, "got %d\n", stat.cbSize.u.LowPart); + ok(r == S_OK || + broken(r == STG_E_INVALIDFUNCTION), /* NT4 and below */ + "got %08x\n", r); + if (r == S_OK) + ok(stat.cbSize.QuadPart == 1, "got %d\n", stat.cbSize.u.LowPart); IStream_Release(stm);

1 0

Paul Vriens : user32/tests: Fix a test failure on Win95.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: f9ecd7397eefdee6dd11f3ccd478d1d72607f2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ecd7397eefdee6dd11f3ccd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 4 10:54:25 2009 +0200 user32/tests: Fix a test failure on Win95. --- dlls/user32/tests/sysparams.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d055fa0..7b2edaf 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2731,12 +2731,14 @@ static void test_EnumDisplaySettings(void) DWORD num; memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); + /* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */ EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); - ok(devmode.dmBitsPerPel == val, "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", + ok(devmode.dmBitsPerPel == val || + broken(devmode.dmDeviceName[0] == 0), /* Win95 */ + "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", val, devmode.dmBitsPerPel); val = GetDeviceCaps(hdc, NUMCOLORS);

1 0

Piotr Caban : jscript: Fix parse_double_literal implementation.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 931554dd4af64d6ec208152f1e1b8b19c3274cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=931554dd4af64d6ec208152f1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 3 23:17:47 2009 +0200 jscript: Fix parse_double_literal implementation. --- dlls/jscript/lex.c | 42 ++++++++++++++++++++++++++++++++++-------- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index c066397..5b7e7a4 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff) + static const WCHAR breakW[] = {'b','r','e','a','k',0}; static const WCHAR caseW[] = {'c','a','s','e',0}; static const WCHAR catchW[] = {'c','a','t','c','h',0}; @@ -373,7 +375,8 @@ static literal_t *alloc_int_literal(parser_ctx_t *ctx, LONG l) static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **literal) { - double d, tmp = 1.0; + LONGLONG d, hlp; + int exp = 0; if(ctx->ptr == ctx->end || (!isdigitW(*ctx->ptr) && *ctx->ptr!='.' && *ctx->ptr!='e' && *ctx->ptr!='E')) { @@ -382,13 +385,32 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li } d = int_part; - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - d = d*10 + *(ctx->ptr++) - '0'; + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>LONGLONG_MAX/10 || hlp<0) { + exp++; + break; + } + else + d = hlp; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + exp++; + ctx->ptr++; + } if(*ctx->ptr == '.') ctx->ptr++; + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>LONGLONG_MAX/10 || hlp<0) + break; + + d = hlp; + exp--; + } while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - d += (tmp /= 10.0)*(*ctx->ptr++ - '0'); + ctx->ptr++; if(ctx->ptr < ctx->end && (*ctx->ptr == 'e' || *ctx->ptr == 'E')) { int sign = 1, e = 0; @@ -411,16 +433,20 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li return lex_error(ctx, E_FAIL); } - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - e = e*10 + *ctx->ptr++ - '0'; + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + if(e > INT_MAX/10 || (e = e*10 + *ctx->ptr++ - '0')<0) + e = INT_MAX; + } e *= sign; - d *= pow(10, e); + if(exp<0 && e<0 && e+exp>0) exp = INT_MIN; + else if(exp>0 && e>0 && e+exp<0) exp = INT_MAX; + else exp += e; } *literal = parser_alloc(ctx, sizeof(literal_t)); (*literal)->vt = VT_R8; - (*literal)->u.dval = d; + (*literal)->u.dval = (double)d*pow(10, exp); return tNumericLiteral; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c4f0194..86eba86 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -35,6 +35,8 @@ ok(undefined === undefined, "undefined === undefined is false"); ok(!(undefined === null), "!(undefined === null) is false"); ok(1E0 === 1, "1E0 === 1 is false"); ok(1000000*1000000 === 1000000000000, "1000000*1000000 === 1000000000000 is false"); +ok(8.64e15 === 8640000000000000, "8.64e15 !== 8640000000000000"+8.64e15); +ok(1e2147483648 === Infinity, "1e2147483648 !== Infinity"); ok(1 !== 2, "1 !== 2 is false"); ok(null !== undefined, "null !== undefined is false");

1 0

Paul Vriens : user32/tests: Remove a trace() message.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: 96ef5d38affd2daacb1170fcdd54354fd4a10ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ef5d38affd2daacb1170fcd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 4 09:32:43 2009 +0200 user32/tests: Remove a trace() message. --- dlls/user32/tests/msg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 72cf9ed..dfc4c0d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3972,7 +3972,6 @@ static void test_hv_scroll_1(HWND hwnd, INT ctl, DWORD clear, DWORD set, INT min xmin = 0xdeadbeef; xmax = 0xdeadbeef; - trace("Ignore GetScrollRange error below if you are on Win9x\n"); ret = GetScrollRange(hwnd, ctl, &xmin, &xmax); ok( ret, "GetScrollRange(%d) error %d\n", ctl, GetLastError()); ok_sequence(WmEmptySeq, "GetScrollRange(SB_HORZ/SB_VERT) empty sequence", FALSE);

1 0

Paul Vriens : kernel32/tests: Skip WritePrivateProfileString tests on Win9x /WinME.
by Alexandre Julliard June 4, 2009

June 4, 2009

Module: wine Branch: master Commit: eca3d7487715d92dc43c841d8bb8a6f9522bc4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca3d7487715d92dc43c841d8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 3 21:56:10 2009 +0200 kernel32/tests: Skip WritePrivateProfileString tests on Win9x/WinME. --- dlls/kernel32/tests/profile.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index fbf5d24..b9a71d3 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -822,18 +822,12 @@ static void test_GetPrivateProfileString(const char *content, const char *descri DeleteFileA(filename); } -static DWORD timeout = 0; - static BOOL check_binary_file_data(LPCSTR path, const VOID *data, DWORD size) { HANDLE file; CHAR buf[MAX_PATH]; BOOL ret; - /* Sleep() is needed on Win9x and WinME */ - if (timeout) - Sleep(timeout); - file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) return FALSE; @@ -864,6 +858,19 @@ static void test_WritePrivateProfileString(void) CHAR path[MAX_PATH]; CHAR temp[MAX_PATH]; + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringW(NULL, NULL, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* Win9x/WinME needs (variable) timeouts between tests and even long timeouts don't + * guarantee a correct result. + * Win9x/WinMe also produces different ini files where there is always a newline before + * a section start (except for the first one). + */ + win_skip("WritePrivateProfileString on Win9x/WinME is hard to test reliably\n"); + return; + } + GetTempPathA(MAX_PATH, temp); GetTempFileNameA(temp, "wine", 0, path); DeleteFileA(path); @@ -878,8 +885,6 @@ static void test_WritePrivateProfileString(void) broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - if (GetLastError() == 0xdeadbeef) - timeout = 1000; ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, "Expected path to not exist\n");

1 0