commit 9ad96367259d86b81a869cb19645859451485bc4
author Dimitrie O. Paun <dimi@cs.toronto.edu> Sun Mar 19 14:29:50 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Mar 19 14:29:50 2000 +0000
tree 2d759b95d11b4fff2592297f05c537ce8e30f6b7
parent abdb034ffa703f679cdb6b192a0d87e5e594e819

Removed most calls to xmalloc/xrealloc.

loader/ne/segment.c

diff --git a/loader/ne/segment.c b/loader/ne/segment.c
index 87e9b7e..3c209c2 100644
--- a/loader/ne/segment.c
+++ b/loader/ne/segment.c
@@ -27,7 +27,6 @@
 #include "stackframe.h"
 #include "builtin16.h"
 #include "debugtools.h"
-#include "xmalloc.h"
 #include "toolhelp.h"
 
 DECLARE_DEBUG_CHANNEL(dll)
@@ -138,8 +137,14 @@
 	 but may be missing something. If you have any doc please either send
 	 it to me or fix the code yourself. gfm@werple.mira.net.au
       */
-      char* buff = xmalloc(size);
+      char* buff = HeapAlloc(GetProcessHeap(), 0, size);
       char* curr = buff;
+
+      if(buff == NULL) {
+          WARN_(dll)("Memory exausted!");
+          return FALSE;
+      }
+
       ReadFile(hf, buff, size, &res, NULL);
       while(curr < buff + size) {
 	unsigned int rept = *((short*) curr)++;
@@ -152,7 +157,7 @@
 	}
 	curr += len;
       }
-      free(buff);
+      HeapFree(GetProcessHeap(), 0, buff);
     }
 
     pSeg->flags |= NE_SEGFLAGS_LOADED;
@@ -175,7 +180,11 @@
                    (char *)pModule + pModule->name_table + 1,
                    segnum, pSeg->hSeg );
 
-    reloc_entries = (struct relocation_entry_s *)xmalloc(count * sizeof(struct relocation_entry_s));
+    reloc_entries = (struct relocation_entry_s *)HeapAlloc(GetProcessHeap(), 0, count * sizeof(struct relocation_entry_s));
+    if(reloc_entries == NULL) {
+        WARN_(fixup)("Not enough memory for relocation entries!");
+        return FALSE;
+    }
     if (!ReadFile( hf, reloc_entries, count * sizeof(struct relocation_entry_s), &res, NULL) ||
         (res != count * sizeof(struct relocation_entry_s)))
     {
@@ -362,7 +371,7 @@
         }
     }
 
-    free(reloc_entries);
+    HeapFree(GetProcessHeap(), 0, reloc_entries);
     return TRUE;
 
 unknown:
@@ -370,7 +379,7 @@
          "TYPE %d,  OFFSET %04x,  TARGET %04x %04x\n",
          i + 1, rep->address_type, rep->relocation_type, 
          rep->offset, rep->target1, rep->target2);
-    free(reloc_entries);
+    HeapFree(GetProcessHeap(), 0, reloc_entries);
     return FALSE;
 }