From 5b9682275e384635a1fd9f7320cf4d9a604a43b4 Mon Sep 17 00:00:00 2001
From: ChrisTX
Date: Fri, 12 Oct 2012 22:31:38 +0200
Subject: Windows: In-depth cleanup (see details) -Fix x64 builds for Windows.
 Now all configurations compile. -Remove the non-working rebase stuff. -Remove
 the Windows fork hack and instead use FreeConsole() to emulate the behavior.
 This directly allows us to compile with ASLR, which is turned on now. -Remove
 the old IPC mechanism for the removed GUI. This is not needed anymore as the
 GUI wasn't ever supported on anything newer than 1.2 -Remove the
 WIN32/WINDOWS macros. _WIN32 is supported on all x86-based VC++ targets, so
 that's what we need. -Enable optimizations for release builds. -De-duplicate
 printf_c(), it was previously copy-pasted into colors.h for configure -Add
 the VC++ specific bad files in .gitignore -Disable PID writing on Windows.
 This is only making sense for *nix builds. -Replace the CPU usage retrieval
 with an algorithm analogous to the *nix behavior. Also supports separated
 now/total values. (Tested with a dummy busy loop - seems working) -Removed
 certain unused functions and variables -Remove stdint defines from the
 windows wrapper -Remove CRT debug alloc. This is a bad idea as it would
 define a macro to replace free which breaks builds. -Re-evaluated the
 warnings list, commented it. -Moved inspircd_config/_version to include/ to
 match *nix -Removed the creation of inspircd_se_config, as it isn't used at
 all. -Made non-git builds show as "r0" instead of "r" (thanks to @SaberUK for
 pointing this out) -Fixed up m_spanningtree's project paths. Now all
 configurations (debug/release x86/x64) have been tested and build properly.
 -Moved FindDNS out of the wrapper and matched its log behavior with *nix.
 (It's pointless having it in the wrapper after the recent slimming down)
 -Replaced random/srandom wrappers with a mechanism that tries to use Windows'
 Random API first is no SSL module is loaded. -Removed more old junk from
 support for compilers older than VC++ 2010 (we don't have project files for
 these, so compiling them would be hard anyways) -Removed the unused
 ClearConsole() -Removed unused includes from the wrapper. Also, do not
 include psapi.h here if we don't link psapi.lib. This should be done where
 appropriate. -Made inet_aton an inline function for increased performance
 -C4800, performance warning about bool forcing, resolved at all occurrences.
 -C4701, uninitialized variable 'cached', resolved at all occurrences.
 -dlerror() was migrated out of the wrapper for more thread safety (no global
 buffer being shared) and increased performance. -Removed the wrong CRT debug
 flags. This drains a lot of performance. -Removed the
 clock_gettime/gettimeofday wrappers -Replaced all TCHAR/ANSI mix-ups of
 functions with the correct respective function. -Added a block of C4355 for <
 VS2012 -Update project files for c870714

---
 src/helperfuncs.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/helperfuncs.cpp')

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 4605092a1..7351a07de 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -24,6 +24,11 @@
 
 /* $Core */
 
+#ifdef _WIN32
+#define _CRT_RAND_S
+#include <stdlib.h>
+#endif
+
 #include "inspircd.h"
 #include "xline.h"
 #include "exitcodes.h"
@@ -311,12 +316,14 @@ bool InspIRCd::OpenLog(char**, int)
 
 void InspIRCd::CheckRoot()
 {
+#ifndef _WIN32
 	if (geteuid() == 0)
 	{
 		printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
 		this->Logs->Log("STARTUP",DEFAULT,"Cant start as root");
 		Exit(EXIT_STATUS_ROOT);
 	}
+#endif
 }
 
 void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
@@ -451,7 +458,17 @@ unsigned long InspIRCd::GenRandomInt(unsigned long max)
 void GenRandomHandler::Call(char *output, size_t max)
 {
 	for(unsigned int i=0; i < max; i++)
+#ifdef _WIN32
+	{
+		unsigned int uTemp;
+		if(rand_s(&uTemp) != 0)
+			output[i] = rand();
+		else
+			output[i] = uTemp;
+	}
+#else
 		output[i] = random();
+#endif
 }
 
 ModResult OnCheckExemptionHandler::Call(User* user, Channel* chan, const std::string& restriction)
-- 
cgit v1.3.1-10-gc9f91