Saulius Krasuckas : comctl32/tests: Make mru.c, pager.c and syslink. c compile with -D__WINESRC__.
Alexandre Julliard
julliard at winehq.org
Fri Nov 8 10:36:49 CST 2013
Module: wine
Branch: master
Commit: 26ec350b73f490c2df8b0c87e8cff5545d8cb5bb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ec350b73f490c2df8b0c87e8cff5545d8cb5bb
Author: Saulius Krasuckas <saulius2 at ar.fi.lt>
Date: Sat Oct 19 22:35:01 2013 +0300
comctl32/tests: Make mru.c, pager.c and syslink.c compile with -D__WINESRC__.
---
dlls/comctl32/tests/mru.c | 8 ++++----
dlls/comctl32/tests/pager.c | 4 ++--
dlls/comctl32/tests/syslink.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c
index 1d8ad9a..5b5f98e 100644
--- a/dlls/comctl32/tests/mru.c
+++ b/dlls/comctl32/tests/mru.c
@@ -409,7 +409,7 @@ static void test_MRUListA(void)
/* check entry 0 */
buffer[0] = 0;
iRet = pEnumMRUListA(hMRU, 0, buffer, 255);
- ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet);
+ ok(iRet == lstrlenA(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[3]), iRet);
ok(strcmp(buffer, checks[3]) == 0, "EnumMRUList expected %s, got %s\n", checks[3], buffer);
/* check entry 0 with a too small buffer */
@@ -418,7 +418,7 @@ static void test_MRUListA(void)
buffer[2] = 'A'; /* unchanged */
buffer[3] = 0; /* unchanged */
iRet = pEnumMRUListA(hMRU, 0, buffer, 2);
- ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet);
+ ok(iRet == lstrlenA(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[3]), iRet);
ok(strcmp(buffer, "T") == 0, "EnumMRUList expected %s, got %s\n", "T", buffer);
/* make sure space after buffer has old values */
ok(buffer[2] == 'A', "EnumMRUList expected %02x, got %02x\n", 'A', buffer[2]);
@@ -426,13 +426,13 @@ static void test_MRUListA(void)
/* check entry 1 */
buffer[0] = 0;
iRet = pEnumMRUListA(hMRU, 1, buffer, 255);
- ok(iRet == lstrlen(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[1]), iRet);
+ ok(iRet == lstrlenA(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[1]), iRet);
ok(strcmp(buffer, checks[1]) == 0, "EnumMRUList expected %s, got %s\n", checks[1], buffer);
/* check entry 2 */
buffer[0] = 0;
iRet = pEnumMRUListA(hMRU, 2, buffer, 255);
- ok(iRet == lstrlen(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[2]), iRet);
+ ok(iRet == lstrlenA(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[2]), iRet);
ok(strcmp(buffer, checks[2]) == 0, "EnumMRUList expected %s, got %s\n", checks[2], buffer);
/* check out of bounds entry 3 */
diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c
index 56cadaf..d352140 100644
--- a/dlls/comctl32/tests/pager.c
+++ b/dlls/comctl32/tests/pager.c
@@ -100,7 +100,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 = "Pager test parent class";
@@ -112,7 +112,7 @@ static HWND create_parent_window(void)
if (!register_parent_wnd_class())
return NULL;
- return CreateWindow("Pager test parent class", "Pager test parent window",
+ return CreateWindowA("Pager test parent class", "Pager test parent window",
WS_OVERLAPPED | WS_VISIBLE,
0, 0, 200, 200, 0, NULL, GetModuleHandleA(NULL), NULL );
}
diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c
index 26bd924..d493cb7 100644
--- a/dlls/comctl32/tests/syslink.c
+++ b/dlls/comctl32/tests/syslink.c
@@ -70,7 +70,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();
}
}
@@ -245,8 +245,8 @@ START_TEST(syslink)
/* Make the SysLink control visible */
flush_sequences(sequences, NUM_MSG_SEQUENCE);
- oldstyle = GetWindowLong(hWndSysLink, GWL_STYLE);
- SetWindowLong(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE);
+ oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE);
+ SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE);
RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE);
flush_events();
ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE);
More information about the wine-cvs
mailing list