twain_32/tests: Compile with -D__WINESRC__.

This commit is contained in:
Michael Stefaniuc 2013-10-17 23:12:58 +02:00 committed by Alexandre Julliard
parent 640dd17acf
commit f67893bd82
2 changed files with 4 additions and 6 deletions

View File

@ -1,6 +1,5 @@
TESTDLL = twain_32.dll TESTDLL = twain_32.dll
IMPORTS = user32 gdi32 IMPORTS = user32 gdi32
EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ C_SRCS = \
dsm.c dsm.c

View File

@ -36,12 +36,12 @@ static BOOL dsm_RegisterWindowClasses(void)
BOOL rc; BOOL rc;
cls.style = 0; cls.style = 0;
cls.lpfnWndProc = DefWindowProc; cls.lpfnWndProc = DefWindowProcA;
cls.cbClsExtra = 0; cls.cbClsExtra = 0;
cls.cbWndExtra = 0; cls.cbWndExtra = 0;
cls.hInstance = GetModuleHandleA(0); cls.hInstance = GetModuleHandleA(0);
cls.hIcon = 0; cls.hIcon = 0;
cls.hCursor = LoadCursorA(0, IDC_ARROW); cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW);
cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.hbrBackground = GetStockObject(WHITE_BRUSH);
cls.lpszMenuName = NULL; cls.lpszMenuName = NULL;
cls.lpszClassName = "TWAIN_dsm_class"; cls.lpszClassName = "TWAIN_dsm_class";
@ -861,9 +861,8 @@ START_TEST(dsm)
appid.ProtocolMinor = TWON_PROTOCOLMINOR; appid.ProtocolMinor = TWON_PROTOCOLMINOR;
appid.SupportedGroups = DG_CONTROL | DG_IMAGE; appid.SupportedGroups = DG_CONTROL | DG_IMAGE;
hwnd = CreateWindow("TWAIN_dsm_class", "Twain Test", 0, hwnd = CreateWindowA("TWAIN_dsm_class", "Twain Test", 0, CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandleA(NULL), NULL);
NULL, NULL, GetModuleHandleA(0), NULL);
rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd); rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd);
ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d\n", rc); ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d\n", rc);