[hbelusca] 60315: [WINHTTP:USER32] Make it use apitest.h

Author: hbelusca
Date: Sun Sep 22 18:19:16 2013
New Revision: 60315

URL: http://svn.reactos.org/svn/reactos?rev=60315&view=rev
Log:
[WINHTTP:USER32]
Make it use apitest.h

Modified:
    trunk/rostests/apitests/winhttp/WinHttpOpen.c
    trunk/rostests/apitests/winhttp/testlist.c

Modified: trunk/rostests/apitests/winhttp/WinHttpOpen.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/WinHttpOp...
==============================================================================
--- trunk/rostests/apitests/winhttp/WinHttpOpen.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/winhttp/WinHttpOpen.c	[iso-8859-1] Sun Sep 22 18:19:16 2013
@@ -5,14 +5,13 @@
  * PROGRAMMER:      Thomas Faber [e-mail]
  */

-#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 @@
 {
     HMODULE ModuleHandle;

-    ModuleHandle = GetModuleHandle(L"ws2_32");
+    ModuleHandle = GetModuleHandleW(L"ws2_32");
     if (!ModuleHandle)
         return NULL;
     return GetProcAddress(ModuleHandle, FunctionName);
@@ -41,14 +40,14 @@
 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 @@
     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");

Modified: trunk/rostests/apitests/winhttp/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/testlist....
==============================================================================
--- trunk/rostests/apitests/winhttp/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/winhttp/testlist.c	[iso-8859-1] Sun Sep 22 18:19:16 2013
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__

#define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>

extern void func_WinHttpOpen(void);