Apply brain's patch for binary safety of hash providers, and remove rehash from windo...

[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 d03330bf5c60a4d9bcdc3c02d71ca100c791b8a6..1f269e000ea3a68b6b13bb6ce839f1ebff4590be 100644 (file)
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -1,12 +1,44 @@
-// Use the global heap for this process for all allocate/free operations.\r
-#include "inspircd_win32wrapper.h"\r
-\r
-void * ::operator new(size_t iSize)\r
-{\r
-       return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iSize);            // zero memory for unix compatibility\r
-}\r
-\r
-void ::operator delete(void * ptr)\r
-{\r
-       HeapFree(GetProcessHeap(), 0, ptr);\r
-}\r
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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(), HEAP_ZERO_MEMORY, 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)
+{
+       HeapFree(GetProcessHeap(), 0, ptr);
+}