October 2013 - Wine-Commits

Alexandre Julliard : user32: Don' t trigger a graphics driver load for functions that require an existing window .
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 11597d6b3cb9a0e2c27a275c58877cf8c30854f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11597d6b3cb9a0e2c27a275c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 23 16:13:17 2013 +0200 user32: Don't trigger a graphics driver load for functions that require an existing window. --- dlls/user32/driver.c | 127 +++++++------------------------------------------- 1 files changed, 17 insertions(+), 110 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 4cfc552..18778cd 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -553,11 +553,6 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) -{ - load_driver()->pDestroyCursorIcon( cursor ); -} - static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) { load_driver()->pSetCursor( cursor ); @@ -649,116 +644,28 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) return load_driver()->pCreateWindow( hwnd ); } -static void CDECL loaderdrv_DestroyWindow( HWND hwnd ) -{ - load_driver()->pDestroyWindow( hwnd ); -} - static void CDECL loaderdrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { load_driver()->pGetDC( hdc, hwnd, top_win, win_rect, top_rect, flags ); } -static DWORD CDECL loaderdrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, - DWORD mask, DWORD flags ) -{ - return load_driver()->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); -} - -static void CDECL loaderdrv_ReleaseDC( HWND hwnd, HDC hdc ) -{ - load_driver()->pReleaseDC( hwnd, hdc ); -} - -static BOOL CDECL loaderdrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) -{ - return load_driver()->pScrollDC( hdc, dx, dy, update ); -} - -static void CDECL loaderdrv_SetCapture( HWND hwnd, UINT flags ) -{ - load_driver()->pSetCapture( hwnd, flags ); -} - -static void CDECL loaderdrv_SetFocus( HWND hwnd ) -{ - load_driver()->pSetFocus( hwnd ); -} - static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) { load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); } -static void CDECL loaderdrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) -{ - load_driver()->pSetParent( hwnd, parent, old_parent ); -} - static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } -static void CDECL loaderdrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) -{ - load_driver()->pSetWindowIcon( hwnd, type, icon ); -} - -static void CDECL loaderdrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) -{ - load_driver()->pSetWindowStyle( hwnd, offset, style ); -} - -static void CDECL loaderdrv_SetWindowText( HWND hwnd, LPCWSTR text ) -{ - load_driver()->pSetWindowText( hwnd, text ); -} - -static UINT CDECL loaderdrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) -{ - return load_driver()->pShowWindow( hwnd, cmd, rect, swp ); -} - -static LRESULT CDECL loaderdrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) -{ - return load_driver()->pSysCommand( hwnd, wparam, lparam ); -} - static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, const RECT *window_rect ) { return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect ); } -static LRESULT CDECL loaderdrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - return load_driver()->pWindowMessage( hwnd, msg, wparam, lparam ); -} - -static void CDECL loaderdrv_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, - const RECT *window_rect, const RECT *client_rect, - RECT *visible_rect, struct window_surface **surface ) -{ - load_driver()->pWindowPosChanging( hwnd, insert_after, swp_flags, - window_rect, client_rect, visible_rect, surface ); -} - -static void CDECL loaderdrv_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, - const RECT *window_rect, const RECT *client_rect, - const RECT *visible_rect, const RECT *valid_rects, - struct window_surface *surface ) -{ - load_driver()->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, - client_rect, visible_rect, valid_rects, surface ); -} - -static BOOL CDECL loaderdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) -{ - return FALSE; /* don't trigger a driver load */ -} - static USER_DRIVER lazy_load_driver = { /* keyboard functions */ @@ -776,7 +683,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, /* cursor/icon functions */ - loaderdrv_DestroyCursorIcon, + nulldrv_DestroyCursorIcon, loaderdrv_SetCursor, loaderdrv_GetCursorPos, loaderdrv_SetCursorPos, @@ -798,25 +705,25 @@ static USER_DRIVER lazy_load_driver = /* windowing functions */ loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, - loaderdrv_DestroyWindow, + nulldrv_DestroyWindow, loaderdrv_GetDC, - loaderdrv_MsgWaitForMultipleObjectsEx, - loaderdrv_ReleaseDC, - loaderdrv_ScrollDC, - loaderdrv_SetCapture, - loaderdrv_SetFocus, + nulldrv_MsgWaitForMultipleObjectsEx, + nulldrv_ReleaseDC, + nulldrv_ScrollDC, + nulldrv_SetCapture, + nulldrv_SetFocus, loaderdrv_SetLayeredWindowAttributes, - loaderdrv_SetParent, + nulldrv_SetParent, loaderdrv_SetWindowRgn, - loaderdrv_SetWindowIcon, - loaderdrv_SetWindowStyle, - loaderdrv_SetWindowText, - loaderdrv_ShowWindow, - loaderdrv_SysCommand, + nulldrv_SetWindowIcon, + nulldrv_SetWindowStyle, + nulldrv_SetWindowText, + nulldrv_ShowWindow, + nulldrv_SysCommand, loaderdrv_UpdateLayeredWindow, - loaderdrv_WindowMessage, - loaderdrv_WindowPosChanging, - loaderdrv_WindowPosChanged, + nulldrv_WindowMessage, + nulldrv_WindowPosChanging, + nulldrv_WindowPosChanged, /* system parameters */ - loaderdrv_SystemParametersInfo + nulldrv_SystemParametersInfo };

