February 2009 - Wine-Commits

Juan Lang : kernel32: Fix some test failures on systems with reduced privilege.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: 0edcef6d5e533e50ce24c4d2fea1bfd93a04a713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edcef6d5e533e50ce24c4d2f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 14:13:15 2009 -0800 kernel32: Fix some test failures on systems with reduced privilege. --- dlls/kernel32/tests/file.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a96ea92..925ad6a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2323,6 +2323,7 @@ static void test_ReplaceFileW(void) static const WCHAR prefix[] = {'p','f','x',0}; WCHAR temp_path[MAX_PATH]; DWORD ret; + BOOL removeBackup = FALSE; if (!pReplaceFileW) { @@ -2351,25 +2352,31 @@ static void test_ReplaceFileW(void) ret = GetTempFileNameW(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameW error (replacement) %d\n", GetLastError()); ret = pReplaceFileW(replaced, replacement, NULL, 0, 0, 0); - ok(ret, "ReplaceFileW: error %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "ReplaceFileW: error %d\n", GetLastError()); ret = GetTempFileNameW(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameW error (replacement) %d\n", GetLastError()); ret = DeleteFileW(backup); ok(ret, "DeleteFileW: error (backup) %d\n", GetLastError()); ret = pReplaceFileW(replaced, replacement, backup, 0, 0, 0); - ok(ret, "ReplaceFileW: error %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "ReplaceFileW: error %d\n", GetLastError()); ret = GetTempFileNameW(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameW error (replacement) %d\n", GetLastError()); ret = SetFileAttributesW(replaced, FILE_ATTRIBUTE_READONLY); - ok(ret, "SetFileAttributesW: error setting to read only %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "SetFileAttributesW: error setting to read only %d\n", GetLastError()); ret = pReplaceFileW(replaced, replacement, backup, 0, 0, 0); ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, "ReplaceFileW: unexpected error %d\n", GetLastError()); ret = SetFileAttributesW(replaced, FILE_ATTRIBUTE_NORMAL); - ok(ret, "SetFileAttributesW: error setting to normal %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "SetFileAttributesW: error setting to normal %d\n", GetLastError()); + if (ret) + removeBackup = TRUE; ret = DeleteFileW(replaced); ok(ret, "DeleteFileW: error (replaced) %d\n", GetLastError()); @@ -2377,13 +2384,17 @@ static void test_ReplaceFileW(void) ok(!ret, "ReplaceFileW: error %d\n", GetLastError()); ret = pReplaceFileW(replaced, replacement, NULL, 0, 0, 0); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_ACCESS_DENIED), "ReplaceFileW: unexpected error %d\n", GetLastError()); - ret = DeleteFileW(backup); - ok(ret || - broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ - "DeleteFileW: error (backup) %d\n", GetLastError()); + if (removeBackup) + { + ret = DeleteFileW(backup); + ok(ret || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ + "DeleteFileW: error (backup) %d\n", GetLastError()); + } } START_TEST(file)

1 0

Alexandre Julliard : user32/tests: Cope with lack of support for color cursors.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: 09761ee96fcffe918524d57a181f808a484fcabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=09761ee96fcffe918524d57a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 13:10:59 2009 +0100 user32/tests: Cope with lack of support for color cursors. --- dlls/user32/tests/cursoricon.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index fc1ceaa..d67de48 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -840,7 +840,8 @@ static void test_LoadImage(void) ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); ok(icon_info.xHotspot == 1, "xHotspot is %u.\n", icon_info.xHotspot); ok(icon_info.yHotspot == 1, "yHotspot is %u.\n", icon_info.yHotspot); - ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + ok(icon_info.hbmColor != NULL || broken(!icon_info.hbmColor) /* no color cursor support */, + "No hbmColor!\n"); ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); }

1 0

Alexandre Julliard : user32/tests: GetClassInfo doesn' t set last error reliably, remove test.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: 96e7da5c55b9ee2a98862d4a11153c1854a4b6eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e7da5c55b9ee2a98862d4a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 13:10:44 2009 +0100 user32/tests: GetClassInfo doesn't set last error reliably, remove test. --- dlls/user32/tests/class.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index f2711a4..a1ae4bd 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -554,10 +554,7 @@ static void test_instances(void) ok( !UnregisterClass( "BUTTON", (HINSTANCE)0x87654321 ), "Unregistered button a second time\n" ); ok( GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, "Wrong error code %d\n", GetLastError() ); ok( !GetClassInfo( 0, "BUTTON", &wc ), "Button still exists\n" ); - ok( GetLastError() == ERROR_CLASS_DOES_NOT_EXIST || - GetLastError() == ERROR_INVALID_PARAMETER || /* W2K3 */ - GetLastError() == ERROR_SUCCESS /* Vista */, - "Wrong error code %d\n", GetLastError() ); + /* last error not set reliably */ /* we can change the instance of a system class */ check_instance( "EDIT", (HINSTANCE)0xdeadbeef, (HINSTANCE)0xdeadbeef, user32 );

