Michael Stefaniuc : twain_32/tests: Compile with -D__WINESRC__.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f67893bd8267f3ee0345d1a9e828714f1e9955b6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f67893bd8267f3ee0345d1a9e8...

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Thu Oct 17 23:12:58 2013 +0200

twain_32/tests: Compile with -D__WINESRC__.

---

 dlls/twain_32/tests/Makefile.in |    1 -
 dlls/twain_32/tests/dsm.c       |    9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/twain_32/tests/Makefile.in b/dlls/twain_32/tests/Makefile.in
index 4a1727f..060b20e 100644
--- a/dlls/twain_32/tests/Makefile.in
+++ b/dlls/twain_32/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = twain_32.dll
 IMPORTS   = user32 gdi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	dsm.c
diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c
index 96381e6..b8f1c9e 100644
--- a/dlls/twain_32/tests/dsm.c
+++ b/dlls/twain_32/tests/dsm.c
@@ -36,12 +36,12 @@ static BOOL dsm_RegisterWindowClasses(void)
     BOOL rc;
 
     cls.style = 0;
-    cls.lpfnWndProc = DefWindowProc;
+    cls.lpfnWndProc = DefWindowProcA;
     cls.cbClsExtra = 0;
     cls.cbWndExtra = 0;
     cls.hInstance = GetModuleHandleA(0);
     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 = "TWAIN_dsm_class";
@@ -861,9 +861,8 @@ START_TEST(dsm)
     appid.ProtocolMinor = TWON_PROTOCOLMINOR;
     appid.SupportedGroups = DG_CONTROL | DG_IMAGE;
 
-    hwnd = CreateWindow("TWAIN_dsm_class", "Twain Test", 0,
-                        CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-                        NULL, NULL, GetModuleHandleA(0), NULL);
+    hwnd = CreateWindowA("TWAIN_dsm_class", "Twain Test", 0, CW_USEDEFAULT, CW_USEDEFAULT,
+                         CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandleA(NULL), NULL);
 
     rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd);
     ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d\n", rc);