X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=444ff75260fbceca6035441d2a62235a91aa6bee;hb=aa692dc1039b63deef7886e914ec499abe7facaf;hp=94f799c189829a7a8912b7e7dbb2fc4bb12d8ca9;hpb=2c5db1dfcb326fb6665b40c0bf2613257ebaf3d5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index 94f799c18..444ff7526 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -1,50 +1,55 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2013-2015 Attila Molnar + * Copyright (C) 2013, 2015, 2018-2019 Sadie Powell + * Copyright (C) 2012-2013 ChrisTX + * Copyright (C) 2012 Robby + * Copyright (C) 2011, 2014, 2019 Adam + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2007-2009 Robin Burchell + * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2007 burlex * - * 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 . */ + +#pragma once + /* Windows Port Wrapper Functions/Definitions By Burlex */ +/* + * 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 -#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 -#define ENABLE_CRASHDUMPS 0 +#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 -/* 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 - -/* 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 @@ -60,162 +65,123 @@ /* Disable the deprecation warnings.. it spams :P */ #define _CRT_SECURE_NO_DEPRECATE -#define _SCL_SECURE_NO_DEPRECATE - -#include +#define _WINSOCK_DEPRECATED_NO_WARNINGS -/* Say we're building on windows 2000. Anyone running something older than this - * reeeeeeeally needs to upgrade! */ - -#define _WIN32_WINNT 0x500 +// Windows doesn't support getopt_long so we use ya_getopt instead. +#include "ya_getopt.h" /* Normal windows (platform-specific) includes */ #include +#pragma comment(lib, "Ws2_32.lib") #include #include #include #include #include #include -#include -#include +#include -#ifdef ENABLE_CRASHDUMPS -#include -#endif +#define F_OK 0 /* test for existence of file */ +#define X_OK (1<<0) /* test for execute or search permission */ +#define W_OK (1<<1) /* test for write permission */ +#define R_OK (1<<2) /* test for read permission */ + +// Windows defines these already. +#undef ERROR +#undef min +#undef max /* strcasecmp is not defined on windows by default */ #define strcasecmp _stricmp +#define strncasecmp _strnicmp -/* this standard function is nonstarard. go figure. */ +typedef SSIZE_T ssize_t; + +/* _popen, _pclose */ #define popen _popen #define pclose _pclose +#define getpid _getpid -/* Error macros need to be redirected to winsock error codes */ -#define ETIMEDOUT WSAETIMEDOUT -#define ECONNREFUSED WSAECONNREFUSED -#define EADDRINUSE WSAEADDRINUSE -#define EINPROGRESS WSAEWOULDBLOCK +// 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) -/* Convert formatted (xxx.xxx.xxx.xxx) string to in_addr struct */ -CoreExport int inet_pton(int af, const char * src, void * dst); +// warning: DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier' +#pragma warning(disable:4275) -/* Convert struct to formatted (xxx.xxx.xxx.xxx) string */ -CoreExport const char * inet_ntop(int af, const void * src, char * dst, socklen_t cnt); +// warning: unreferenced formal parameter +// Unimportant for now, but for the next version, we should take a look at these again. +#pragma warning(disable:4100) -/* Safe printf functions aren't defined in VC2003 */ -#define snprintf _snprintf -#define vsnprintf _vsnprintf +// warning: 'class' : assignment operator could not be generated +#pragma warning(disable:4512) -/* Since when does the ISO C++ standard *remove* C functions?! */ -#define mkdir(file,mode) _mkdir(file) +// 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) -/* Recursive token function doesn't exist in VC++ */ -CoreExport char * strtok_r(char *_String, const char *_Control, char **_Context); +// warning C4996: The POSIX name for this item is deprecated. +#pragma warning(disable:4996) -/* Unix-style sleep (argument is in seconds) */ -__inline void sleep(int seconds) { Sleep(seconds * 1000); } +// warning C4244: conversion from 'x' to 'y', possible loss of data +#pragma warning(disable:4244) -/* IPV4 only convert string to address struct */ -CoreExport int inet_aton(const char *, struct in_addr *); +// warning C4267: 'var' : conversion from 'size_t' to 'type', possible loss of data +#pragma warning(disable:4267) -/* Unix-style get running user id */ -CoreExport int geteuid(); +// warning C4706: assignment within conditional expression +#pragma warning(disable:4706) -/* Handles colors in printf */ -CoreExport int printf_c(const char * format, ...); +/* Shared memory allocation functions */ +void * ::operator new(size_t iSize); +void ::operator delete(void * ptr); -/* getopt() wrapper */ -# define no_argument 0 -# define required_argument 1 -# define optional_argument 2 -struct option +#include + +class CWin32Exception : public std::exception { - char *name; - int has_arg; - int *flag; - int val; +public: + CWin32Exception(); + CWin32Exception(const CWin32Exception& other); + virtual const char* what() const throw(); + DWORD GetErrorCode(); + +private: + char szErrorString[500]; + DWORD dwErrorCode; }; -extern char optarg[514]; -int getopt_long_only (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind); - -/* 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) +// Same value as EXIT_STATUS_FORK (EXIT_STATUS_FORK is unused on Windows) +#define EXIT_STATUS_SERVICE 4 -struct dirent +// POSIX iovec +struct iovec { - char d_name[MAX_PATH]; + void* iov_base; // Starting address + size_t iov_len; // Number of bytes to transfer }; -struct DIR +// Windows WSABUF with POSIX field names +struct WindowsIOVec { - dirent dirent_pointer; - HANDLE find_handle; - WIN32_FIND_DATA find_data; - bool first; + // POSIX iovec has iov_base then iov_len, WSABUF in Windows has the fields in reverse order + u_long iov_len; // Number of bytes to transfer + char FAR* iov_base; // Starting address }; -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) -#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 -#pragma warning(disable:4706) // warning C4706: assignment within conditional expression -#pragma warning(disable:4201) // mmsystem.h generates this warning - -/* 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; - -/* 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(); - -/* Clear a windows console */ -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); - -CoreExport bool initwmi(); -CoreExport void donewmi(); -CoreExport int getcpu(); - - -#endif - +inline ssize_t writev(int fd, const WindowsIOVec* iov, int count) +{ + DWORD sent; + int ret = WSASend(fd, reinterpret_cast(const_cast(iov)), count, &sent, 0, NULL, NULL); + if (ret == 0) + return sent; + return -1; +} + +// This wrapper is just so we don't need to do #ifdef _WIN32 everywhere in the socket code. It is +// not actually used and does not need to be the same size as sockaddr_un on UNIX systems. +struct sockaddr_un +{ + ADDRESS_FAMILY sun_family; + char sun_path[6]; +};