1 0

Alexandre Julliard : user32/tests: Skip tests if we fail to inject mouse or keyboard events.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: 2d155031ccb18e987a9f9805c02d901c57fe7925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d155031ccb18e987a9f9805c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 13:03:26 2009 +0100 user32/tests: Skip tests if we fail to inject mouse or keyboard events. --- dlls/user32/tests/win.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3161d73..c72c114 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2657,7 +2657,12 @@ static void test_keyboard_input(HWND hwnd) ok(GetFocus() == hwnd, "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 = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + if (!ret) + { + 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); ok( !ret, "message %04x available\n", msg.message); @@ -2742,7 +2747,11 @@ static void test_mouse_input(HWND hwnd) SetCursorPos(x, y); GetCursorPos(&pt); - ok(x == pt.x && y == pt.y, "wrong cursor pos (%d,%d), expected (%d,%d)\n", pt.x, pt.y, x, y); + if (x != pt.x || y != pt.y) + { + skip( "failed to set mouse position, skipping mouse input tests\n" ); + goto done; + } flush_events( TRUE ); @@ -2807,7 +2816,11 @@ static void test_mouse_input(HWND hwnd) mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); ret = wait_for_message( &msg ); - ok(ret, "no message available\n"); + if (!ret) + { + skip( "simulating mouse click doesn't work, skipping mouse button tests\n" ); + goto done; + } if (msg.message == WM_MOUSEMOVE) /* win2k has an extra WM_MOUSEMOVE here */ { ret = wait_for_message( &msg ); @@ -2895,6 +2908,7 @@ static void test_mouse_input(HWND hwnd) TEST_MOUSEACTIVATE(HTCLOSE,MA_ACTIVATE); TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE); +done: /* Clear any messages left behind by WM_MOUSEACTIVATE tests */ flush_events( TRUE );

1 0

Alexandre Julliard : user32/tests: Fix more message tests on XP and Vista.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: 4fc6dbd86da96655ce0964a7de202171d5f7f0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc6dbd86da96655ce0964a7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 13:02:08 2009 +0100 user32/tests: Fix more message tests on XP and Vista. --- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ee39224..a865d74 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -515,7 +515,7 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = { }; /* ShowWindow(SW_RESTORE) for a not visible minimized overlapped window */ static const struct message WmShowRestoreMinOverlappedSeq[] = { - { HCBT_MINMAX, hook|lparam|optional, 0, SW_RESTORE }, + { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_QUERYOPEN, sent|optional }, { WM_GETTEXT, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED|SWP_NOCOPYBITS }, @@ -576,6 +576,7 @@ static const struct message WmShowMinOverlappedSeq[] = { { WM_ACTIVATE, sent }, { WM_ACTIVATEAPP, sent|wparam, 0 }, { WM_SYSCOMMAND, sent|optional|wparam, SC_RESTORE }, + { HCBT_SYSCOMMAND, hook|optional|wparam, SC_RESTORE }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, @@ -1837,7 +1838,6 @@ static void flush_events(void) if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); - min_timeout = 50; } } @@ -4439,21 +4439,28 @@ static void test_messages(void) ShowWindow(hwnd, SW_SHOWMAXIMIZED); flush_events(); ok_sequence(WmShowMaxOverlappedSeq, "ShowWindow(SW_SHOWMAXIMIZED):overlapped", TRUE); - - ShowWindow(hwnd, SW_RESTORE); - ok_sequence(WmShowRestoreMaxOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", FALSE); - flush_events(); flush_sequence(); + if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MAXIMIZE) + { + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMaxOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", FALSE); + flush_sequence(); + } + ShowWindow(hwnd, SW_MINIMIZE); flush_events(); ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); flush_sequence(); - ShowWindow(hwnd, SW_RESTORE); - flush_events(); - ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", TRUE); - flush_sequence(); + if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) + { + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", TRUE); + flush_sequence(); + } ShowWindow(hwnd, SW_SHOW); flush_events(); @@ -6614,6 +6621,7 @@ static void pump_msg_loop(HWND hwnd, HACCEL hAccel) static void test_accelerators(void) { RECT rc; + POINT pt; SHORT state; HACCEL hAccel; HWND hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -6784,12 +6792,16 @@ static void test_accelerators(void) flush_events(); flush_sequence(); - keybd_event(VK_SHIFT, 0, 0, 0); - mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); - mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); - keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0); - pump_msg_loop(hwnd, 0); - ok_sequence(WmShiftMouseButton, "Shift+MouseButton press/release", FALSE); + GetCursorPos(&pt); + if (pt.x == rc.left && pt.y == rc.top) + { + keybd_event(VK_SHIFT, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); + keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmShiftMouseButton, "Shift+MouseButton press/release", FALSE); + } trace("testing VK_F1 press/release\n"); keybd_event(VK_F1, 0, 0, 0); @@ -10368,6 +10380,9 @@ static const struct message SetActiveWindowSeq0[] = { WM_NCACTIVATE, sent|wparam, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 0 }, + { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, + { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, + { WM_KILLFOCUS, sent|wparam|optional, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE },

1 0

Alexandre Julliard : user32/tests: Better handling of the *. * wildcard in the listbox test.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: 5c54e24f909b02f5eb28e6510c9bd316bfc64c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c54e24f909b02f5eb28e6510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 13:01:12 2009 +0100 user32/tests: Better handling of the *.* wildcard in the listbox test. --- dlls/user32/tests/listbox.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index ea13dac..0aef698 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -569,6 +569,7 @@ static void test_listbox_LB_DIR(void) char pathBuffer[MAX_PATH]; char * p; char driveletter; + const char *wildcard = "*"; HANDLE file; file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -587,12 +588,13 @@ static void test_listbox_LB_DIR(void) /* Test for standard usage */ /* This should list all the files in the test directory. */ - strcpy(pathBuffer, "*"); + strcpy(pathBuffer, wildcard); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, 0, (LPARAM)pathBuffer); if (res == -1) /* "*" wildcard doesn't work on win9x */ { - strcpy(pathBuffer, "*.*"); + wildcard = "*.*"; + strcpy(pathBuffer, wildcard); res = SendMessage(hList, LB_DIR, 0, (LPARAM)pathBuffer); } ok (res >= 0, "SendMessage(LB_DIR, 0, *) failed - 0x%08x\n", GetLastError()); @@ -647,15 +649,9 @@ static void test_listbox_LB_DIR(void) } /* Test DDL_DIRECTORY */ - strcpy(pathBuffer, "*"); + strcpy(pathBuffer, wildcard); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); - if (res == -1 || res <= itemCount_allFiles) /* "*" wildcard doesn't work on win9x */ - { - strcpy(pathBuffer, "*.*"); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); - } ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. @@ -711,7 +707,7 @@ static void test_listbox_LB_DIR(void) /* Test DDL_DRIVES|DDL_EXCLUSIVE */ - strcpy(pathBuffer, "*"); + strcpy(pathBuffer, wildcard); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res >= 0, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) failed - 0x%08x\n", GetLastError()); @@ -758,7 +754,7 @@ static void test_listbox_LB_DIR(void) itemCount_justFiles, itemCount_justDrives); /* Test DDL_DRIVES. */ - strcpy(pathBuffer, "*"); + strcpy(pathBuffer, wildcard); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DRIVES, *) failed - 0x%08x\n", GetLastError()); @@ -769,8 +765,7 @@ static void test_listbox_LB_DIR(void) * been added. */ itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); - ok (itemCount == itemCount_justDrives + itemCount_allFiles || - broken(itemCount == itemCount_justDrives), /* "*" wildcard broken on win9x */ + ok (itemCount == itemCount_justDrives + itemCount_allFiles, "SendMessage(LB_DIR, DDL_DRIVES, *) filled with %d entries, expected %d\n", itemCount, itemCount_justDrives + itemCount_allFiles); ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES, *) returned incorrect index!\n"); @@ -822,7 +817,7 @@ static void test_listbox_LB_DIR(void) /* Test DDL_DIRECTORY|DDL_DRIVES. This does *not* imply DDL_EXCLUSIVE */ - strcpy(pathBuffer, "*"); + strcpy(pathBuffer, wildcard); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, *) failed - 0x%08x\n", GetLastError()); @@ -831,8 +826,7 @@ static void test_listbox_LB_DIR(void) * be exactly the number of plain files, plus the number of mapped drives. */ itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); - ok (itemCount == itemCount_allFiles + itemCount_justDrives + itemCount_allDirs || - broken(itemCount == itemCount_justDrives + itemCount_allDirs), /* "*" wildcard broken on win9x */ + ok (itemCount == itemCount_allFiles + itemCount_justDrives + itemCount_allDirs, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", itemCount, itemCount_allFiles + itemCount_justDrives + itemCount_allDirs); ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) returned incorrect index!\n"); @@ -898,7 +892,7 @@ static void test_listbox_LB_DIR(void) } /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ - strcpy(pathBuffer, "*"); + strcpy(pathBuffer, wildcard); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res != -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", GetLastError()); @@ -940,7 +934,7 @@ static void test_listbox_LB_DIR(void) itemCount, 0); /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ - strcpy(pathBuffer, "*"); + strcpy(pathBuffer, wildcard); SendMessage(hList, LB_RESETCONTENT, 0, 0); res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError());

