X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=94f799c189829a7a8912b7e7dbb2fc4bb12d8ca9;hb=839ff9b5213977c8dfc74d605c7ceaace89fa66f;hp=73969e6b5aae2ac34378548ce40f5c0a7dd6e672;hpb=27d4ea0d970ed95cf21acedf72a08611ea082d72;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index 73969e6b5..94f799c18 100644
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,9 +21,20 @@
 /* Define the WINDOWS macro. This means we're building on windows to the rest of the server.
    I think this is more reasonable than using WIN32, especially if we're gonna be doing 64-bit compiles */
 #define WINDOWS 1
+#define ENABLE_CRASHDUMPS 0
+
+/* This defaults to 64, way too small for an ircd! */
+#define FD_SETSIZE 24000
 
 /* Make builds smaller, leaner and faster */
 #define VC_EXTRALEAN
+#define WIN32_LEAN_AND_MEAN
+
+/* Not defined in windows */
+#define SIGHUP 1
+
+/* Not defined in windows, parameter to shutdown() */
+#define SHUT_WR 2
 
 /* They just have to be *different*, don't they. */
 #define PATH_MAX MAX_PATH
@@ -44,6 +55,9 @@
 #define DllExport __declspec(dllimport)
 #endif
 
+/* Redirect main() through a different method in win32service.cpp, to intercept service startup */
+#define ENTRYPOINT CoreExport int smain(int argc, char** argv)
+
 /* Disable the deprecation warnings.. it spams :P */
 #define _CRT_SECURE_NO_DEPRECATE
 #define _SCL_SECURE_NO_DEPRECATE
@@ -66,18 +80,23 @@
 #include <stdio.h>
 #include <algorithm>
 
+#ifdef ENABLE_CRASHDUMPS
+#include <DbgHelp.h>
+#endif
+
 /* strcasecmp is not defined on windows by default */
 #define strcasecmp _stricmp
 
+/* this standard function is nonstarard. go figure. */
+#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
 
-/* Remember file descriptors are treated differently on windows ;) */
-__inline int close(int socket) { return closesocket(socket); }
-
 /* Convert formatted (xxx.xxx.xxx.xxx) string to in_addr struct */
 CoreExport int inet_pton(int af, const char * src, void * dst);
 
@@ -88,6 +107,9 @@ CoreExport const char * inet_ntop(int af, const void * src, char * dst, socklen_
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 
+/* Since when does the ISO C++ standard *remove* C functions?! */
+#define mkdir(file,mode) _mkdir(file)
+
 /* Recursive token function doesn't exist in VC++ */
 CoreExport char * strtok_r(char *_String, const char *_Control, char **_Context);
 
@@ -117,12 +139,6 @@ struct option
 extern char optarg[514];
 int getopt_long_only (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind);
 
-/* Accept Handlers */
-struct udp_overlap;
-CoreExport int __accept_socket(SOCKET s, sockaddr * addr, int * addrlen, void * acceptevent);
-CoreExport int __getsockname(SOCKET s, sockaddr * name, int * namelen, void * acceptevent);
-CoreExport int __recvfrom(SOCKET s, char * buf, int len, int flags, struct sockaddr * from, int * fromlen, udp_overlap * ov);
-
 /* Module Loading */
 #define dlopen(path, state) (void*)LoadLibrary(path)
 #define dlsym(handle, export) (void*)GetProcAddress((HMODULE)handle, export)
@@ -131,6 +147,7 @@ const char * dlerror();
 
 /* Unix-style directory searching functions */
 #define chmod(filename, mode)  
+
 struct dirent
 {
 	char d_name[MAX_PATH];
@@ -148,6 +165,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);
+
 /* Disable these stupid warnings.. */
 #pragma warning(disable:4800)
 #pragma warning(disable:4251)
@@ -159,6 +178,8 @@ CoreExport void closedir(DIR * handle);
 #pragma warning(disable:4312)		// warning C4312: 'type cast' : conversion from 'int' to 'HANDLE' of greater size
 #pragma warning(disable:4355)		// warning C4355: 'this' : used in base member initializer list
 #pragma warning(disable:4996)		// warning C4996: 'std::_Traits_helper::move_s' was declared deprecated
+#pragma warning(disable:4706)		// warning C4706: assignment within conditional expression
+#pragma warning(disable:4201)		// mmsystem.h generates this warning
 
 /* Mehhhh... typedefs. */
 
@@ -174,27 +195,27 @@ void ::operator delete(void * ptr);
 
 /* IPC Handlers */
 class InspIRCd;
-
-class IPC
-{
- private:
-	InspIRCd* Instance;
-	HANDLE hIPCPipe;
- public:
-	void IPC();
-	void CheckIPC(InspIRCd* Srv);
-	void ~IPC();
-};
+class ValueItem;
+class ServerConfig;
 
 /* Look up the nameserver in use from the registry on windows */
-std::string FindNameServerWin();
+CoreExport std::string FindNameServerWin();
 
 /* Clear a windows console */
-void ClearConsole();
+CoreExport void ClearConsole();
+
+CoreExport DWORD WindowsForkStart(InspIRCd* Instance);
+
+CoreExport void WindowsForkKillOwner(InspIRCd* Instance);
+
+CoreExport void ChangeWindowsSpecificPointers(InspIRCd* Instance);
+
+CoreExport bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data);
 
-DWORD WindowsForkStart(InspIRCd* Instance);
+CoreExport bool initwmi();
+CoreExport void donewmi();
+CoreExport int getcpu();
 
-void WindowsForkKillOwner(InspIRCd* Instance);
 
 #endif