October 2013 - Wine-commits

Huw Davies : ole32: Call IExternalConnection_ReleaseConnection with the correct final parameter .
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 1864db2faaf671648ba75111a13d52af130a4426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1864db2faaf671648ba75111a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:51 2013 +0100 ole32: Call IExternalConnection_ReleaseConnection with the correct final parameter. --- dlls/ole32/stubmanager.c | 2 +- dlls/ole32/tests/marshal.c | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 9f33056..6e59581 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -437,7 +437,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); if (last_extern_ref && m->extern_conn) - IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, TRUE /* FIXME: Use last_unlock releases? */); + IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases); if (rc == 0) stub_manager_int_release(m); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index cd49a7c..105e644 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -430,7 +430,6 @@ static void test_normal_marshal_and_unmarshal(void) ok_more_than_one_lock(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); IUnknown_Release(pProxy); @@ -512,7 +511,6 @@ static void test_same_apartment_unmarshal_failure(void) ok_no_locks(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); IStream_Release(pStream); @@ -1582,7 +1580,6 @@ static void test_lock_object_external(void) ok_no_locks(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); /* test CoLockObjectExternal doesn't release the last reference to an @@ -1603,7 +1600,6 @@ todo_wine ok_more_than_one_lock(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); @@ -1676,7 +1672,6 @@ static void test_normal_marshal_and_unmarshal_twice(void) ok_more_than_one_lock(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL);

1 0

Huw Davies : ole32: If an object exposes IExternalConnection then don' t take down the stub manager if we have remaining weak refs in a call that would otherwise ignore them .
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 5077fc895fe98eabd8d511340853db120ad82f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5077fc895fe98eabd8d511340… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:52 2013 +0100 ole32: If an object exposes IExternalConnection then don't take down the stub manager if we have remaining weak refs in a call that would otherwise ignore them. --- dlls/ole32/stubmanager.c | 3 ++- dlls/ole32/tests/marshal.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 6e59581..fbbf413 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -440,7 +440,8 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases); if (rc == 0) - stub_manager_int_release(m); + if (!(m->extern_conn && last_unlock_releases && m->weakrefs)) + stub_manager_int_release(m); return rc; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 105e644..680b831 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1125,7 +1125,6 @@ static void test_tableweak_marshal_and_unmarshal_twice(void) * behaviour is altered; the remaining weak ref prevents stub shutdown. */ if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 0); @@ -1347,7 +1346,6 @@ static void test_tableweak_and_normal_marshal_and_unmarshal(void) * behaviour is altered; the remaining weak ref prevents stub shutdown. */ if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 1); @@ -1397,7 +1395,6 @@ static void test_tableweak_and_normal_marshal_and_releasedata(void) if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 1);

1 0

Dmitry Timoshkov : user32/tests: Fix menu tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

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

1 0

Dmitry Timoshkov : user32/tests: Fix monitor tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 33ff6d2549031b44c4b41debb7c97ac676cf3676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ff6d2549031b44c4b41debb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:58 2013 +0900 user32/tests: Fix monitor tests compilation with __WINESRC__ defined. --- dlls/user32/tests/monitor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index b509860..f442338 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -161,7 +161,7 @@ static void test_ChangeDisplaySettingsEx(void) } SetLastError(0xdeadbeef); - res = EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm); + res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); ok(res, "EnumDisplaySettings error %u\n", GetLastError()); width = dm.dmPelsWidth; @@ -356,12 +356,12 @@ static void test_work_area(void) mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); SetLastError(0xdeadbeef); - ret = SystemParametersInfo(SPI_GETWORKAREA, 0, &rc_work, 0); + ret = SystemParametersInfoA(SPI_GETWORKAREA, 0, &rc_work, 0); ok(ret, "SystemParametersInfo error %u\n", GetLastError()); trace("work area (%d,%d-%d,%d)\n", rc_work.left, rc_work.top, rc_work.right, rc_work.bottom); ok(EqualRect(&rc_work, &mi.rcWork), "work area is different\n"); - hwnd = CreateWindowEx(0, "static", NULL, WS_OVERLAPPEDWINDOW|WS_VISIBLE,100,100,10,10,0,0,0,NULL); + hwnd = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW|WS_VISIBLE,100,100,10,10,0,0,0,NULL); ok(hwnd != 0, "CreateWindowEx failed\n"); ret = GetWindowRect(hwnd, &rc_normal); @@ -383,7 +383,7 @@ static void test_work_area(void) else ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); - SetWindowLong(hwnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW); + SetWindowLongA(hwnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW); wp.length = sizeof(wp); ret = GetWindowPlacement(hwnd, &wp);

