X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=89309fbc92f5a4356cb6209f57ceacfbe28814f8;hb=7eb54577bb3b8cdb2fa9a2ebfb537fa2f369d6b5;hp=6a3b7a36b6434aeb8b286bd797eebb132fdfde6d;hpb=e4aa8c95131f8b7bb3b6ff5460809ab3a6b7f588;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index 6a3b7a36b..89309fbc9 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
@@ -18,11 +18,16 @@
 #ifndef INSPIRCD_WIN32WRAPPER_H
 #define INSPIRCD_WIN32WRAPPER_H
 
+#include "win32service.h"
+
 /* 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
@@ -30,6 +35,9 @@
 /* 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
 
@@ -49,6 +57,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
@@ -78,6 +89,10 @@
 /* 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
@@ -94,6 +109,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);
 
@@ -131,6 +149,7 @@ const char * dlerror();
 
 /* Unix-style directory searching functions */
 #define chmod(filename, mode)  
+
 struct dirent
 {
 	char d_name[MAX_PATH];
@@ -161,6 +180,8 @@ CoreExport int gettimeofday(struct timeval * tv, void * tz);
 #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. */
 
@@ -179,30 +200,24 @@ class InspIRCd;
 class ValueItem;
 class ServerConfig;
 
-class IPC
-{
- private:
-	InspIRCd* Instance;
-	HANDLE hIPCPipe;
- public:
-	IPC(InspIRCd* Srv);
-	void Check();
-	~IPC();
-};
-
 /* 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);
 
-DWORD WindowsForkStart(InspIRCd* Instance);
+CoreExport void ChangeWindowsSpecificPointers(InspIRCd* Instance);
 
-void WindowsForkKillOwner(InspIRCd* Instance);
+CoreExport bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data);
 
-void ChangeWindowsSpecificPointers(InspIRCd* Instance);
+CoreExport bool initwmi();
+CoreExport void donewmi();
+CoreExport int getcpu();
 
-bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data);
 
 #endif