September 2008 - Wine-commits

Paul Vriens : kernel32/tests: Fix a few failures on win98.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 5737fb815c588327aa3325b95a30abd0768b5bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5737fb815c588327aa3325b95… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 8 08:19:45 2008 +0200 kernel32/tests: Fix a few failures on win98. --- dlls/kernel32/tests/thread.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 5c3d99e..697f34b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -372,6 +372,7 @@ static VOID test_CreateThread_basic(void) int error; DWORD i,j; DWORD GLE, ret; + DWORD tid; /* lstrlenA contains an exception handler so this makes sure exceptions work in the main thread */ ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); @@ -429,7 +430,7 @@ static VOID test_CreateThread_basic(void) /* Test how passing NULL as a pointer to threadid works */ SetLastError(0xFACEaBAD); - thread[0] = CreateThread(NULL,0,threadFunc2,NULL,0,NULL); + thread[0] = CreateThread(NULL,0,threadFunc2,NULL,0,&tid); GLE = GetLastError(); if (thread[0]) { /* NT */ ok(GLE==0xFACEaBAD, "CreateThread set last error to %d, expected 4207848365\n", GLE); @@ -1125,7 +1126,7 @@ static DWORD WINAPI TLS_ThreadProc(LPVOID p) if (sync_threads_and_run_one(0, id)) { HANDLE thread; - DWORD waitret; + DWORD waitret, tid; val = TlsGetValue(TLS_index0); ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); @@ -1135,7 +1136,7 @@ static DWORD WINAPI TLS_ThreadProc(LPVOID p) ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); ok(val == (LPVOID) 2, "TLS slot not initialized correctly\n"); - thread = CreateThread(NULL, 0, TLS_InheritanceProc, 0, 0, NULL); + thread = CreateThread(NULL, 0, TLS_InheritanceProc, 0, 0, &tid); ok(thread != NULL, "CreateThread failed\n"); waitret = WaitForSingleObject(thread, 60000); ok(waitret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); @@ -1173,7 +1174,9 @@ static void test_TLS(void) for (i = 0; i < 2; ++i) { - threads[i] = CreateThread(NULL, 0, TLS_ThreadProc, (LPVOID) i, 0, NULL); + DWORD tid; + + threads[i] = CreateThread(NULL, 0, TLS_ThreadProc, (LPVOID) i, 0, &tid); ok(threads[i] != NULL, "CreateThread failed\n"); } @@ -1221,7 +1224,8 @@ START_TEST(thread) while (1) { HANDLE hThread; - hThread = CreateThread(NULL, 0, threadFunc2, NULL, 0, NULL); + DWORD tid; + hThread = CreateThread(NULL, 0, threadFunc2, NULL, 0, &tid); ok(hThread != NULL, "CreateThread failed, error %u\n", GetLastError()); ok(WaitForSingleObject(hThread, 200) == WAIT_OBJECT_0,

1 0

James Hawkins : comctl32: Fix a typo.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 3e2ac662f130a4a8807ccd58c6cdb3b9157ac115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2ac662f130a4a8807ccd58c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:51:03 2008 -0500 comctl32: Fix a typo. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 805a48a..41e3a22 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -870,7 +870,7 @@ static void test_icon_spacing(void) /* now we can request what the defaults are */ r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1, -1)); w = LOWORD(r); - h = LOWORD(r); + h = HIWORD(r); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

James Hawkins : comctl32: Fix a failing test for some platforms.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 66e4be152af9e9faeb39cf83a684f31ff95ae290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e4be152af9e9faeb39cf83a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:52:38 2008 -0500 comctl32: Fix a failing test for some platforms. --- dlls/comctl32/tests/monthcal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index ba22beb..8b12364 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -50,6 +50,7 @@ static const struct message create_parent_window_seq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, + { WM_QUERYNEWPALETTE, sent|optional }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 },

1 0

James Hawkins : comctl32: Trace the first day of the week.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: e7d91854193b5b5d029c38678f5aa3aa0d28194e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d91854193b5b5d029c38678… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:54:40 2008 -0500 comctl32: Trace the first day of the week. --- dlls/comctl32/tests/monthcal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 8b12364..70d37c6 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -654,6 +654,7 @@ static void test_monthcal_firstDay(HWND hwnd) /* check for locale first day */ if(GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ fday = atoi(b); + trace("fday: %d\n", fday); res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); expect(fday, res); prev = fday;

