From cb194006e9c9f414374a7488edc10f2cff86f4c6 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Wed, 16 Oct 2013 23:00:44 +0200
Subject: [PATCH] oledb32/tests: Compile with -D__WINESRC__.

---
 dlls/oledb32/tests/Makefile.in |  1 -
 dlls/oledb32/tests/marshal.c   | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in
index 019f1ed342a..bb1f0b3b839 100644
--- a/dlls/oledb32/tests/Makefile.in
+++ b/dlls/oledb32/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = oledb32.dll
 IMPORTS   = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	convert.c \
diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c
index f9a215044f7..b1540b49972 100644
--- a/dlls/oledb32/tests/marshal.c
+++ b/dlls/oledb32/tests/marshal.c
@@ -66,11 +66,11 @@ static DWORD CALLBACK host_object_proc(LPVOID p)
     ok_ole_success(hr, CoMarshalInterface);
 
     /* force the message queue to be created before signaling parent thread */
-    PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
+    PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
 
     SetEvent(data->marshal_event);
 
-    while (GetMessage(&msg, NULL, 0, 0))
+    while (GetMessageW(&msg, NULL, 0, 0))
     {
         if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA)
         {
@@ -78,7 +78,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p)
             SetEvent((HANDLE)msg.lParam);
         }
         else
-            DispatchMessage(&msg);
+            DispatchMessageW(&msg);
     }
 
     HeapFree(GetProcessHeap(), 0, data);
@@ -91,7 +91,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p)
 static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, IMessageFilter *filter, HANDLE *thread)
 {
     DWORD tid = 0;
-    HANDLE marshal_event = CreateEvent(NULL, FALSE, FALSE, NULL);
+    HANDLE marshal_event = CreateEventW(NULL, FALSE, FALSE, NULL);
     struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data));
 
     data->stream = stream;
@@ -117,8 +117,8 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M
 
 static void end_host_object(DWORD tid, HANDLE thread)
 {
-    BOOL ret = PostThreadMessage(tid, WM_QUIT, 0, 0);
-    ok(ret, "PostThreadMessage failed with error %d\n", GetLastError());
+    BOOL ret = PostThreadMessageW(tid, WM_QUIT, 0, 0);
+    ok(ret, "PostThreadMessageW failed with error %d\n", GetLastError());
     /* be careful of races - don't return until hosting thread has terminated */
     ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" );
     CloseHandle(thread);