[akhaldi] 62924: [TWAIN_32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Wed Apr 23 14:59:06 2014
New Revision: 62924

URL: http://svn.reactos.org/svn/reactos?rev=62924&view=rev
Log:
[TWAIN_32_WINETEST]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/rostests/winetests/twain_32/dsm.c

Modified: trunk/rostests/winetests/twain_32/dsm.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/dsm.c?r...
==============================================================================
--- trunk/rostests/winetests/twain_32/dsm.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/twain_32/dsm.c	[iso-8859-1] Wed Apr 23 14:59:06 2014
@@ -36,12 +36,12 @@
     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 @@
     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);