X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=6b068adeaa20b2695484b0e192e7e87e04ae2a08;hb=64904b639d154394fa8138a7c8c0d5ff17e14718;hp=417177167cdec88b3589f58af08bbb71c82250f1;hpb=56d0bc899d354480516ffd27b875af9bb31b92cf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index 417177167..6b068adea 100644
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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,7 @@
 #include <process.h>
 #include <stdio.h>
 #include <algorithm>
+#include <io.h>
 
 #ifdef ENABLE_CRASHDUMPS
 #include <DbgHelp.h>
@@ -102,18 +113,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 +162,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);
 
@@ -197,27 +215,36 @@ 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();
 
+/* no uio.h on win, but win has alternatives in io.h rest is wrapped here */
+#define IOV_MAX 1024
+struct iovec
+{
+	size_t  iov_len;
+	void*   iov_base;
+};
+CoreExport ssize_t writev(int fd, const struct iovec* iov, int iovcnt);
+
 /* 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);
 
@@ -225,8 +252,5 @@ CoreExport bool initwmi();
 CoreExport void donewmi();
 CoreExport int getcpu();
 
-CoreExport void usleep(unsigned long usecs);
-
-
 #endif