[TWAIN_32_WINETEST]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 23 Apr 2014 14:59:06 +0000 (14:59 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 23 Apr 2014 14:59:06 +0000 (14:59 +0000)
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62924

rostests/winetests/twain_32/dsm.c

index 96381e6..b8f1c9e 100644 (file)
@@ -36,12 +36,12 @@ static BOOL dsm_RegisterWindowClasses(void)
     BOOL rc;
 
     cls.style = 0;
     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.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";
     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;
 
     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);
 
     rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd);
     ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d\n", rc);