Module: wine Branch: master Commit: ceeff119a209af4557bb25071ca43adb8b611d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceeff119a209af4557bb25071c...
Author: Hans Leidekker hans@codeweavers.com Date: Mon Oct 14 15:58:44 2013 +0200
winhttp/tests: Compile with -D__WINESRC__.
---
dlls/winhttp/tests/Makefile.in | 1 - dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in index 9e76c6c..01f5779 100644 --- a/dlls/winhttp/tests/Makefile.in +++ b/dlls/winhttp/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = winhttp.dll IMPORTS = winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ notification.c \ diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index b9f4b2f..4643193 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -420,7 +420,7 @@ static void test_async( void ) info.test = async_test; info.count = sizeof(async_test) / sizeof(async_test[0]); info.index = 0; - info.wait = CreateEvent( NULL, FALSE, FALSE, NULL ); + info.wait = CreateEventW( NULL, FALSE, FALSE, NULL );
ses = WinHttpOpen( user_agent, 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 19bd429..ab8b94c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -28,7 +28,6 @@ #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> -#include <winsock.h> #include "initguid.h" #include <httprequest.h>
@@ -350,7 +349,7 @@ static void test_SendRequest (void) ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError());
- ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", bytes_rw, lstrlen(test_post)); + ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", bytes_rw, lstrlenA(test_post)); ok(strncmp(buffer, test_post, bytes_rw) == 0, "Data read did not match, got '%s'.\n", buffer);
ret = WinHttpCloseHandle(request); @@ -3023,7 +3022,7 @@ START_TEST (winhttp) test_WinHttpGetProxyForUrl(); test_chunked_read();
- si.event = CreateEvent(NULL, 0, 0, NULL); + si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532;
thread = CreateThread(NULL, 0, server_thread, (LPVOID)&si, 0, NULL);