X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=3f16280fdcd63de4c94c61728a791368fa804507;hb=fa67c7e80b15060773295e4719545a802d8717d5;hp=fc9905403b36dc186db2c01000a17622cec1c2b0;hpb=85a787b92b6de419fab2cd4fe118c0c7d47066d6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index fc9905403..3f16280fd 100644
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -18,6 +18,15 @@
 #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
@@ -37,6 +46,9 @@
 
 #define FD_SETSIZE 24000
 
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+
 /* Make builds smaller, leaner and faster */
 #define VC_EXTRALEAN
 #define WIN32_LEAN_AND_MEAN
@@ -78,8 +90,6 @@
 /* Say we're building on windows 2000. Anyone running something older than this
  * reeeeeeeally needs to upgrade! */
 
-#define _WIN32_WINNT 0x500
-
 /* Normal windows (platform-specific) includes */
 #include <winsock2.h>
 #include <windows.h>
@@ -90,6 +100,8 @@
 #include <process.h>
 #include <stdio.h>
 #include <algorithm>
+#include <io.h>
+#include <psapi.h>
 
 #ifdef ENABLE_CRASHDUMPS
 #include <DbgHelp.h>
@@ -102,18 +114,24 @@
 #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 inet_pton(int af, const char * src, void * dst);
+CoreExport int insp_inet_pton(int af, const char * src, void * dst);
 
 /* Convert struct to formatted (xxx.xxx.xxx.xxx) string */
-CoreExport const char * inet_ntop(int af, const void * src, char * dst, socklen_t cnt);
+CoreExport const char * insp_inet_ntop(int af, const void * src, char * dst, socklen_t cnt);
+
+/* we don't want to use windows' broken inet_pton and ntop */
+#define inet_pton insp_inet_pton
+#define inet_ntop insp_inet_ntop
 
 /* Safe printf functions aren't defined in VC2003 */
 #define snprintf _snprintf
@@ -145,6 +163,7 @@ struct option
 	int *flag;
 	int val;
 };
+extern int optind;
 extern char optarg[514];
 int getopt_long_only (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind);
 
@@ -174,7 +193,8 @@ CoreExport DIR * opendir(const char * path);
 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)
@@ -197,29 +217,31 @@ typedef unsigned long long uint64_t;
 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();