1 0

Dmitry Timoshkov : user32/tests: Fix message tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: a7219e8c883dba6307e9db8fe587f3c1efa88cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7219e8c883dba6307e9db8fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:02 2013 +0900 user32/tests: Fix message tests compilation with __WINESRC__ defined. --- dlls/user32/tests/msg.c | 606 +++++++++++++++++++++++----------------------- 1 files changed, 303 insertions(+), 303 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7219e8c883dba6307e9d…

1 0

Dmitry Timoshkov : user32/tests: Fix resource tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: f26bace5afbff9a8773b1837ee9acfe55c926768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26bace5afbff9a8773b1837e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:06 2013 +0900 user32/tests: Fix resource tests compilation with __WINESRC__ defined. --- dlls/user32/tests/resource.c | 60 +++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 6b89ef7..2313595 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -23,7 +23,7 @@ #include "wine/test.h" -static UINT (WINAPI *pPrivateExtractIconsA)(LPCTSTR, int, int, int, HICON *, UINT *, UINT, UINT) = NULL; +static UINT (WINAPI *pPrivateExtractIconsA)(LPCSTR, int, int, int, HICON *, UINT *, UINT, UINT) = NULL; static void init_function_pointers(void) { @@ -33,7 +33,7 @@ static void init_function_pointers(void) static void test_LoadStringW(void) { - HINSTANCE hInst = GetModuleHandle(NULL); + HINSTANCE hInst = GetModuleHandleA(NULL); WCHAR copiedstringw[128], returnedstringw[128], *resourcepointer = NULL; char copiedstring[128], returnedstring[128]; int length1, length2, retvalue; @@ -79,7 +79,7 @@ static void test_LoadStringW(void) static void test_LoadStringA (void) { - HINSTANCE hInst = GetModuleHandle (NULL); + HINSTANCE hInst = GetModuleHandleA(NULL); static const char str[] = "String resource"; /* same in resource.rc */ char buf[128]; struct string_test { @@ -148,7 +148,7 @@ static void test_accel1(void) ac[n].key = 0; ac[n++].fVirt = 0; - hAccel = CreateAcceleratorTable( &ac[0], n ); + hAccel = CreateAcceleratorTableA( &ac[0], n ); ok( hAccel != NULL, "create accelerator table\n"); r = DestroyAcceleratorTable( hAccel ); @@ -176,13 +176,13 @@ static void test_accel1(void) ac[n].key = 0xffff; ac[n++].fVirt = 0x0001; - hAccel = CreateAcceleratorTable( &ac[0], n ); + hAccel = CreateAcceleratorTableA( &ac[0], n ); ok( hAccel != NULL, "create accelerator table\n"); - r = CopyAcceleratorTable( hAccel, NULL, 0 ); + r = CopyAcceleratorTableA( hAccel, NULL, 0 ); ok( r == n, "two entries in table %u/%u\n", r, n); - r = CopyAcceleratorTable( hAccel, &ac[0], n ); + r = CopyAcceleratorTableA( hAccel, &ac[0], n ); ok( r == n, "still should be two entries in table %u/%u\n", r, n); n=0; @@ -213,7 +213,7 @@ done: r = DestroyAcceleratorTable( hAccel ); ok( r, "destroy accelerator table\n"); - hAccel = CreateAcceleratorTable( &ac[0], 0 ); + hAccel = CreateAcceleratorTableA( &ac[0], 0 ); ok( !hAccel || broken(hAccel != NULL), /* nt4 */ "zero elements should fail\n"); /* these will on crash win2k @@ -246,36 +246,36 @@ static void test_accel2(void) */ /* try a zero count */ - hac = CreateAcceleratorTable( &ac[0], 0 ); + hac = CreateAcceleratorTableA( &ac[0], 0 ); ok( !hac || broken(hac != NULL), /* nt4 */ "fail\n"); if (!hac) ok( !DestroyAcceleratorTable( hac ), "destroy failed\n"); /* creating one accelerator should work */ - hac = CreateAcceleratorTable( &ac[0], 1 ); + hac = CreateAcceleratorTableA( &ac[0], 1 ); ok( hac != NULL , "fail\n"); - ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy failed\n"); + ok( 1 == CopyAcceleratorTableA( hac, out, 1 ), "copy failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); /* how about two of the same type? */ - hac = CreateAcceleratorTable( &ac[0], 2); + hac = CreateAcceleratorTableA( &ac[0], 2); ok( hac != NULL , "fail\n"); - res = CopyAcceleratorTable( hac, NULL, 100 ); + res = CopyAcceleratorTableA( hac, NULL, 100 ); ok( res == 2, "copy null failed %d\n", res); - res = CopyAcceleratorTable( hac, NULL, 0 ); + res = CopyAcceleratorTableA( hac, NULL, 0 ); ok( res == 2, "copy null failed %d\n", res); - res = CopyAcceleratorTable( hac, NULL, 1 ); + res = CopyAcceleratorTableA( hac, NULL, 1 ); ok( res == 2, "copy null failed %d\n", res); - ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy 1 failed\n"); - ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + ok( 1 == CopyAcceleratorTableA( hac, out, 1 ), "copy 1 failed\n"); + ok( 2 == CopyAcceleratorTableA( hac, out, 2 ), "copy 2 failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); /* ok( !memcmp( ac, out, sizeof ac ), "tables different\n"); */ /* how about two of the same type with a non-zero key? */ ac[0].key = 0x20; ac[1].key = 0x20; - hac = CreateAcceleratorTable( &ac[0], 2); + hac = CreateAcceleratorTableA( &ac[0], 2); ok( hac != NULL , "fail\n"); - ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + ok( 2 == CopyAcceleratorTableA( hac, out, 2 ), "copy 2 failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); /* ok( !memcmp( ac, out, sizeof ac ), "tables different\n"); */ @@ -284,17 +284,17 @@ static void test_accel2(void) ac[0].key = 0x40; ac[1].fVirt = FVIRTKEY; ac[1].key = 0x40; - hac = CreateAcceleratorTable( &ac[0], 2); + hac = CreateAcceleratorTableA( &ac[0], 2); ok( hac != NULL , "fail\n"); - ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + ok( 2 == CopyAcceleratorTableA( hac, out, 2 ), "copy 2 failed\n"); /* ok( !memcmp( ac, out, sizeof ac ), "tables different\n"); */ ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); /* how virtual key codes */ ac[0].fVirt = FVIRTKEY; - hac = CreateAcceleratorTable( &ac[0], 1); + hac = CreateAcceleratorTableA( &ac[0], 1); ok( hac != NULL , "fail\n"); - ok( 1 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + ok( 1 == CopyAcceleratorTableA( hac, out, 2 ), "copy 2 failed\n"); /* ok( !memcmp( ac, out, sizeof ac/2 ), "tables different\n"); */ ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); @@ -302,9 +302,9 @@ static void test_accel2(void) ac[0].cmd = 0xffff; ac[0].fVirt = 0xff; ac[0].key = 0xffff; - hac = CreateAcceleratorTable( &ac[0], 1); + hac = CreateAcceleratorTableA( &ac[0], 1); ok( hac != NULL , "fail\n"); - ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy 1 failed\n"); + ok( 1 == CopyAcceleratorTableA( hac, out, 1 ), "copy 1 failed\n"); /* ok( memcmp( ac, out, sizeof ac/2 ), "tables not different\n"); */ ok( out[0].cmd == ac[0].cmd, "cmd modified\n"); ok( out[0].fVirt == (ac[0].fVirt&0x7f), "fVirt not modified\n"); @@ -313,9 +313,9 @@ static void test_accel2(void) /* how turning on all bits? */ memset( ac, 0xff, sizeof ac ); - hac = CreateAcceleratorTable( &ac[0], 2); + hac = CreateAcceleratorTableA( &ac[0], 2); ok( hac != NULL , "fail\n"); - res = CopyAcceleratorTable( hac, out, 2 ); + res = CopyAcceleratorTableA( hac, out, 2 ); ok( res == 2, "copy 2 failed %d\n", res); /* ok( memcmp( ac, out, sizeof ac ), "tables not different\n"); */ ok( out[0].cmd == ac[0].cmd, "cmd modified\n"); @@ -365,14 +365,14 @@ static void test_LoadImage(void) HBITMAP bmp; HRSRC hres; - bmp = LoadBitmapA(GetModuleHandle(NULL), MAKEINTRESOURCE(100)); + bmp = LoadBitmapA(GetModuleHandleA(NULL), MAKEINTRESOURCEA(100)); ok(bmp != NULL, "Could not load a bitmap resource\n"); if (bmp) DeleteObject(bmp); - hres = FindResource(GetModuleHandle(NULL), "#100", RT_BITMAP); + hres = FindResourceA(GetModuleHandleA(NULL), "#100", (LPCSTR)RT_BITMAP); ok(hres != NULL, "Could not find a bitmap resource with a numeric string\n"); - bmp = LoadBitmapA(GetModuleHandle(NULL), "#100"); + bmp = LoadBitmapA(GetModuleHandleA(NULL), "#100"); ok(bmp != NULL, "Could not load a bitmap resource with a numeric string\n"); if (bmp) DeleteObject(bmp); }