1 0

Dmitry Timoshkov : user32/tests: Fix edit control tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 0e42a41ab3277557f0b866ba8788dbabb9cc9605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e42a41ab3277557f0b866ba8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:42 2013 +0900 user32/tests: Fix edit control tests compilation with __WINESRC__ defined. --- dlls/user32/tests/edit.c | 708 +++++++++++++++++++++++----------------------- 1 files changed, 353 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e42a41ab3277557f0b86…

1 0

Dmitry Timoshkov : user32/tests: Fix input tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 84a80215b9a7a17f05641b189a0878dacf6774a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a80215b9a7a17f05641b189… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:46 2013 +0900 user32/tests: Fix input tests compilation with __WINESRC__ defined. --- dlls/user32/tests/input.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f3f5dcc..7216c28 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -246,7 +246,7 @@ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) if (winetest_debug > 1) trace("======== key stroke sequence #%d: %s =============\n", seqnr + 1, buf); - while( PeekMessage(&msg,hwnd,WM_KEYFIRST,WM_KEYLAST,PM_REMOVE) ) { + while( PeekMessageA(&msg,hwnd,WM_KEYFIRST,WM_KEYLAST,PM_REMOVE) ) { if (winetest_debug > 1) trace("message[%d] %-15s wParam %04lx lParam %08lx time %x\n", i, MSGNAME[msg.message - WM_KEYFIRST], msg.wParam, msg.lParam, msg.time); @@ -344,8 +344,8 @@ static void test_Input_whitebox(void) wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = WndProc; wclass.hInstance = hInstance; - wclass.hIcon = LoadIconA( 0, IDI_APPLICATION ); - wclass.hCursor = LoadCursorA( NULL, IDC_ARROW ); + wclass.hIcon = LoadIconA( 0, (LPCSTR)IDI_APPLICATION ); + wclass.hCursor = LoadCursorA( NULL, (LPCSTR)IDC_ARROW ); wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); wclass.lpszMenuName = 0; wclass.cbClsExtra = 0; @@ -362,7 +362,7 @@ static void test_Input_whitebox(void) UpdateWindow( hWndTest); /* flush pending messages */ - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); SetFocus( hWndTest ); TestSysKeys( hWndTest ); @@ -390,13 +390,13 @@ static void empty_message_queue(void) while (diff > 0) { if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { if (is_keyboard_message(msg.message) || is_mouse_message(msg.message)) ok(msg.time != 0, "message %#x has time set to 0\n", msg.message); TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } diff = time - GetTickCount(); } @@ -865,7 +865,7 @@ static LRESULT CALLBACK WndProc2(HWND hWnd, UINT Msg, WPARAM wParam, sent_messages[sent_messages_cnt++].lParam = HIWORD(lParam) & (KF_UP|KF_EXTENDED); } } - return DefWindowProc(hWnd, Msg, wParam, lParam); + return DefWindowProcA(hWnd, Msg, wParam, lParam); } static LRESULT CALLBACK hook_proc(int code, WPARAM wparam, LPARAM lparam) @@ -911,7 +911,7 @@ static void test_Input_blackbox(void) skip("Skipping Input_blackbox test on non-US keyboard\n"); return; } - window = CreateWindow("Static", NULL, WS_POPUP|WS_HSCROLL|WS_VSCROLL + window = CreateWindowA("Static", NULL, WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 200, 60, NULL, NULL, NULL, NULL); ok(window != NULL, "error: %d\n", (int) GetLastError()); @@ -929,7 +929,7 @@ static void test_Input_blackbox(void) * key state set by SendInput(). */ empty_message_queue(); - prevWndProc = SetWindowLongPtr(window, GWLP_WNDPROC, (LONG_PTR) WndProc2); + prevWndProc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR) WndProc2); ok(prevWndProc != 0 || (prevWndProc == 0 && GetLastError() == 0), "error: %d\n", (int) GetLastError()); @@ -1160,8 +1160,8 @@ static void test_Input_unicode(void) wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = unicode_wnd_proc; wclass.hInstance = hInstance; - wclass.hIcon = LoadIcon(0, IDI_APPLICATION); - wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wclass.hCursor = LoadCursorW( NULL, (LPCWSTR)IDC_ARROW); wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wclass.lpszMenuName = 0; wclass.cbClsExtra = 0; @@ -1280,7 +1280,7 @@ static void test_mouse_ll_hook(void) RECT rc; GetCursorPos(&pt_org); - hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); SetCursorPos(100, 100); @@ -1503,34 +1503,34 @@ static void test_key_map(void) { VK_NUMPAD9, VK_PRIOR }, }; - s = MapVirtualKeyEx(VK_SHIFT, MAPVK_VK_TO_VSC, kl); + s = MapVirtualKeyExA(VK_SHIFT, MAPVK_VK_TO_VSC, kl); ok(s != 0, "MapVirtualKeyEx(VK_SHIFT) should return non-zero\n"); - sL = MapVirtualKeyEx(VK_LSHIFT, MAPVK_VK_TO_VSC, kl); + sL = MapVirtualKeyExA(VK_LSHIFT, MAPVK_VK_TO_VSC, kl); ok(s == sL || broken(sL == 0), /* win9x */ "%x != %x\n", s, sL); - kL = MapVirtualKeyEx(0x2a, MAPVK_VSC_TO_VK, kl); + kL = MapVirtualKeyExA(0x2a, MAPVK_VSC_TO_VK, kl); ok(kL == VK_SHIFT, "Scan code -> vKey = %x (not VK_SHIFT)\n", kL); - kR = MapVirtualKeyEx(0x36, MAPVK_VSC_TO_VK, kl); + kR = MapVirtualKeyExA(0x36, MAPVK_VSC_TO_VK, kl); ok(kR == VK_SHIFT, "Scan code -> vKey = %x (not VK_SHIFT)\n", kR); - kL = MapVirtualKeyEx(0x2a, MAPVK_VSC_TO_VK_EX, kl); + kL = MapVirtualKeyExA(0x2a, MAPVK_VSC_TO_VK_EX, kl); ok(kL == VK_LSHIFT || broken(kL == 0), /* win9x */ "Scan code -> vKey = %x (not VK_LSHIFT)\n", kL); - kR = MapVirtualKeyEx(0x36, MAPVK_VSC_TO_VK_EX, kl); + kR = MapVirtualKeyExA(0x36, MAPVK_VSC_TO_VK_EX, kl); ok(kR == VK_RSHIFT || broken(kR == 0), /* win9x */ "Scan code -> vKey = %x (not VK_RSHIFT)\n", kR); /* test that MAPVK_VSC_TO_VK prefers the non-numpad vkey if there's ambiguity */ for (i = 0; i < sizeof(numpad_collisions)/sizeof(numpad_collisions[0]); i++) { - UINT numpad_scan = MapVirtualKeyEx(numpad_collisions[i][0], MAPVK_VK_TO_VSC, kl); - UINT other_scan = MapVirtualKeyEx(numpad_collisions[i][1], MAPVK_VK_TO_VSC, kl); + UINT numpad_scan = MapVirtualKeyExA(numpad_collisions[i][0], MAPVK_VK_TO_VSC, kl); + UINT other_scan = MapVirtualKeyExA(numpad_collisions[i][1], MAPVK_VK_TO_VSC, kl); /* do they really collide for this layout? */ if (numpad_scan && other_scan == numpad_scan) { - UINT vkey = MapVirtualKeyEx(numpad_scan, MAPVK_VSC_TO_VK, kl); + UINT vkey = MapVirtualKeyExA(numpad_scan, MAPVK_VSC_TO_VK, kl); ok(vkey != numpad_collisions[i][0], "Got numpad vKey %x for scan code %x when there was another choice\n", vkey, numpad_scan);

1 0

Dmitry Timoshkov : user32/tests: Fix dialog tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: f237d5eef208fe17b85123a6c30e7362f7f97e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f237d5eef208fe17b85123a6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:37 2013 +0900 user32/tests: Fix dialog tests compilation with __WINESRC__ defined. --- dlls/user32/tests/dialog.c | 174 ++++++++++++++++++++++---------------------- 1 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f237d5eef208fe17b8512…

1 0

Dmitry Timoshkov : user32/tests: Fix DDE tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: ad638a32d7e5f065a10b4a69b0851b4c2ee03bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad638a32d7e5f065a10b4a69b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:34 2013 +0900 user32/tests: Fix DDE tests compilation with __WINESRC__ defined. --- dlls/user32/tests/dde.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e5d5554..4a50c39 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -53,7 +53,7 @@ static void flush_events(void) while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); diff = time - GetTickCount(); min_timeout = 10; } @@ -80,7 +80,7 @@ static void create_dde_window(HWND *hwnd, LPCSTR name, WNDPROC wndproc) static void destroy_dde_window(HWND *hwnd, LPCSTR name) { DestroyWindow(*hwnd); - UnregisterClass(name, GetModuleHandleA(0)); + UnregisterClassA(name, GetModuleHandleA(NULL)); } static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -255,7 +255,7 @@ static void test_msg_server(HANDLE hproc, HANDLE hthread) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } destroy_dde_window(&hwnd, "dde_server"); @@ -825,10 +825,10 @@ static void test_ddeml_server(HANDLE hproc) /* set up DDE server */ server_pid = 0; - res = DdeInitialize(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); + res = DdeInitializeA(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); - server = DdeCreateStringHandle(server_pid, "TestDDEServer", CP_WINANSI); + server = DdeCreateStringHandleA(server_pid, "TestDDEServer", CP_WINANSI); ok(server != NULL, "Expected non-NULL string handle\n"); hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); @@ -836,7 +836,7 @@ static void test_ddeml_server(HANDLE hproc) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -1074,7 +1074,7 @@ static void test_msg_client(void) flush_events(); - item = GlobalAddAtom("request"); + item = GlobalAddAtomA("request"); ok(item != 0, "Expected non-NULL item\n"); /* WM_DDE_REQUEST, bad clipboard format */ @@ -2672,7 +2672,7 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); @@ -2686,7 +2686,7 @@ START_TEST(dde) int argc; char **argv; char buffer[MAX_PATH]; - STARTUPINFO startup; + STARTUPINFOA startup; PROCESS_INFORMATION proc; DWORD dde_inst = 0xdeadbeef; @@ -2715,7 +2715,7 @@ START_TEST(dde) return; } - ZeroMemory(&startup, sizeof(STARTUPINFO)); + ZeroMemory(&startup, sizeof(STARTUPINFOA)); sprintf(buffer, "%s dde ddeml", argv[0]); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW;

