October 2013 - Wine-commits

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

24 Oct '13

Module: wine Branch: master Commit: 4c5a32e7917d1a4ff86b3ee3ab0d9ff37f0bb180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5a32e7917d1a4ff86b3ee3a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:25 2013 +0900 user32/tests: Fix window tests compilation with __WINESRC__ defined. --- dlls/user32/tests/win.c | 570 +++++++++++++++++++++++----------------------- 1 files changed, 285 insertions(+), 285 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c5a32e7917d1a4ff86b3…

1 0

Dmitry Timoshkov : user32/tests: Fix window station and desktop tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: b890c63660c2a16b1fac564e71ca750312fec5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b890c63660c2a16b1fac564e7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:29 2013 +0900 user32/tests: Fix window station and desktop tests compilation with __WINESRC__ defined. --- dlls/user32/tests/winstation.c | 62 ++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b890c63660c2a16b1fac5…

1 0

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

24 Oct '13

Module: wine Branch: master Commit: 154df653d669710f2431d1b4d0b25a15ff3efc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=154df653d669710f2431d1b4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:32 2013 +0900 user32/tests: Fix wsprintf tests compilation with __WINESRC__ defined. --- dlls/user32/tests/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 5370df4..b7e755b 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -118,7 +118,7 @@ static void CharUpperTest(void) failed = 0; for (i=0;i<256;i++) { - out = (INT_PTR)CharUpper((LPTSTR)i); + out = (INT_PTR)CharUpperA((LPSTR)i); /* printf("%0x ",out); */ if ((out >> 16) != 0) { @@ -136,7 +136,7 @@ static void CharLowerTest(void) failed = 0; for (i=0;i<256;i++) { - out = (INT_PTR)CharLower((LPTSTR)i); + out = (INT_PTR)CharLowerA((LPSTR)i); /* printf("%0x ",out); */ if ((out >> 16) != 0) {

1 0

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

24 Oct '13

Module: wine Branch: master Commit: ae3a6d52d0c1b00169e7cdbcf362473de2b36688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3a6d52d0c1b00169e7cdbcf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:36 2013 +0900 user32/tests: Enable user32 tests compilation with __WINESRC__ defined. --- dlls/user32/tests/Makefile.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 88c4447..eb5789a 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = user32.dll IMPORTS = user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ broadcast.c \

1 0

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

23 Oct '13

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 input tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

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 edit control tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

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 listbox tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

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

1 0

Piotr Caban : msvcrt/tests: Fix __unDName test failures on Win2000.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: d2c8dcb7e0e0dc13509f6ff459bdc0965594b31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c8dcb7e0e0dc13509f6ff45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 23 12:53:19 2013 +0200 msvcrt/tests: Fix __unDName test failures on Win2000. --- dlls/msvcrt/tests/cpp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index c8ff25d..c331db1 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1320,7 +1320,9 @@ static void test_demangle(void) "?_dispatch(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z"}, /* 126 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, /* 127 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & ptr64 cdecl std::operator*=(class std::complex<float> & ptr64,class std::complex<float> const & ptr64)", NULL, 1}, -/* 128 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", NULL, 2}, +/* 128 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", + "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", + "??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", 2}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name;

1 0

Piotr Caban : msvcr110: Forward _libm_sse2_*_precise functions to __libm_sse2_*.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: ed8ab4415306631a144342dcc2b883c7887f05bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8ab4415306631a144342dcc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 23 15:54:02 2013 +0200 msvcr110: Forward _libm_sse2_*_precise functions to __libm_sse2_*. --- dlls/msvcr110/msvcr110.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b82a58e..a704d1a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1385,17 +1385,17 @@ @ cdecl _kbhit() msvcrt._kbhit @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ stub _lfind_s -@ stub -arch=i386 _libm_sse2_acos_precise -@ stub -arch=i386 _libm_sse2_asin_precise -@ stub -arch=i386 _libm_sse2_atan_precise -@ stub -arch=i386 _libm_sse2_cos_precise -@ stub -arch=i386 _libm_sse2_exp_precise -@ stub -arch=i386 _libm_sse2_log10_precise -@ stub -arch=i386 _libm_sse2_log_precise -@ stub -arch=i386 _libm_sse2_pow_precise -@ stub -arch=i386 _libm_sse2_sin_precise +@ cdecl -arch=i386 _libm_sse2_acos_precise() msvcrt.__libm_sse2_acos +@ cdecl -arch=i386 _libm_sse2_asin_precise() msvcrt.__libm_sse2_asin +@ cdecl -arch=i386 _libm_sse2_atan_precise() msvcrt.__libm_sse2_atan +@ cdecl -arch=i386 _libm_sse2_cos_precise() msvcrt.__libm_sse2_cos +@ cdecl -arch=i386 _libm_sse2_exp_precise() msvcrt.__libm_sse2_exp +@ cdecl -arch=i386 _libm_sse2_log10_precise() msvcrt.__libm_sse2_log10 +@ cdecl -arch=i386 _libm_sse2_log_precise() msvcrt.__libm_sse2_log +@ cdecl -arch=i386 _libm_sse2_pow_precise() msvcrt.__libm_sse2_pow +@ cdecl -arch=i386 _libm_sse2_sin_precise() msvcrt.__libm_sse2_sin @ stub -arch=i386 _libm_sse2_sqrt_precise -@ stub -arch=i386 _libm_sse2_tan_precise +@ cdecl -arch=i386 _libm_sse2_tan_precise() msvcrt.__libm_sse2_tan @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) msvcrt._local_unwind2

1 0