1 0

Dmitry Timoshkov : user32/tests: Fix scroll tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 4d5c6684475a3170a421400231a25e4f125795e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5c6684475a3170a42140023… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:09 2013 +0900 user32/tests: Fix scroll tests compilation with __WINESRC__ defined. --- dlls/user32/tests/scroll.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 0f0ede2..df37534 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -56,7 +56,7 @@ static void scrollbar_test_track(void) { /* test that scrollbar tracking is terminated when * the control looses mouse capture */ - SendMessage( hScroll, WM_LBUTTONDOWN, 0, MAKELPARAM( 1, 1)); + SendMessageA( hScroll, WM_LBUTTONDOWN, 0, MAKELPARAM( 1, 1)); /* a normal return from the sendmessage */ /* not normal for instance by closing the windws */ ok( IsWindow( hScroll), "Scrollbar has gone!\n"); @@ -467,7 +467,7 @@ static void scrollbar_test_init(void) wc.cbSize = sizeof wc; wc.style = CS_VREDRAW | CS_HREDRAW; wc.hInstance = GetModuleHandleA(0); - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszClassName = cls_name; wc.lpfnWndProc = scroll_init_proc; @@ -495,7 +495,7 @@ START_TEST ( scroll ) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, IDC_IBEAM); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "MyTestWnd";

