From a50d081cd89fe7da828558da7f0e36465f5cacf7 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Wed, 16 Oct 2013 22:57:41 +0200 Subject: [PATCH] msctf/tests: Compile with -D__WINESRC__. --- dlls/msctf/tests/Makefile.in | 1 - dlls/msctf/tests/inputprocessor.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in index 57afff2f54e..0a589f6068a 100644 --- a/dlls/msctf/tests/Makefile.in +++ b/dlls/msctf/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = msctf.dll IMPORTS = ole32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ inputprocessor.c diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 027795d25f4..eb293bc4b1f 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2000,10 +2000,10 @@ static void processPendingMessages(void) { if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } diff = time - GetTickCount(); } @@ -2032,11 +2032,11 @@ static void test_AssociateFocus(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dm2); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); - wnd1 = CreateWindow("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL); + wnd1 = CreateWindowA("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL); ok(wnd1!=NULL,"Unable to create window 1\n"); - wnd2 = CreateWindow("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL); + wnd2 = CreateWindowA("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL); ok(wnd2!=NULL,"Unable to create window 2\n"); - wnd3 = CreateWindow("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL); + wnd3 = CreateWindowA("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL); ok(wnd3!=NULL,"Unable to create window 3\n"); processPendingMessages();