From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Sun, 22 Sep 2013 18:19:16 +0000 (+0000)
Subject: [WINHTTP:USER32]
X-Git-Tag: ReactOS-0.3.16~1231
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=2a026800b2ca6e95bbbbfcddcac7f6fea5d9d863;hp=f63c2338599389438f773af6648bfcc52162d1ee

[WINHTTP:USER32]
Make it use apitest.h

svn path=/trunk/; revision=60315
---

diff --git a/rostests/apitests/winhttp/WinHttpOpen.c b/rostests/apitests/winhttp/WinHttpOpen.c
index f9d84cff914..28597b0fe7b 100644
--- a/rostests/apitests/winhttp/WinHttpOpen.c
+++ b/rostests/apitests/winhttp/WinHttpOpen.c
@@ -5,14 +5,13 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#define UNICODE
+#include <apitest.h>
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winsock2.h>
-#include <wine/test.h>
 #include <winhttp.h>
 
 struct hostent *(WINAPI *pgethostbyname)(const char *);
@@ -29,7 +28,7 @@ GetProc(
 {
     HMODULE ModuleHandle;
 
-    ModuleHandle = GetModuleHandle(L"ws2_32");
+    ModuleHandle = GetModuleHandleW(L"ws2_32");
     if (!ModuleHandle)
         return NULL;
     return GetProcAddress(ModuleHandle, FunctionName);
@@ -41,14 +40,14 @@ static
 BOOLEAN
 IsWinsockLoaded(VOID)
 {
-    return GetModuleHandle(L"ws2_32") != NULL;
+    return GetModuleHandleW(L"ws2_32") != NULL;
 }
 
 static
 BOOLEAN
 IsWininetLoaded(VOID)
 {
-    return GetModuleHandle(L"wininet") != NULL;
+    return GetModuleHandleW(L"wininet") != NULL;
 }
 
 static
@@ -93,9 +92,9 @@ START_TEST(WinHttpOpen)
     ok(!IsWinsockInitialized(), "Winsock initialized on startup\n");
     ok(!IsWininetLoaded(), "Wininet loaded on startup\n");
 
-    ModuleHandle = GetModuleHandle(L"winhttp");
+    ModuleHandle = GetModuleHandleW(L"winhttp");
     ok_ptr(ModuleHandle, NULL);
-    ModuleHandle = LoadLibrary(L"winhttp");
+    ModuleHandle = LoadLibraryW(L"winhttp");
     ok(ModuleHandle != NULL, "LoadLibrary failed, error %lu\n", GetLastError());
 
     pWinHttpOpen = (PVOID)GetProcAddress(ModuleHandle, "WinHttpOpen");
diff --git a/rostests/apitests/winhttp/testlist.c b/rostests/apitests/winhttp/testlist.c
index 44d09ab8589..689957813da 100644
--- a/rostests/apitests/winhttp/testlist.c
+++ b/rostests/apitests/winhttp/testlist.c
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__
 
 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
 
 extern void func_WinHttpOpen(void);