1 0

Frédéric Delanoy : comdlg32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: e5d954096bbac8b7b2a06d05d82d5afae9526994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d954096bbac8b7b2a06d05d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:52 2013 +0200 comdlg32/tests: Use BOOL type where appropriate. --- dlls/comdlg32/tests/filedlg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index cfa964a..d96d976 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -111,7 +111,7 @@ static void test_DialogCancel(void) "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); result = GetOpenFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); @@ -120,7 +120,7 @@ static void test_DialogCancel(void) "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); result = GetSaveFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); @@ -143,7 +143,7 @@ static void test_DialogCancel(void) win_skip("GetOpenFileNameW is not implemented\n"); else { - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } @@ -153,7 +153,7 @@ static void test_DialogCancel(void) win_skip("GetSaveFileNameW is not implemented\n"); else { - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } } @@ -928,12 +928,12 @@ static void test_getfolderpath(void) ofn.lpstrInitialDir = szInitialDir; result = GetOpenFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); result = GetSaveFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } @@ -956,7 +956,7 @@ static void test_resizable2(void) ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; ofn.Flags = OFN_EXPLORER; -#define ISSIZABLE 1 +#define ISSIZABLE TRUE ret = GetOpenFileNameA(&ofn); ok( ret == ISSIZABLE, "File Dialog should have been sizable\n"); ret = CommDlgExtendedError();