1 0

Detlef Riekenberg : comctl32/tests: The status control use a different formula in XP and up for the height.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: bea3bff2bb2fbd66821e90ae4f9584062e5b22ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea3bff2bb2fbd66821e90ae4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 13 05:39:31 2009 +0100 comctl32/tests: The status control use a different formula in XP and up for the height. --- dlls/comctl32/tests/status.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f47d3ea..4fe6249 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -40,7 +40,8 @@ static WNDPROC g_status_wndproc; static RECT g_rcCreated; static HWND g_hMainWnd; static int g_wmsize_count = 0; -static DWORD g_height; +static DWORD g_ysize; +static DWORD g_dpisize; static HWND create_status_control(DWORD style, DWORD exstyle) { @@ -141,9 +142,9 @@ static int CALLBACK check_height_font_enumproc(ENUMLOGFONTEX *enumlf, NEWTEXTMET GetTextMetrics(hdc, &tm); y = tm.tmHeight + (tm.tmInternalLeading ? tm.tmInternalLeading : 2) + 4; - ok( rcCtrl.bottom == max(y, g_height), - "got %d (expected %d) for %s #%d\n", - rcCtrl.bottom, max(y, g_height), facename, sizes[i]); + ok( (rcCtrl.bottom == max(y, g_ysize)) || (rcCtrl.bottom == max(y, g_dpisize)), + "got %d (expected %d or %d) for %s #%d\n", + rcCtrl.bottom, max(y, g_ysize), max(y, g_dpisize), facename, sizes[i]); SelectObject(hdc, hOldFont); SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hCtrlFont, TRUE); @@ -225,10 +226,18 @@ static void test_height(void) SendMessage(hwndStatus, SB_SETMINHEIGHT, 0, 0); hdc = GetDC(NULL); - g_height = GetSystemMetrics(SM_CYSIZE) + 2; - if (g_height & 1) g_height--; /* The height is always even */ + /* used only for some fonts (tahoma as example) */ + g_ysize = GetSystemMetrics(SM_CYSIZE) + 2; + if (g_ysize & 1) g_ysize--; /* The min height is always even */ + + g_dpisize = MulDiv(18, GetDeviceCaps(hdc, LOGPIXELSY), 96) + 2; + if (g_dpisize & 1) g_dpisize--; /* The min height is always even */ + + + trace("dpi=%d (min height: %d or %d) SM_CYSIZE: %d\n", + GetDeviceCaps(hdc, LOGPIXELSY), g_ysize, g_dpisize, + GetSystemMetrics(SM_CYSIZE)); - trace("dpi=%d (min height: %d)\n", GetDeviceCaps(hdc, LOGPIXELSY), g_height); EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC)check_height_family_enumproc, (LPARAM)hwndStatus, 0); ReleaseDC(NULL, hdc);

