Dmitry Timoshkov : user32/tests: Fix monitor tests compilation with __WINESRC__ defined.
Alexandre Julliard
julliard at winehq.org
Thu Oct 24 13:18:55 CDT 2013
Module: wine
Branch: master
Commit: 33ff6d2549031b44c4b41debb7c97ac676cf3676
URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ff6d2549031b44c4b41debb7c97ac676cf3676
Author: Dmitry Timoshkov <dmitry at 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);
More information about the wine-cvs
mailing list