From b6102b8d1dcedbb953da4936526da078bf9d748a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 23 Apr 2014 14:59:06 +0000 Subject: [PATCH] [TWAIN_32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 svn path=/trunk/; revision=62924 --- rostests/winetests/twain_32/dsm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rostests/winetests/twain_32/dsm.c b/rostests/winetests/twain_32/dsm.c index 96381e6879e..b8f1c9e0452 100644 --- a/rostests/winetests/twain_32/dsm.c +++ b/rostests/winetests/twain_32/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);