1 0

Alexandre Julliard : user32/tests: Print the wrong accelerator values in the resource test.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: 583a30c6652d5b26db2e8b6a55f672a5e63faccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=583a30c6652d5b26db2e8b6a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 13:00:54 2009 +0100 user32/tests: Print the wrong accelerator values in the resource test. --- dlls/user32/tests/resource.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index b8e0493..f553b10 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -188,29 +188,29 @@ static void test_accel1(void) "still should be two entries in table %u/%u\n", r, n); n=0; - ok( ac[n].cmd == 1000, "cmd 0 not preserved\n"); - ok( ac[n].key == 'A', "key 0 not preserved\n"); - ok( ac[n].fVirt == (FVIRTKEY | FNOINVERT), "fVirt 0 not preserved\n"); + ok( ac[n].cmd == 1000, "cmd 0 not preserved got %x\n", ac[n].cmd); + ok( ac[n].key == 'A', "key 0 not preserved got %x\n", ac[n].key); + ok( ac[n].fVirt == (FVIRTKEY | FNOINVERT), "fVirt 0 not preserved got %x\n", ac[n].fVirt); if (++n == r) goto done; - ok( ac[n].cmd == 0xffff, "cmd 1 not preserved\n"); - ok( ac[n].key == 0xffff, "key 1 not preserved\n"); - ok( ac[n].fVirt == 0x007f, "fVirt 1 not changed\n"); + ok( ac[n].cmd == 0xffff, "cmd 1 not preserved got %x\n", ac[n].cmd); + ok( ac[n].key == 0xffff, "key 1 not preserved got %x\n", ac[n].key); + ok( ac[n].fVirt == 0x007f, "fVirt 1 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done; - ok( ac[n].cmd == 0xfff0, "cmd 2 not preserved\n"); - ok( ac[n].key == 0x00ff, "key 2 not preserved\n"); - ok( ac[n].fVirt == 0x0070, "fVirt 2 not changed\n"); + ok( ac[n].cmd == 0xfff0, "cmd 2 not preserved got %x\n", ac[n].cmd); + ok( ac[n].key == 0x00ff, "key 2 not preserved got %x\n", ac[n].key); + ok( ac[n].fVirt == 0x0070, "fVirt 2 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done; - ok( ac[n].cmd == 0xfff0, "cmd 3 not preserved\n"); - ok( ac[n].key == 0x00ff, "key 3 not preserved\n"); - ok( ac[n].fVirt == 0x0000, "fVirt 3 not changed\n"); + ok( ac[n].cmd == 0xfff0, "cmd 3 not preserved got %x\n", ac[n].cmd); + ok( ac[n].key == 0x00ff, "key 3 not preserved got %x\n", ac[n].key); + ok( ac[n].fVirt == 0x0000, "fVirt 3 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done; - ok( ac[n].cmd == 0xfff0, "cmd 4 not preserved\n"); - ok( ac[n].key == 0xffff, "key 4 not preserved\n"); - ok( ac[n].fVirt == 0x0001, "fVirt 4 not changed\n"); + ok( ac[n].cmd == 0xfff0, "cmd 4 not preserved got %x\n", ac[n].cmd); + ok( ac[n].key == 0xffff, "key 4 not preserved got %x\n", ac[n].key); + ok( ac[n].fVirt == 0x0001, "fVirt 4 wrong got %x\n", ac[n].fVirt); done: r = DestroyAcceleratorTable( hAccel ); ok( r, "destroy accelerator table\n");

1 0

Michael Stefaniuc : comctl32: Remove superfluous pointer casts.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: da6d7920de56d646ca9e50d825efadcbd4e49009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6d7920de56d646ca9e50d82… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 13 10:21:25 2009 +0100 comctl32: Remove superfluous pointer casts. --- dlls/comctl32/animate.c | 6 +++--- dlls/comctl32/comctl32undoc.c | 12 ++++++------ dlls/comctl32/commctrl.c | 4 ++-- dlls/comctl32/header.c | 6 +++--- dlls/comctl32/imagelist.c | 12 ++++++------ dlls/comctl32/listview.c | 14 +++++++------- dlls/comctl32/propsheet.c | 20 ++++++++------------ dlls/comctl32/tests/rebar.c | 2 +- dlls/comctl32/toolbar.c | 6 ++---- dlls/comctl32/tooltips.c | 4 ++-- dlls/comctl32/updown.c | 2 +- 11 files changed, 41 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da6d7920de56d646ca9e5…

1 0

Michael Stefaniuc : comctl32: Remove an one-off macro.
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Module: wine Branch: master Commit: 9b626c229187f834560c894f150f3ef63c6d3642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b626c229187f834560c894f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 13 10:20:44 2009 +0100 comctl32: Remove an one-off macro. --- dlls/comctl32/flatsb.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index cabcdfc..174e22d 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c @@ -46,8 +46,6 @@ typedef struct DWORD dwDummy; /* just to keep the compiler happy ;-) */ } FLATSB_INFO, *LPFLATSB_INFO; -#define FlatSB_GetInfoPtr(hwnd) ((FLATSB_INFO*)GetWindowLongPtrW (hwnd, 0)) - /*********************************************************************** * InitializeFlatSB (COMCTL32.@) @@ -245,7 +243,7 @@ FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT WINAPI FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - if (!FlatSB_GetInfoPtr(hwnd) && (uMsg != WM_CREATE)) + if (!GetWindowLongPtrW(hwnd, 0) && (uMsg != WM_CREATE)) return DefWindowProcW( hwnd, uMsg, wParam, lParam ); switch (uMsg)

1 0