1 0

Frédéric Delanoy : user.exe16: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 1c4456f7a22a14fb657cbb7f9fc840fe75404a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4456f7a22a14fb657cbb7f9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:50 2013 +0200 user.exe16: Use BOOL type where appropriate. --- dlls/user.exe16/comm.c | 6 +++--- dlls/user.exe16/user.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index 9c99899..a9141db 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -83,7 +83,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); struct DosDeviceStruct { HANDLE handle; - int suspended; + BOOL suspended; int unget,xmit; int evtchar; /* events */ @@ -577,7 +577,7 @@ INT16 WINAPI SetCommBreak16(INT16 cid) return -1; } - ptr->suspended = 1; + ptr->suspended = TRUE; ptr->commerror = 0; return 0; } @@ -594,7 +594,7 @@ INT16 WINAPI ClearCommBreak16(INT16 cid) FIXME("no cid=%d found!\n", cid); return -1; } - ptr->suspended = 0; + ptr->suspended = FALSE; ptr->commerror = 0; return 0; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 9500f59..7a518b3 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2792,7 +2792,7 @@ DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen, */ static BOOL DRAG_QueryUpdate16( HWND hQueryWnd, SEGPTR spDragInfo ) { - BOOL bResult = 0; + BOOL bResult; WPARAM wParam; POINT pt, old_pt; LPDRAGINFO16 ptrDragInfo = MapSL(spDragInfo);

1 0

Frédéric Delanoy : wineboot: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 189ac56e6d673a505208ac6de9e741affc55d1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ac56e6d673a505208ac6de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:51 2013 +0200 wineboot: Use BOOL type where appropriate. --- programs/wineboot/shutdown.c | 4 ++-- programs/wineboot/wineboot.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index ac3019c..a5f5f5a 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -335,14 +335,14 @@ static BOOL CALLBACK shutdown_one_desktop( LPWSTR name, LPARAM force ) if (hdesk == NULL) { WINE_ERR("Cannot open desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); - return 0; + return FALSE; } if (!SetThreadDesktop( hdesk )) { CloseDesktop( hdesk ); WINE_ERR("Cannot set thread desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); - return 0; + return FALSE; } CloseDesktop( hdesk ); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4f9adb0..a062d81 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -948,7 +948,7 @@ static HANDLE start_rundll32( const char *inf_path, BOOL wow64 ) } /* execute rundll32 on the wine.inf file if necessary */ -static void update_wineprefix( int force ) +static void update_wineprefix( BOOL force ) { const char *config_dir = wine_get_config_dir(); char *inf_path = get_wine_inf_path(); @@ -1123,11 +1123,12 @@ int main( int argc, char *argv[] ) /* First, set the current directory to SystemRoot */ int optc; - int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0, update = 0; + BOOL end_session, force, init, kill, restart, shutdown, update; HANDLE event; SECURITY_ATTRIBUTES sa; BOOL is_wow64; + end_session = force = init = kill = restart = shutdown = update = FALSE; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); @@ -1160,13 +1161,13 @@ int main( int argc, char *argv[] ) { switch(optc) { - case 'e': end_session = 1; break; - case 'f': force = 1; break; - case 'i': init = 1; break; - case 'k': kill = 1; break; - case 'r': restart = 1; break; - case 's': shutdown = 1; break; - case 'u': update = 1; break; + case 'e': end_session = TRUE; break; + case 'f': force = TRUE; break; + case 'i': init = TRUE; break; + case 'k': kill = TRUE; break; + case 'r': restart = TRUE; break; + case 's': shutdown = TRUE; break; + case 'u': update = TRUE; break; case 'h': usage(); return 0; case '?': usage(); return 1; }

1 0

Dmitry Timoshkov : user32/tests: Fix combobox tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 3e3eb805d87fc36530778fa2a4b620ae10b56be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3eb805d87fc36530778fa2a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:22 2013 +0900 user32/tests: Fix combobox tests compilation with __WINESRC__ defined. --- dlls/user32/tests/combo.c | 124 ++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e3eb805d87fc36530778…

1 0

Dmitry Timoshkov : user32/tests: Fix class tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 74f205462b2277322210bdaf72cc1fc7a5caa75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f205462b2277322210bdaf7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:14 2013 +0900 user32/tests: Fix class tests compilation with __WINESRC__ defined. --- dlls/user32/tests/class.c | 78 ++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74f205462b2277322210b…

1 0