[PATCH 6/7] comctl32/tests: Make updown.c compile with -D__WINESRC__.
Saulius Krasuckas
saulius2 at ar.fi.lt
Thu Nov 7 13:09:21 CST 2013
>From ac80515698970211ede5fafba6d5c5c7a472a62c Mon Sep 17 00:00:00 2001
From: Saulius Krasuckas <saulius2 at ar.fi.lt>
Date: Sat, 19 Oct 2013 23:33:28 +0300
Subject: [PATCH 6/7] comctl32/tests: Make updown.c compile with -D__WINESRC__.
---
dlls/comctl32/tests/updown.c | 128 +++++++++++++++++++++---------------------
1 file changed, 64 insertions(+), 64 deletions(-)
diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c
index 188e346..6e0c92c 100644
--- a/dlls/comctl32/tests/updown.c
+++ b/dlls/comctl32/tests/updown.c
@@ -207,7 +207,7 @@ static BOOL register_parent_wnd_class(void)
cls.cbWndExtra = 0;
cls.hInstance = GetModuleHandleA(NULL);
cls.hIcon = 0;
- cls.hCursor = LoadCursorA(0, IDC_ARROW);
+ cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW);
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
cls.lpszMenuName = NULL;
cls.lpszClassName = "Up-Down test parent class";
@@ -219,7 +219,7 @@ static HWND create_parent_window(void)
if (!register_parent_wnd_class())
return NULL;
- return CreateWindowEx(0, "Up-Down test parent class",
+ return CreateWindowExA(0, "Up-Down test parent class",
"Up-Down test parent window",
WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX |
WS_MAXIMIZEBOX | WS_VISIBLE,
@@ -322,48 +322,48 @@ static void test_updown_pos(void)
flush_sequences(sequences, NUM_MSG_SEQUENCES);
/* Set Range from 0 to 100 */
- SendMessage(updown, UDM_SETRANGE, 0 , MAKELONG(100,0) );
- r = SendMessage(updown, UDM_GETRANGE, 0,0);
+ SendMessageA(updown, UDM_SETRANGE, 0 , MAKELONG(100,0) );
+ r = SendMessageA(updown, UDM_GETRANGE, 0,0);
expect(100,LOWORD(r));
expect(0,HIWORD(r));
/* Set the position to 5, return is not checked as it was set before func call */
- SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(5,0) );
+ SendMessageA(updown, UDM_SETPOS, 0 , MAKELONG(5,0) );
/* Since UDM_SETBUDDYINT was not set at creation HIWORD(r) will always be 1 as a return from UDM_GETPOS */
/* Get the position, which should be 5 */
- r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
+ r = SendMessageA(updown, UDM_GETPOS, 0 , 0 );
expect(5,LOWORD(r));
expect(1,HIWORD(r));
/* Set the position to 0, return should be 5 */
- r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(0,0) );
+ r = SendMessageA(updown, UDM_SETPOS, 0 , MAKELONG(0,0) );
expect(5,r);
/* Get the position, which should be 0 */
- r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
+ r = SendMessageA(updown, UDM_GETPOS, 0 , 0 );
expect(0,LOWORD(r));
expect(1,HIWORD(r));
/* Set the position to -1, return should be 0 */
- r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(-1,0) );
+ r = SendMessageA(updown, UDM_SETPOS, 0 , MAKELONG(-1,0) );
expect(0,r);
/* Get the position, which should be 0 */
- r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
+ r = SendMessageA(updown, UDM_GETPOS, 0 , 0 );
expect(0,LOWORD(r));
expect(1,HIWORD(r));
/* Set the position to 100, return should be 0 */
- r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(100,0) );
+ r = SendMessageA(updown, UDM_SETPOS, 0 , MAKELONG(100,0) );
expect(0,r);
/* Get the position, which should be 100 */
- r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
+ r = SendMessageA(updown, UDM_GETPOS, 0 , 0 );
expect(100,LOWORD(r));
expect(1,HIWORD(r));
/* Set the position to 101, return should be 100 */
- r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(101,0) );
+ r = SendMessageA(updown, UDM_SETPOS, 0 , MAKELONG(101,0) );
expect(100,r);
/* Get the position, which should be 100 */
- r = SendMessage(updown, UDM_GETPOS, 0 , 0 );
+ r = SendMessageA(updown, UDM_GETPOS, 0 , 0 );
expect(100,LOWORD(r));
expect(1,HIWORD(r));
@@ -376,56 +376,56 @@ static void test_updown_pos(void)
updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT | UDS_ARROWKEYS, g_edit);
/* test sequence only on 5.8x versions */
- r = SendMessage(updown, UDM_GETPOS32, 0, 0);
+ r = SendMessageA(updown, UDM_GETPOS32, 0, 0);
if (r)
{
UDACCEL accel;
flush_sequences(sequences, NUM_MSG_SEQUENCES);
- r = SendMessage(updown, UDM_SETPOS, 0, 50);
+ r = SendMessageA(updown, UDM_SETPOS, 0, 50);
expect(50,r);
ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq,
"test updown pos, no change", FALSE);
- SendMessage(updown, UDM_SETRANGE, 0, MAKELONG(1, 40));
- r = SendMessage(updown, UDM_GETRANGE, 0, 0);
+ SendMessageA(updown, UDM_SETRANGE, 0, MAKELONG(1, 40));
+ r = SendMessageA(updown, UDM_GETRANGE, 0, 0);
expect(1, LOWORD(r));
expect(40, HIWORD(r));
accel.nSec = 0;
accel.nInc = 5;
- r = SendMessage(updown, UDM_SETACCEL, 1, (LPARAM)&accel);
+ r = SendMessageA(updown, UDM_SETACCEL, 1, (LPARAM)&accel);
expect(TRUE, r);
- r = SendMessage(updown, UDM_GETPOS, 0, 0);
+ r = SendMessageA(updown, UDM_GETPOS, 0, 0);
expect(40, LOWORD(r));
expect(1, HIWORD(r));
- r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(0, 0));
+ r = SendMessageA(updown, UDM_SETPOS, 0, MAKELONG(0, 0));
expect(40, LOWORD(r));
expect(0, HIWORD(r));
- r = SendMessage(updown, UDM_GETPOS, 0, 0);
+ r = SendMessageA(updown, UDM_GETPOS, 0, 0);
expect(1, LOWORD(r));
expect(0, HIWORD(r));
- r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(2, 0));
+ r = SendMessageA(updown, UDM_SETPOS, 0, MAKELONG(2, 0));
expect(1, LOWORD(r));
expect(0, HIWORD(r));
- r = SendMessage(g_edit, WM_KEYDOWN, VK_UP, 0);
+ r = SendMessageA(g_edit, WM_KEYDOWN, VK_UP, 0);
expect(0, r);
- r = SendMessage(updown, UDM_GETPOS, 0, 0);
+ r = SendMessageA(updown, UDM_GETPOS, 0, 0);
expect(1, LOWORD(r));
expect(0, HIWORD(r));
- r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(50, 0));
+ r = SendMessageA(updown, UDM_SETPOS, 0, MAKELONG(50, 0));
expect(1, LOWORD(r));
expect(0, HIWORD(r));
- r = SendMessage(updown, UDM_GETPOS, 0, 0);
+ r = SendMessageA(updown, UDM_GETPOS, 0, 0);
expect(40, LOWORD(r));
expect(0, HIWORD(r));
}
@@ -444,10 +444,10 @@ static void test_updown_pos32(void)
flush_sequences(sequences, NUM_MSG_SEQUENCES);
/* Set the position to 0 to 1000 */
- SendMessage(updown, UDM_SETRANGE32, 0 , 1000 );
+ SendMessageA(updown, UDM_SETRANGE32, 0 , 1000 );
low = high = -1;
- r = SendMessage(updown, UDM_GETRANGE32, (WPARAM) &low , (LPARAM) &high );
+ r = SendMessageA(updown, UDM_GETRANGE32, (WPARAM) &low , (LPARAM) &high );
expect(0,r);
if (low == -1)
{
@@ -460,7 +460,7 @@ static void test_updown_pos32(void)
expect(1000,high);
/* Set position to 500 */
- r = SendMessage(updown, UDM_SETPOS32, 0 , 500 );
+ r = SendMessageA(updown, UDM_SETPOS32, 0 , 500 );
if (!r)
{
win_skip("UDM_SETPOS32 and UDM_GETPOS32 need 5.80\n");
@@ -471,35 +471,35 @@ static void test_updown_pos32(void)
/* Since UDM_SETBUDDYINT was not set at creation bRet will always be true as a return from UDM_GETPOS32 */
- r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
+ r = SendMessageA(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
expect(500,r);
expect(1,high);
/* Set position to 0, return should be 500 */
- r = SendMessage(updown, UDM_SETPOS32, 0 , 0 );
+ r = SendMessageA(updown, UDM_SETPOS32, 0 , 0 );
expect(500,r);
- r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
+ r = SendMessageA(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
expect(0,r);
expect(1,high);
/* Set position to -1 which should become 0, return should be 0 */
- r = SendMessage(updown, UDM_SETPOS32, 0 , -1 );
+ r = SendMessageA(updown, UDM_SETPOS32, 0 , -1 );
expect(0,r);
- r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
+ r = SendMessageA(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
expect(0,r);
expect(1,high);
/* Set position to 1000, return should be 0 */
- r = SendMessage(updown, UDM_SETPOS32, 0 , 1000 );
+ r = SendMessageA(updown, UDM_SETPOS32, 0 , 1000 );
expect(0,r);
- r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
+ r = SendMessageA(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
expect(1000,r);
expect(1,high);
/* Set position to 1001 which should become 1000, return should be 1000 */
- r = SendMessage(updown, UDM_SETPOS32, 0 , 1001 );
+ r = SendMessageA(updown, UDM_SETPOS32, 0 , 1001 );
expect(1000,r);
- r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
+ r = SendMessageA(updown, UDM_GETPOS32, 0 , (LPARAM) &high );
expect(1000,r);
expect(1,high);
@@ -513,7 +513,7 @@ static void test_updown_pos32(void)
flush_sequences(sequences, NUM_MSG_SEQUENCES);
- r = SendMessage(updown, UDM_SETPOS32, 0, 50);
+ r = SendMessageA(updown, UDM_SETPOS32, 0, 50);
expect(50,r);
ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq,
"test updown pos, no change", FALSE);
@@ -531,13 +531,13 @@ static void test_updown_buddy(void)
flush_sequences(sequences, NUM_MSG_SEQUENCES);
- buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 );
+ buddyReturn = (HWND)SendMessageA(updown, UDM_GETBUDDY, 0 , 0 );
ok(buddyReturn == g_edit, "Expected edit handle\n");
- buddyReturn = (HWND)SendMessage(updown, UDM_SETBUDDY, (WPARAM) g_edit, 0);
+ buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, (WPARAM) g_edit, 0);
ok(buddyReturn == g_edit, "Expected edit handle\n");
- buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 );
+ buddyReturn = (HWND)SendMessageA(updown, UDM_GETBUDDY, 0 , 0 );
ok(buddyReturn == g_edit, "Expected edit handle\n");
ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_buddy_seq, "test updown buddy", TRUE);
@@ -584,32 +584,32 @@ static void test_updown_base(void)
flush_sequences(sequences, NUM_MSG_SEQUENCES);
- SendMessage(updown, UDM_SETBASE, 10 , 0);
- r = SendMessage(updown, UDM_GETBASE, 0 , 0);
+ SendMessageA(updown, UDM_SETBASE, 10 , 0);
+ r = SendMessageA(updown, UDM_GETBASE, 0 , 0);
expect(10,r);
/* Set base to an invalid value, should return 0 and stay at 10 */
- r = SendMessage(updown, UDM_SETBASE, 80 , 0);
+ r = SendMessageA(updown, UDM_SETBASE, 80 , 0);
expect(0,r);
- r = SendMessage(updown, UDM_GETBASE, 0 , 0);
+ r = SendMessageA(updown, UDM_GETBASE, 0 , 0);
expect(10,r);
/* Set base to 16 now, should get 16 as the return */
- r = SendMessage(updown, UDM_SETBASE, 16 , 0);
+ r = SendMessageA(updown, UDM_SETBASE, 16 , 0);
expect(10,r);
- r = SendMessage(updown, UDM_GETBASE, 0 , 0);
+ r = SendMessageA(updown, UDM_GETBASE, 0 , 0);
expect(16,r);
/* Set base to an invalid value, should return 0 and stay at 16 */
- r = SendMessage(updown, UDM_SETBASE, 80 , 0);
+ r = SendMessageA(updown, UDM_SETBASE, 80 , 0);
expect(0,r);
- r = SendMessage(updown, UDM_GETBASE, 0 , 0);
+ r = SendMessageA(updown, UDM_GETBASE, 0 , 0);
expect(16,r);
/* Set base back to 10, return should be 16 */
- r = SendMessage(updown, UDM_SETBASE, 10 , 0);
+ r = SendMessageA(updown, UDM_SETBASE, 10 , 0);
expect(16,r);
- r = SendMessage(updown, UDM_GETBASE, 0 , 0);
+ r = SendMessageA(updown, UDM_GETBASE, 0 , 0);
expect(10,r);
ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_base_seq, "test updown base", FALSE);
@@ -619,13 +619,13 @@ static void test_updown_base(void)
/* switch base with buddy attached */
updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT, g_edit);
- r = SendMessage(updown, UDM_SETPOS, 0, 10);
+ r = SendMessageA(updown, UDM_SETPOS, 0, 10);
expect(50, r);
GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR));
ok(lstrcmpA(text, "10") == 0, "Expected '10', got '%s'\n", text);
- r = SendMessage(updown, UDM_SETBASE, 16, 0);
+ r = SendMessageA(updown, UDM_SETBASE, 16, 0);
expect(10, r);
GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR));
@@ -646,14 +646,14 @@ static void test_updown_unicode(void)
flush_sequences(sequences, NUM_MSG_SEQUENCES);
/* Set it to ANSI, don't check return as we don't know previous state */
- SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0);
- r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0);
+ SendMessageA(updown, UDM_SETUNICODEFORMAT, 0 , 0);
+ r = SendMessageA(updown, UDM_GETUNICODEFORMAT, 0 , 0);
expect(0,r);
/* Now set it to Unicode format */
- r = SendMessage(updown, UDM_SETUNICODEFORMAT, 1 , 0);
+ r = SendMessageA(updown, UDM_SETUNICODEFORMAT, 1 , 0);
expect(0,r);
- r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0);
+ r = SendMessageA(updown, UDM_GETUNICODEFORMAT, 0 , 0);
if (!r)
{
win_skip("UDM_SETUNICODEFORMAT not available\n");
@@ -663,9 +663,9 @@ static void test_updown_unicode(void)
expect(1,r);
/* And now set it back to ANSI */
- r = SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0);
+ r = SendMessageA(updown, UDM_SETUNICODEFORMAT, 0 , 0);
expect(1,r);
- r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0);
+ r = SendMessageA(updown, UDM_GETUNICODEFORMAT, 0 , 0);
expect(0,r);
ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_unicode_seq, "test updown unicode", FALSE);
@@ -761,7 +761,7 @@ static void test_UDS_SETBUDDYINT(void)
SetWindowLongA(updown, GWL_STYLE, style | UDS_SETBUDDYINT);
style = GetWindowLongA(updown, GWL_STYLE);
ok(style & UDS_SETBUDDYINT, "Expected UDS_SETBUDDY to be set\n");
- SendMessage(updown, UDM_SETPOS, 0, 20);
+ SendMessageA(updown, UDM_SETPOS, 0, 20);
GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR));
ok(lstrlenA(text) == 0, "Expected empty string\n");
DestroyWindow(updown);
@@ -774,7 +774,7 @@ static void test_UDS_SETBUDDYINT(void)
/* now remove style flag */
style = GetWindowLongA(updown, GWL_STYLE);
SetWindowLongA(updown, GWL_STYLE, style & ~UDS_SETBUDDYINT);
- SendMessage(updown, UDM_SETPOS, 0, 20);
+ SendMessageA(updown, UDM_SETPOS, 0, 20);
GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR));
ok(lstrcmpA(text, "20") == 0, "Expected '20', got '%s'\n", text);
/* set edit text directly, check position */
@@ -796,7 +796,7 @@ static void test_UDS_SETBUDDYINT(void)
/* set style back */
style = GetWindowLongA(updown, GWL_STYLE);
SetWindowLongA(updown, GWL_STYLE, style | UDS_SETBUDDYINT);
- SendMessage(updown, UDM_SETPOS, 0, 30);
+ SendMessageA(updown, UDM_SETPOS, 0, 30);
GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR));
ok(lstrcmpA(text, "30") == 0, "Expected '30', got '%s'\n", text);
DestroyWindow(updown);
--
1.7.10.4
More information about the wine-patches
mailing list