X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=be437d4a36c37bba3bd9063782320abe6447ae69;hb=3fbba606c3fbb76a5bc045d4d7717528366ae84e;hp=250f41e3fce2022e0d38e9402f33fb33b88b3866;hpb=22f03b43c5acc3b912d2d0df894dca16a2c46a91;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index 250f41e3f..be437d4a3 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-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/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,22 +26,28 @@ #ifndef INSPIRCD_WIN32WRAPPER_H #define INSPIRCD_WIN32WRAPPER_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 +/* + * 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 of Windows, 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 + +#include "win32service.h" + +/* 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 /* They just have to be *different*, don't they. */ #define PATH_MAX MAX_PATH -/* Begone shitty 'safe STL' warnings */ -#define _SCL_SECURE_NO_WARNINGS -#define _CRT_SECURE_NO_WARNINGS -#define _AFX_SECURE_NO_WARNINGS -#define _ATL_SECURE_NO_WARNINGS - /* Macros for exporting symbols - dependant on what is being compiled */ #ifdef DLL_BUILD @@ -44,69 +58,60 @@ #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 - -#include - -/* 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 +#pragma comment(lib, "Ws2_32.lib") #include #include #include #include #include #include -#include -#include - -/* printf_c support for printing ansi colors in console */ -#include "colours.h" /* strcasecmp is not defined on windows by default */ #define strcasecmp _stricmp +#define strncasecmp _strnicmp -/* 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); } +typedef int ssize_t; /* 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); + +/* inet_pton/ntop require at least NT 6.0 */ +#define inet_pton insp_inet_pton +#define inet_ntop insp_inet_ntop -/* Safe printf functions aren't defined in VC2003 */ +/* Safe printf functions aren't defined in VC++ */ #define snprintf _snprintf #define vsnprintf _vsnprintf -/* 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); } -/* IPV4 only convert string to address struct */ -CoreExport int inet_aton(const char *, struct in_addr *); +/* _popen, _pclose */ +#define popen _popen +#define pclose _pclose -/* Unix-style get running user id */ -CoreExport int geteuid(); +/* IPV4 only convert string to address struct */ +__inline int inet_aton(const char *cp, struct in_addr *addr) +{ + addr->s_addr = inet_addr(cp); + return (addr->s_addr == INADDR_NONE) ? 0 : 1; +}; /* getopt() wrapper */ -# define no_argument 0 -# define required_argument 1 -# define optional_argument 2 +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 struct option { char *name; @@ -114,23 +119,10 @@ 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); - -/* 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) -#define dlclose(handle) FreeLibrary((HMODULE)handle) -const char * dlerror(); - -/* Unix-style directory searching functions */ -#define chmod(filename, mode) +int getopt_long(int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind); + struct dirent { char d_name[MAX_PATH]; @@ -140,50 +132,76 @@ struct DIR { dirent dirent_pointer; HANDLE find_handle; - WIN32_FIND_DATA find_data; + WIN32_FIND_DATAA find_data; 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); -/* Disable these stupid warnings.. */ -#pragma warning(disable:4800) +// warning: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' +// Normally, this is a huge problem, but due to our new/delete remap, we can ignore it. #pragma warning(disable:4251) + +// warning: DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier' #pragma warning(disable:4275) -#pragma warning(disable:4244) // warning C4244: '=' : conversion from 'long' to 'short', possible loss of data -#pragma warning(disable:4267) // warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data -#pragma warning(disable:4805) // warning C4805: '!=' : unsafe mix of type 'char' and type 'bool' in operation -#pragma warning(disable:4311) // warning C4311: 'type cast' : pointer truncation from 'accept_overlap *' to 'int' -#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 - -/* Mehhhh... typedefs. */ - -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; + +// warning: unreferenced formal parameter +// Unimportant for now, but for the next version, we should take a look at these again. +#pragma warning(disable:4100) + +// warning: 'class' : assignment operator could not be generated +#pragma warning(disable:4512) + +// warning C4127: conditional expression is constant +// This will be triggered like crazy because FOREACH_MOD and similar macros are wrapped in do { ... } while(0) constructs +#pragma warning(disable:4127) + +// warning C4996: The POSIX name for this item is deprecated. +#pragma warning(disable:4996) + +// warning C4244: conversion from 'x' to 'y', possible loss of data +#pragma warning(disable:4244) + +// warning C4267: 'var' : conversion from 'size_t' to 'type', possible loss of data +#pragma warning(disable:4267) + +// warning C4706: assignment within conditional expression +#pragma warning(disable:4706) + +// warning C4355: 'this' : used in base member initializer list +// This warning is disabled by default since VC2012 +#if _MSC_VER < 1700 +#pragma warning(disable:4355) +#endif /* Shared memory allocation functions */ void * ::operator new(size_t iSize); void ::operator delete(void * ptr); -/* IPC Handlers */ -class InspIRCd; - -void InitIPC(); -void CheckIPC(InspIRCd * Instance); -void CloseIPC(); +#define DISABLE_WRITEV -/* Look up the nameserver in use from the registry on windows */ -std::string FindNameServerWin(); +#include -/* Clear a windows console */ -void ClearConsole(); +class CWin32Exception : public std::exception +{ +public: + CWin32Exception(); + CWin32Exception(const CWin32Exception& other); + virtual const char* what() const throw(); + DWORD GetErrorCode(); + +private: + char szErrorString[500]; + DWORD dwErrorCode; +}; #endif