Author: hbelusca
Date: Sun Sep 22 18:19:56 2013
New Revision: 60316
URL:
http://svn.reactos.org/svn/reactos?rev=60316&view=rev
Log:
[APITEST:WININET]
Make it use apitest.h
Modified:
trunk/rostests/apitests/wininet/InternetOpen.c
trunk/rostests/apitests/wininet/testlist.c
Modified: trunk/rostests/apitests/wininet/InternetOpen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/Internet…
==============================================================================
--- trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] Sun Sep 22 18:19:56 2013
@@ -5,14 +5,13 @@
* PROGRAMMER: Thomas Faber <thfabba(a)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 <wininet.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,7 +40,7 @@
BOOLEAN
IsWinsockLoaded(VOID)
{
- return GetModuleHandle(L"ws2_32") != NULL;
+ return GetModuleHandleW(L"ws2_32") != NULL;
}
static
@@ -85,9 +84,9 @@
ok(!IsWinsockLoaded(), "Winsock loaded on startup\n");
ok(!IsWinsockInitialized(), "Winsock initialized on startup\n");
- ModuleHandle = GetModuleHandle(L"wininet");
+ ModuleHandle = GetModuleHandleW(L"wininet");
ok_ptr(ModuleHandle, NULL);
- ModuleHandle = LoadLibrary(L"wininet");
+ ModuleHandle = LoadLibraryW(L"wininet");
ok(ModuleHandle != NULL, "LoadLibrary failed, error %lu\n",
GetLastError());
pInternetOpen = (PVOID)GetProcAddress(ModuleHandle, "InternetOpenW");
Modified: trunk/rostests/apitests/wininet/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/testlist…
==============================================================================
--- trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] Sun Sep 22 18:19:56 2013
@@ -1,7 +1,7 @@
#define __ROS_LONG64__
#define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
extern void func_InternetOpen(void);