system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 23:04:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oledb32/tests: Compile with -D__WINESRC__.

Browse source
This commit is contained in:
Michael Stefaniuc 2013-10-16 23:00:44 +02:00 committed by Alexandre Julliard
parent 2f673f2965
commit cb194006e9
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/oledb32/tests/Makefile.in
View file

@ -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 \

12
dlls/oledb32/tests/marshal.c
View file

@ -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);