1 0

Dmitry Timoshkov : user32/tests: Fix static control tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 371824fb857d418182d7b7b3db8ad0b92fd9b132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371824fb857d418182d7b7b3d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:13 2013 +0900 user32/tests: Fix static control tests compilation with __WINESRC__ defined. --- dlls/user32/tests/static.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 13955aa..51d2bc3 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -50,14 +50,14 @@ 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(); } } static HWND build_static(DWORD style) { - return CreateWindow("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); + return CreateWindowA("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); } static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -76,7 +76,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara break; } - return DefWindowProc(hwnd, msg, wparam, lparam); + return DefWindowProcA(hwnd, msg, wparam, lparam); } static void test_updates(int style, int flags) @@ -120,23 +120,23 @@ static void test_updates(int style, int flags) START_TEST(static) { static char szClassName[] = "testclass"; - WNDCLASSEX wndclass; + WNDCLASSEXA wndclass; wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc; wndclass.cbClsExtra = 0; wndclass.cbWndExtra = 0; - wndclass.hInstance = GetModuleHandle(NULL); - wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION); - wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); wndclass.lpszClassName = szClassName; wndclass.lpszMenuName = NULL; - RegisterClassEx(&wndclass); + RegisterClassExA(&wndclass); - hMainWnd = CreateWindow(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL); + hMainWnd = CreateWindowA(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); test_updates(0, 0);