1 0

James Hawkins : comctl32: Fix two test failures in win2000.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: a061f642d6bd9b0c8be759f5b4636b0687420327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a061f642d6bd9b0c8be759f5b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:55:32 2008 -0500 comctl32: Fix two test failures in win2000. --- dlls/comctl32/tests/trackbar.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 24c1edc..d82cd98 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -38,6 +38,7 @@ static const struct message create_parent_wnd_seq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, + { WM_QUERYNEWPALETTE, sent|optional }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, @@ -79,6 +80,7 @@ static const struct message parent_create_trackbar_wnd_seq[] = { }; static const struct message parent_new_window_test_seq[] = { + { WM_QUERYNEWPALETTE, sent|optional }, { WM_WINDOWPOSCHANGING, sent}, { WM_NCACTIVATE, sent}, { PBT_APMRESUMECRITICAL, sent},

1 0

James Hawkins : comctl32: Fix a failing test in win98.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 66483daf34d0d9f459844878e679ae530ea13831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66483daf34d0d9f459844878e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:48:43 2008 -0500 comctl32: Fix a failing test in win98. --- dlls/comctl32/tests/updown.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index c24ff1e..3d0557d 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -101,7 +101,7 @@ static const struct message add_updown_with_edit_seq[] = { static const struct message add_updown_to_parent_seq[] = { { WM_NOTIFYFORMAT, sent|lparam, 0, NF_QUERY }, - { WM_QUERYUISTATE, sent }, + { WM_QUERYUISTATE, sent|optional }, { WM_PARENTNOTIFY, sent|wparam, MAKELONG(WM_CREATE, WM_CREATE) }, { 0 } };

1 0

James Hawkins : comctl32: Fix several test failures in win98.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 106791c610920d04328b83f75c8899975ddbce74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=106791c610920d04328b83f75… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:49:25 2008 -0500 comctl32: Fix several test failures in win98. --- dlls/comctl32/tests/header.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index a3778cf..536d0d1 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -89,7 +89,7 @@ static const struct message add_header_to_parent_seq_interactive[] = { static const struct message add_header_to_parent_seq[] = { { WM_NOTIFYFORMAT, sent|lparam, 0, NF_QUERY }, - { WM_QUERYUISTATE, sent }, + { WM_QUERYUISTATE, sent|optional }, { WM_PARENTNOTIFY, sent }, { 0 } }; @@ -196,8 +196,8 @@ static const struct message filterMessages_seq_noninteractive[] = { { HDM_SETFILTERCHANGETIMEOUT, sent|wparam|lparam, 1, 100 }, { HDM_CLEARFILTER, sent|wparam|lparam, 0, 1 }, { HDM_EDITFILTER, sent|wparam|lparam, 1, 0 }, - { WM_PARENTNOTIFY, sent|wparam|defwinproc, WM_CREATE }, - { WM_COMMAND, sent|defwinproc }, + { WM_PARENTNOTIFY, sent|wparam|defwinproc|optional, WM_CREATE }, + { WM_COMMAND, sent|defwinproc|optional }, { 0 } }; @@ -811,7 +811,7 @@ static void test_hdm_getitemrect(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); retVal = SendMessage(hChild, HDM_GETITEMRECT, 1, (LPARAM) &rect); ok(retVal == TRUE, "Getting item rect should TRUE, got %d\n", retVal); @@ -855,7 +855,7 @@ static void test_hdm_layout(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessage(hChild, HDM_LAYOUT, 0, (LPARAM) &hdLayout); @@ -874,7 +874,7 @@ static void test_hdm_ordertoindex(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessage(hChild, HDM_ORDERTOINDEX, 1, 0); @@ -902,7 +902,7 @@ static void test_hdm_hittest(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); @@ -947,7 +947,7 @@ static void test_hdm_sethotdivider(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); todo_wine @@ -978,7 +978,7 @@ static void test_hdm_imageMessages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1005,7 +1005,7 @@ static void test_hdm_filterMessages(HWND hParent) hChild = create_custom_header_control(hParent, TRUE); assert(hChild); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); todo_wine @@ -1027,7 +1027,7 @@ static void test_hdm_filterMessages(HWND hParent) "filterMessages sequence testing", TRUE); else ok_sequence(sequences, HEADER_SEQ_INDEX, filterMessages_seq_noninteractive, - "filterMessages sequence testing", TRUE); + "filterMessages sequence testing", FALSE); DestroyWindow(hChild); } @@ -1040,7 +1040,7 @@ static void test_hdm_unicodeformatMessages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessage(hChild, HDM_SETUNICODEFORMAT, TRUE, 0); @@ -1061,7 +1061,7 @@ static void test_hdm_bitmapmarginMessages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessage(hChild, HDM_GETBITMAPMARGIN, 0, 0); @@ -1100,7 +1100,7 @@ static void test_hdm_index_messages(HWND hParent) "adder header control to parent", TRUE); else ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, - "adder header control to parent", TRUE); + "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); for ( loopcnt = 0 ; loopcnt < 4 ; loopcnt++ ) {

