Fix extras compilation under Windows

[user/henk/code/inspircd.git] / win / inspircd_memory_functions.cpp

diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp
index b604b02e343b0e45deee8ad55a2f497079502b92..6eb76e31a03483714948e335617f944d0426c52f 100644 (file)
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -1,19 +1,59 @@
-// Use the global heap for this process for all allocate/free operations.\r
-#include "inspircd_win32wrapper.h"\r
-#include <exception>\r
-\r
-void * ::operator new(size_t iSize)\r
-{\r
-       void* ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iSize);               // zero memory for unix compatibility\r
-       /* This is the correct behaviour according to C++ standards for out of memory,\r
-        * not returning null -- Brain*/\r
-       if (!ptr)\r
-               throw std::bad_alloc();\r
-       else\r
-               return ptr;\r
-}\r
-\r
-void ::operator delete(void * ptr)\r
-{\r
-       HeapFree(GetProcessHeap(), 0, ptr);\r
-}\r
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2011 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd_win32wrapper.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);              /* zero memory for unix compatibility */
+       /* 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); /* Why were we initializing the memory to zeros here? This is just a waste of cpu! */
+       if (!ptr)
+               throw std::bad_alloc();
+       else
+               return ptr;
+}
+
+void operator delete[] (void* ptr)
+{
+       if (ptr)
+               HeapFree(GetProcessHeap(), 0, ptr);
+}