X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_memory_functions.cpp;h=3987083172f5c2ae8c4c729f4498c95e6ed90d3b;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=d03330bf5c60a4d9bcdc3c02d71ca100c791b8a6;hpb=c778d1258a3d778d0a6227b632ba5091a0eb25a0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp
index d03330bf5..398708317 100644
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -1,12 +1,65 @@
-// Use the global heap for this process for all allocate/free operations.
-#include "inspircd_win32wrapper.h"
-
-void * ::operator new(size_t iSize)
-{
-	return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iSize);		// zero memory for unix compatibility
-}
-
-void ::operator delete(void * ptr)
-{
-	HeapFree(GetProcessHeap(), 0, ptr);
-}
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <windows.h>
+#include <exception>
+#include <new>
+#include <new.h>
+
+/** On windows, all dll files and executables have their own private heap,
+ * whereas on POSIX systems, shared objects loaded into an executable share
+ * the executable's heap. This means that if we pass an arbitrary pointer to
+ * a windows DLL which is not allocated in that dll, without some form of
+ * marshalling, we get a page fault. To fix this, these overrided operators
+ * new and delete use the windows HeapAlloc and HeapFree functions to claim
+ * memory from the windows global heap. This makes windows 'act like' POSIX
+ * when it comes to memory usage between dlls and exes.
+ */
+
+void * ::operator new(size_t iSize)
+{
+	void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
+	/* This is the correct behaviour according to C++ standards for out of memory,
+	 * not returning null -- Brain
+	 */
+	if (!ptr)
+		throw std::bad_alloc();
+	else
+		return ptr;
+}
+
+void ::operator delete(void * ptr)
+{
+	if (ptr)
+		HeapFree(GetProcessHeap(), 0, ptr);
+}
+
+void * operator new[] (size_t iSize)
+{
+	void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
+	if (!ptr)
+		throw std::bad_alloc();
+	else
+		return ptr;
+}
+
+void operator delete[] (void* ptr)
+{
+	if (ptr)
+		HeapFree(GetProcessHeap(), 0, ptr);
+}