1 0

James Hawkins : comctl32: Fix a couple failing tests in win98.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: dcc230c567014bfe2dd269f4b27a81838a459560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc230c567014bfe2dd269f4b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:48:00 2008 -0500 comctl32: Fix a couple failing tests in win98. --- dlls/comctl32/tests/trackbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7acecfe..24c1edc 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -65,7 +65,7 @@ static const struct message parent_empty_test_seq[] = { static const struct message parent_create_trackbar_wnd_seq[] = { { WM_NOTIFYFORMAT, sent}, - { 0x0129, sent}, /* should be WM_QUERYUISTATE instead of 0x0129 */ + { WM_QUERYUISTATE, sent|optional}, { WM_WINDOWPOSCHANGING, sent}, { WM_NCACTIVATE, sent}, { PBT_APMRESUMECRITICAL, sent}, @@ -86,7 +86,7 @@ static const struct message parent_new_window_test_seq[] = { { WM_IME_NOTIFY, sent|defwinproc|optional}, { WM_SETFOCUS, sent|defwinproc}, { WM_NOTIFYFORMAT, sent}, - { 0x0129, sent}, /* should be WM_QUERYUISTATE instead of 0x0129*/ + { WM_QUERYUISTATE, sent|optional}, {0} };

1 0

James Hawkins : comctl32: Fix several failing tests in win98.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: f5e298d2db8ebbdce065816cdbe20106ff807746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e298d2db8ebbdce065816cd… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:46:00 2008 -0500 comctl32: Fix several failing tests in win98. --- dlls/comctl32/tests/tab.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 9489376..d311d50 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -92,7 +92,7 @@ static const struct message add_tab_to_parent[] = { { TCM_INSERTITEMA, sent }, { TCM_INSERTITEMA, sent }, { WM_NOTIFYFORMAT, sent|defwinproc }, - { WM_QUERYUISTATE, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_QUERYUISTATE, sent|wparam|lparam|defwinproc|optional, 0, 0 }, { WM_PARENTNOTIFY, sent|defwinproc }, { TCM_INSERTITEMA, sent }, { TCM_INSERTITEMA, sent }, @@ -125,7 +125,7 @@ static const struct message add_tab_to_parent_interactive[] = { static const struct message add_tab_control_parent_seq[] = { { WM_NOTIFYFORMAT, sent }, - { WM_QUERYUISTATE, sent|wparam|lparam, 0, 0 }, + { WM_QUERYUISTATE, sent|wparam|lparam|optional, 0, 0 }, { 0 } }; @@ -217,10 +217,10 @@ static const struct message getset_item_seq[] = { }; static const struct message getset_tooltip_seq[] = { - { WM_NOTIFYFORMAT, sent }, - { WM_QUERYUISTATE, sent|wparam|lparam, 0, 0 }, + { WM_NOTIFYFORMAT, sent|optional }, + { WM_QUERYUISTATE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_NOTIFYFORMAT, sent }, + { WM_NOTIFYFORMAT, sent|optional }, { TCM_SETTOOLTIPS, sent|lparam, 0 }, { TCM_GETTOOLTIPS, sent|wparam|lparam, 0, 0 }, { TCM_SETTOOLTIPS, sent|lparam, 0 }, @@ -241,7 +241,7 @@ static const struct message insert_focus_seq[] = { { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_INSERTITEM, sent|wparam, 2 }, { WM_NOTIFYFORMAT, sent|defwinproc, }, - { WM_QUERYUISTATE, sent|defwinproc, }, + { WM_QUERYUISTATE, sent|defwinproc|optional, }, { WM_PARENTNOTIFY, sent|defwinproc, }, { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 },

1 0

James Hawkins : comctl32: Allow a little slop in the status bar metric tests.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: d54963e5120a192924d5b6b861b8cba2ca54c528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54963e5120a192924d5b6b86… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:46:53 2008 -0500 comctl32: Allow a little slop in the status bar metric tests. --- dlls/comctl32/tests/status.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 0ca7a93..d0c19cb 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -27,10 +27,13 @@ #define SUBCLASS_NAME "MyStatusBar" #define expect(expected,got) ok (expected == got,"Expected %d, got %d\n",expected,got) -#define expect_rect(_left,_top,_right,_bottom,got) do { RECT _rcExp = {_left, _top, _right, _bottom}; \ - ok(memcmp(&_rcExp, &(got), sizeof(RECT)) == 0, "Expected rect {%d,%d, %d,%d}, got {%d,%d, %d,%d}\n", \ - _rcExp.left, _rcExp.top, _rcExp.right, _rcExp.bottom, \ - (got).left, (got).top, (got).right, (got).bottom); } while (0) +#define expect_rect(_left,_top,_right,_bottom,got) do { \ + RECT exp = {abs(got.left - _left), abs(got.top - _top), \ + abs(got.right - _right), abs(got.bottom - _bottom)}; \ + ok(exp.left <= 2 && exp.top <= 2 && exp.right <= 2 && exp.bottom <= 2, \ + "Expected rect {%d,%d, %d,%d}, got {%d,%d, %d,%d}\n", \ + _left, _top, _right, _bottom, \ + (got).left, (got).top, (got).right, (got).bottom); } while (0) static HINSTANCE hinst; static WNDPROC g_status_wndproc; @@ -166,25 +169,25 @@ static void test_height(void) ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); GetClientRect(hwndStatus, &rc2); - todo_wine expect_rect(0, 0, 672, 42, rc2); /* GetTextMetrics returns invalid tmInternalLeading for this font */ + expect_rect(0, 0, 672, 42, rc2); /* GetTextMetrics returns invalid tmInternalLeading for this font */ g_wmsize_count = 0; SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); GetClientRect(hwndStatus, &rc2); - todo_wine expect_rect(0, 0, 672, 42, rc2); + expect_rect(0, 0, 672, 42, rc2); /* minheight < fontsize - no effects*/ SendMessage(hwndStatus, SB_SETMINHEIGHT, 12, 0); SendMessage(hwndStatus, WM_SIZE, 0, 0); GetClientRect(hwndStatus, &rc2); - todo_wine expect_rect(0, 0, 672, 42, rc2); + expect_rect(0, 0, 672, 42, rc2); /* minheight > fontsize - has an effect after WM_SIZE */ SendMessage(hwndStatus, SB_SETMINHEIGHT, 60, 0); GetClientRect(hwndStatus, &rc2); - todo_wine expect_rect(0, 0, 672, 42, rc2); + expect_rect(0, 0, 672, 42, rc2); SendMessage(hwndStatus, WM_SIZE, 0, 0); GetClientRect(hwndStatus, &rc2); expect_rect(0, 0, 672, 62, rc2); @@ -194,7 +197,7 @@ static void test_height(void) expect_rect(0, 0, 672, 62, rc2); SendMessage(hwndStatus, WM_SIZE, 0, 0); GetClientRect(hwndStatus, &rc2); - todo_wine expect_rect(0, 0, 672, 42, rc2); + expect_rect(0, 0, 672, 42, rc2); hFontSm = CreateFont(9, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, "Tahoma"); SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFontSm, TRUE);

1 0