1 0

Dmitry Timoshkov : user32/tests: Fix system parameters tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: c4ec0ed2d630c2cc7ded6d1c5f688d90c34f55ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ec0ed2d630c2cc7ded6d1c5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:16 2013 +0900 user32/tests: Fix system parameters tests compilation with __WINESRC__ defined. --- dlls/user32/tests/sysparams.c | 60 ++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d4704fa..32432f5 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -727,8 +727,8 @@ static BOOL test_setborder(UINT curr_val, int usesetborder, int dpi) INT frame; NONCLIENTMETRICSA ncm; - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); - rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); if( usesetborder) { rc=SystemParametersInfoA( SPI_SETBORDER, curr_val, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); @@ -752,7 +752,7 @@ static BOOL test_setborder(UINT curr_val, int usesetborder, int dpi) /* minimum border width is 1 */ if (curr_val == 0) curr_val = 1; /* should be the same as the non client metrics */ - rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); eq( (UINT)ncm.iBorderWidth, curr_val, "NonClientMetric.iBorderWidth", "%d"); /* and from SPI_GETBORDER */ @@ -772,12 +772,12 @@ static void test_SPI_SETBORDER( void ) /* 6 */ { BOOL rc; UINT old_border; - NONCLIENTMETRICS ncmsave; + NONCLIENTMETRICSA ncmsave; INT CaptionWidth, PaddedBorderWidth; - ncmsave.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); - rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0); + ncmsave.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0); if( !rc) { win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); return; @@ -1468,7 +1468,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ trace("testing SPI_{GET,SET}NONCLIENTMETRICS\n"); change_counter = 0; SetLastError(0xdeadbeef); - rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, FALSE ); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmorig, FALSE ); if (!test_error_msg(rc,"SPI_{GET,SET}NONCLIENTMETRICS")) return; Ncmstart = Ncmorig; @@ -1516,7 +1516,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); test_change_message( SPI_SETNONCLIENTMETRICS, 1 ); /* get them back */ - rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmcur, FALSE ); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE ); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); /* test registry entries */ TEST_NONCLIENTMETRICS_REG( Ncmcur) @@ -1541,7 +1541,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ /* raw values are in registry */ TEST_NONCLIENTMETRICS_REG( Ncmnew) /* get them back */ - rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmcur, FALSE ); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE ); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); /* cooked values are returned */ expect = max( Ncmnew.iMenuHeight, 2 + get_tmheight( &Ncmnew.lfMenuFont, 1)); @@ -1565,7 +1565,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ /* test the system metrics with these settings */ test_GetSystemMetrics(); /* restore */ - rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), + rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmorig, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); test_change_message( SPI_SETNONCLIENTMETRICS, 0 ); ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); @@ -2447,7 +2447,7 @@ static void test_SPI_SETWALLPAPER( void ) /* 115 */ static void test_WM_DISPLAYCHANGE(void) { - DEVMODE mode, startmode; + DEVMODEA mode, startmode; int start_bpp, last_set_bpp = 0; int test_bpps[] = {8, 16, 24, 32}, i; LONG change_ret; @@ -2463,10 +2463,10 @@ static void test_WM_DISPLAYCHANGE(void) memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); - EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &startmode); + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &startmode); start_bpp = startmode.dmBitsPerPel; - displaychange_sem = CreateSemaphore(NULL, 0, 1, NULL); + displaychange_sem = CreateSemaphoreW(NULL, 0, 1, NULL); for(i = 0; i < sizeof(test_bpps)/sizeof(test_bpps[0]); i++) { last_bpp = -1; @@ -2658,37 +2658,37 @@ static void test_GetSystemMetrics( void) UINT IconSpacing, IconVerticalSpacing; BOOL rc; - HDC hdc = CreateIC( "Display", 0, 0, 0); + HDC hdc = CreateICA( "Display", 0, 0, 0); UINT avcwCaption; INT CaptionWidthfromreg; MINIMIZEDMETRICS minim; - NONCLIENTMETRICS ncm; + NONCLIENTMETRICSA ncm; SIZE screen; assert(sizeof(ncm) == 344); - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); - rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc, "SystemParametersInfoA failed\n"); - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth) - 1; - rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth) - 1; + rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(!rc, "SystemParametersInfoA should fail\n"); - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth) + 1; + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth) + 1; SetLastError(0xdeadbeef); - rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(!rc, "SystemParametersInfoA should fail\n"); ncm.cbSize = sizeof(ncm); /* Vista added padding */ SetLastError(0xdeadbeef); - rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc || broken(!rc) /* before Vista */, "SystemParametersInfoA failed\n"); minim.cbSize = sizeof( minim); - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); - SystemParametersInfo( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); - rc = SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + SystemParametersInfoA( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); + rc = SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); if( !rc) { win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); return; @@ -2837,14 +2837,14 @@ static void test_GetSystemMetrics( void) static void test_EnumDisplaySettings(void) { - DEVMODE devmode; + DEVMODEA devmode; DWORD val; HDC hdc; DWORD num; memset(&devmode, 0, sizeof(devmode)); /* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */ - EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); @@ -2865,7 +2865,7 @@ static void test_EnumDisplaySettings(void) num = 1; while (1) { SetLastError (0xdeadbeef); - if (!EnumDisplaySettings(NULL, num++, &devmode)) { + if (!EnumDisplaySettingsA(NULL, num++, &devmode)) { DWORD le = GetLastError(); ok(le == ERROR_NO_MORE_FILES || le == 0xdeadbeef, /* XP, 2003 */ @@ -2935,8 +2935,8 @@ START_TEST(sysparams) wc.lpfnWndProc = SysParamsTestWndProc; wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW; wc.hInstance = hInstance; - wc.hIcon = LoadIconA( 0, IDI_APPLICATION ); - wc.hCursor = LoadCursorA( 0, IDC_ARROW ); + wc.hIcon = LoadIconA( 0, (LPCSTR)IDI_APPLICATION ); + wc.hCursor = LoadCursorA( 0, (LPCSTR)IDC_ARROW ); wc.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); wc.lpszMenuName = 0; wc.cbClsExtra = 0;

1 0

Dmitry Timoshkov : user32/tests: Fix text drawing tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 4734bd9edbabd0608676c4bd909c2e899775263b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4734bd9edbabd0608676c4bd9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:20 2013 +0900 user32/tests: Fix text drawing tests compilation with __WINESRC__ defined. --- dlls/user32/tests/text.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 1874b15..217baab 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -675,23 +675,23 @@ static void test_DrawState(void) assert(hdc); SetLastError(0xdeadbeef); - ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, (LPARAM)text, strlen(text), + ret = DrawStateA(hdc, GetStockObject(DKGRAY_BRUSH), NULL, (LPARAM)text, strlen(text), 0, 0, 10, 10, DST_TEXT); ok(ret, "DrawState error %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, (LPARAM)text, 0, + ret = DrawStateA(hdc, GetStockObject(DKGRAY_BRUSH), NULL, (LPARAM)text, 0, 0, 0, 10, 10, DST_TEXT); ok(ret, "DrawState error %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, 0, strlen(text), + ret = DrawStateA(hdc, GetStockObject(DKGRAY_BRUSH), NULL, 0, strlen(text), 0, 0, 10, 10, DST_TEXT); ok(!ret || broken(ret) /* win98 */, "DrawState succeeded\n"); ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, 0, 0, + ret = DrawStateA(hdc, GetStockObject(DKGRAY_BRUSH), NULL, 0, 0, 0, 0, 10, 10, DST_TEXT); ok(!ret || broken(ret) /* win98 */, "DrawState succeeded\n"); ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError());

1 0