Michael Stefaniuc : comctl32/tests: Finally compile with -D__WINESRC__.
Alexandre Julliard
julliard at winehq.org
Wed Dec 4 14:43:34 CST 2013
Module: wine
Branch: master
Commit: 5092ecf6fef9de7223f6e779543f6a2aad3544e6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5092ecf6fef9de7223f6e779543f6a2aad3544e6
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed Dec 4 00:49:00 2013 +0100
comctl32/tests: Finally compile with -D__WINESRC__.
---
dlls/comctl32/tests/Makefile.in | 1 -
dlls/comctl32/tests/comboex.c | 2 +-
dlls/comctl32/tests/header.c | 4 ++--
dlls/comctl32/tests/imagelist.c | 4 ++--
dlls/comctl32/tests/listview.c | 4 ++--
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in
index 55aea9c..670f52e 100644
--- a/dlls/comctl32/tests/Makefile.in
+++ b/dlls/comctl32/tests/Makefile.in
@@ -1,6 +1,5 @@
TESTDLL = comctl32.dll
IMPORTS = comctl32 ole32 user32 gdi32 advapi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \
comboex.c \
diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c
index b50db38..b0904d3 100644
--- a/dlls/comctl32/tests/comboex.c
+++ b/dlls/comctl32/tests/comboex.c
@@ -496,7 +496,7 @@ static BOOL init(void)
wc.cbWndExtra = 0;
wc.hInstance = GetModuleHandleA(NULL);
wc.hIcon = NULL;
- wc.hCursor = LoadCursorA(NULL, IDC_ARROW);
+ wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW);
wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW);
wc.lpszMenuName = NULL;
wc.lpszClassName = ComboExTestClass;
diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c
index 4ef4b5d..85437d0 100644
--- a/dlls/comctl32/tests/header.c
+++ b/dlls/comctl32/tests/header.c
@@ -459,7 +459,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 = "Header test parent class";
@@ -1661,7 +1661,7 @@ static BOOL init(void)
wc.cbWndExtra = 0;
wc.hInstance = GetModuleHandleA(NULL);
wc.hIcon = NULL;
- wc.hCursor = LoadCursorA(NULL, IDC_ARROW);
+ wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW);
wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW);
wc.lpszMenuName = NULL;
wc.lpszClassName = "HeaderTestClass";
diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
index e11ee1d..caf7539 100644
--- a/dlls/comctl32/tests/imagelist.c
+++ b/dlls/comctl32/tests/imagelist.c
@@ -145,8 +145,8 @@ static HWND create_a_window(void)
cls.cbClsExtra = 0;
cls.cbWndExtra = 0;
cls.hInstance = 0;
- cls.hIcon = LoadIconA (0, IDI_APPLICATION);
- cls.hCursor = LoadCursorA (0, IDC_ARROW);
+ cls.hIcon = LoadIconA(0, (LPCSTR)IDI_APPLICATION);
+ cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW);
cls.hbrBackground = GetStockObject (WHITE_BRUSH);
cls.lpszMenuName = 0;
cls.lpszClassName = className;
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 3c6ceef..f5d0a01 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -524,7 +524,7 @@ static BOOL register_parent_wnd_class(BOOL Unicode)
clsW.cbWndExtra = 0;
clsW.hInstance = GetModuleHandleW(NULL);
clsW.hIcon = 0;
- clsW.hCursor = LoadCursorA(0, IDC_ARROW);
+ clsW.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW);
clsW.hbrBackground = GetStockObject(WHITE_BRUSH);
clsW.lpszMenuName = NULL;
clsW.lpszClassName = testparentclassW;
@@ -537,7 +537,7 @@ static BOOL register_parent_wnd_class(BOOL Unicode)
clsA.cbWndExtra = 0;
clsA.hInstance = GetModuleHandleA(NULL);
clsA.hIcon = 0;
- clsA.hCursor = LoadCursorA(0, IDC_ARROW);
+ clsA.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW);
clsA.hbrBackground = GetStockObject(WHITE_BRUSH);
clsA.lpszMenuName = NULL;
clsA.lpszClassName = "Listview test parent class";
More information about the wine-cvs
mailing list