James Hawkins : shell32: Remove calls to unicode functions that aren' t implemented in win9x.
Alexandre Julliard
julliard at winehq.org
Mon Sep 15 06:54:45 CDT 2008
Module: wine
Branch: master
Commit: 17a3949007524437c1026b98d7a5d63b2bef8bad
URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a3949007524437c1026b98d7a5d63b2bef8bad
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Sun Sep 14 19:54:05 2008 -0500
shell32: Remove calls to unicode functions that aren't implemented in win9x.
---
dlls/shell32/tests/appbar.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c
index 8c2315f..ae06a90 100644
--- a/dlls/shell32/tests/appbar.c
+++ b/dlls/shell32/tests/appbar.c
@@ -26,7 +26,7 @@
#define MSG_APPBAR WM_APP
-static const WCHAR testwindow_class[] = {'t','e','s','t','w','i','n','d','o','w',0};
+static const CHAR testwindow_class[] = "testwindow";
static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD);
@@ -107,16 +107,16 @@ static void do_events(void)
{
MSG msg;
- while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
+ while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE))
{
TranslateMessage(&msg);
- DispatchMessageW(&msg);
+ DispatchMessageA(&msg);
}
}
static void register_testwindow_class(void)
{
- WNDCLASSEXW cls;
+ WNDCLASSEXA cls;
ZeroMemory(&cls, sizeof(cls));
cls.cbSize = sizeof(cls);
@@ -127,7 +127,7 @@ static void register_testwindow_class(void)
cls.hbrBackground = (HBRUSH) COLOR_WINDOW;
cls.lpszClassName = testwindow_class;
- RegisterClassExW(&cls);
+ RegisterClassExA(&cls);
}
static void test_setpos(void)
@@ -143,7 +143,7 @@ static void test_setpos(void)
screen_height = GetSystemMetrics(SM_CYSCREEN);
/* create and register window1 */
- window1 = CreateWindowExW(WS_EX_TOOLWINDOW|WS_EX_TOPMOST,
+ window1 = CreateWindowExA(WS_EX_TOOLWINDOW|WS_EX_TOPMOST,
testwindow_class, testwindow_class, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0,
NULL, NULL, NULL, NULL);
ok(window1 != NULL, "couldn't create window\n");
@@ -170,7 +170,7 @@ static void test_setpos(void)
do_events();
/* create and register window2 */
- window2 = CreateWindowExW(WS_EX_TOOLWINDOW|WS_EX_TOPMOST,
+ window2 = CreateWindowExA(WS_EX_TOOLWINDOW|WS_EX_TOPMOST,
testwindow_class, testwindow_class, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0,
NULL, NULL, NULL, NULL);
ok(window2 != NULL, "couldn't create window\n");
@@ -204,7 +204,7 @@ static void test_setpos(void)
window2_info.allocated_rect.left, window2_info.allocated_rect.top, window2_info.allocated_rect.right, window2_info.allocated_rect.bottom);
/* create and register window3 */
- window3 = CreateWindowExW(WS_EX_TOOLWINDOW|WS_EX_TOPMOST,
+ window3 = CreateWindowExA(WS_EX_TOOLWINDOW|WS_EX_TOPMOST,
testwindow_class, testwindow_class, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0,
NULL, NULL, NULL, NULL);
ok(window3 != NULL, "couldn't create window\n");
More information about the wine-cvs
mailing list