X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=901f0fdf0a3e2b8102517068dbe6b819d5782c71;hb=152bf4946c3cdee3e8b66cb2babbf3182840d054;hp=efef18ac88d97d4cf4bcd74aef898bb2ebbfd68e;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index efef18ac8..901f0fdf0 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -1,16 +1,24 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards + * Copyright (C) 2007 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + /* Windows Port Wrapper Functions/Definitions By Burlex */ @@ -18,6 +26,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 +54,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 +98,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 @@ -90,6 +108,8 @@ #include #include #include +#include +#include #ifdef ENABLE_CRASHDUMPS #include @@ -102,18 +122,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 @@ -122,6 +148,8 @@ 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) +#define strncasecmp strnicmp + /* Unix-style sleep (argument is in seconds) */ __inline void sleep(int seconds) { Sleep(seconds * 1000); } @@ -145,8 +173,9 @@ 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); +int getopt_long(int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind); /* Module Loading */ #define dlopen(path, state) (void*)LoadLibrary(path) @@ -170,11 +199,18 @@ struct DIR bool first; }; +struct timespec +{ + time_t tv_sec; + long tv_nsec; +}; + 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) @@ -195,38 +231,36 @@ CoreExport int gettimeofday(struct timeval * tv, void * tz); typedef unsigned char uint8_t; 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(); CoreExport int getcpu(); - -CoreExport void usleep(unsigned long usecs); - +CoreExport int random(); +CoreExport void srandom(unsigned seed); +CoreExport int gettimeofday(timeval *tv, void *); #endif