X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=win%2Finspircd_win32wrapper.h;h=8120e193f1d25a2d6c459576341164bcafbdd74d;hb=819147178db00008a215670992d0f532dd57f9e5;hp=a7a323693487f7c02a70ed7abfaf4982f9a060c8;hpb=afe99da316b6f63900df2bd8711ab515f4977f6a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index a7a323693..8120e193f 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -18,14 +18,37 @@ #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 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! */ +/* CRT memory debugging */ +#ifdef DEBUG +#define _CRTDBG_MAP_ALLOC +#include +#include +#endif + #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 @@ -55,6 +78,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 @@ -64,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 #include @@ -88,17 +112,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 +/* 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 @@ -107,9 +138,6 @@ CoreExport const char * inet_ntop(int af, const void * src, char * dst, socklen_ /* 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); - /* Unix-style sleep (argument is in seconds) */ __inline void sleep(int seconds) { Sleep(seconds * 1000); } @@ -133,6 +161,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); @@ -175,6 +204,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. */ @@ -194,18 +225,22 @@ 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); -DWORD WindowsForkStart(InspIRCd* Instance); +CoreExport void WindowsForkKillOwner(InspIRCd* Instance); -void WindowsForkKillOwner(InspIRCd* Instance); +CoreExport void ChangeWindowsSpecificPointers(InspIRCd* Instance); -void ChangeWindowsSpecificPointers(InspIRCd* Instance); +CoreExport bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data); -bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data); +CoreExport bool initwmi(); +CoreExport void donewmi(); +CoreExport int getcpu(); #endif