#ifndef INSPIRCD_WIN32WRAPPER_H
#define INSPIRCD_WIN32WRAPPER_H
+/*
+ * Starting with PSAPI version 2 for Windows 7 and Windows Server 2008 R2, this function is defined as K32GetProcessMemoryInfo in Psapi.h and exported
+ * in Kernel32.lib and Kernel32.dll. However, you should always call this function as GetProcessMemoryInfo. To ensure correct resolution of symbols
+ * for programs that will run on earlier versions ofWindows, add Psapi.lib to the TARGETLIBS macro and compile the program with PSAPI_VERSION=1.
+ *
+ * We do this before anything to make sure it's done.
+ */
+#define PSAPI_VERSION 1
+
#ifndef CONFIGURE_BUILD
#include "win32service.h"
#endif
#define FD_SETSIZE 24000
-#define uint32_t DWORD
-#define uint16_t WORD
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
/* Make builds smaller, leaner and faster */
#define VC_EXTRALEAN
#include <process.h>
#include <stdio.h>
#include <algorithm>
+#include <io.h>
+#include <psapi.h>
#ifdef ENABLE_CRASHDUMPS
#include <DbgHelp.h>
#define popen _popen
#define pclose _pclose
-/* Error macros need to be redirected to winsock error codes */
-#define ETIMEDOUT WSAETIMEDOUT
-#define ECONNREFUSED WSAECONNREFUSED
-#define EADDRINUSE WSAEADDRINUSE
-#define EINPROGRESS WSAEWOULDBLOCK
-#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+/* Error macros need to be redirected to winsock error codes, apart from on VS2010 *SIGH* */
+#if _MSC_VER < 1600
+ #define ETIMEDOUT WSAETIMEDOUT
+ #define ECONNREFUSED WSAECONNREFUSED
+ #define EADDRINUSE WSAEADDRINUSE
+ #define EINPROGRESS WSAEWOULDBLOCK
+ #define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#endif
/* Convert formatted (xxx.xxx.xxx.xxx) string to in_addr struct */
CoreExport int insp_inet_pton(int af, const char * src, void * dst);
CoreExport dirent * readdir(DIR * handle);
CoreExport void closedir(DIR * handle);
-CoreExport int gettimeofday(struct timeval * tv, void * tz);
+const int CLOCK_REALTIME = 0;
+CoreExport int clock_gettime(int clock, struct timespec * tv);
/* Disable these stupid warnings.. */
#pragma warning(disable:4800)
typedef signed char int8_t;
typedef signed long int32_t;
typedef signed long long int64_t;
+typedef signed long ssize_t;
/* Shared memory allocation functions */
void * ::operator new(size_t iSize);
void ::operator delete(void * ptr);
/* IPC Handlers */
-class InspIRCd;
class ValueItem;
class ServerConfig;
/* Look up the nameserver in use from the registry on windows */
CoreExport std::string FindNameServerWin();
+#define DISABLE_WRITEV
+
/* Clear a windows console */
CoreExport void ClearConsole();
-CoreExport DWORD WindowsForkStart(InspIRCd* Instance);
+CoreExport DWORD WindowsForkStart();
-CoreExport void WindowsForkKillOwner(InspIRCd* Instance);
+CoreExport void WindowsForkKillOwner();
-CoreExport void ChangeWindowsSpecificPointers(InspIRCd* Instance);
+CoreExport void ChangeWindowsSpecificPointers();
-CoreExport bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data);
+CoreExport void FindDNS(std::string& server);
CoreExport bool initwmi();
CoreExport void donewmi();