1 files changed, 56 insertions, 10 deletions
diff --git a/src/libs/7zip/win/CPP/Common/NewHandler.cpp b/src/libs/7zip/win/CPP/Common/NewHandler.cpp
index aad6e7d16..9072376df 100644
--- a/src/libs/7zip/win/CPP/Common/NewHandler.cpp
+++ b/src/libs/7zip/win/CPP/Common/NewHandler.cpp
@@ -1,5 +1,5 @@
 // NewHandler.cpp
- 
+
 #include "StdAfx.h"
 
 #include <stdlib.h>
@@ -11,6 +11,32 @@
 #ifndef DEBUG_MEMORY_LEAK
 
 #ifdef _WIN32
+
+/*
+void * my_new(size_t size)
+{
+  // void *p = ::HeapAlloc(::GetProcessHeap(), 0, size);
+  void *p = ::malloc(size);
+  if (p == 0)
+    throw CNewException();
+  return p;
+}
+
+void my_delete(void *p) throw()
+{
+  // if (p == 0) return; ::HeapFree(::GetProcessHeap(), 0, p);
+  ::free(p);
+}
+
+void * my_Realloc(void *p, size_t newSize, size_t oldSize)
+{
+  void *newBuf = my_new(newSize);
+  memcpy(newBuf, p, oldSize);
+  my_delete(p);
+  return newBuf;
+}
+*/
+
 void *
 #ifdef _MSC_VER
 __cdecl
@@ -30,18 +56,42 @@ __cdecl
 #endif
 operator delete(void *p) throw()
 {
-  /*
+  // if (p == 0) return; ::HeapFree(::GetProcessHeap(), 0, p);
+  ::free(p);
+}
+
+/*
+void *
+#ifdef _MSC_VER
+__cdecl
+#endif
+operator new[](size_t size)
+{
+  // void *p = ::HeapAlloc(::GetProcessHeap(), 0, size);
+  void *p = ::malloc(size);
   if (p == 0)
-    return;
-  ::HeapFree(::GetProcessHeap(), 0, p);
-  */
+    throw CNewException();
+  return p;
+}
+
+void
+#ifdef _MSC_VER
+__cdecl
+#endif
+operator delete[](void *p) throw()
+{
+  // if (p == 0) return; ::HeapFree(::GetProcessHeap(), 0, p);
   ::free(p);
 }
+*/
+
 #endif
 
 #else
 
-#pragma init_seg(lib)
+#include <stdio.h>
+
+// #pragma init_seg(lib)
 const int kDebugSize = 1000000;
 static void *a[kDebugSize];
 static int index = 0;
@@ -51,10 +101,6 @@ void * __cdecl operator new(size_t size)
 {
   numAllocs++;
   void *p = HeapAlloc(GetProcessHeap(), 0, size);
-  if (index == 40)
-  {
-    int t = 1;
-  }
   if (index < kDebugSize)
   {
     a[index] = p;