From a41fe5d4166e778a721b052691fcef334dbf502b Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 31 Aug 2002 10:27:01 +0000
Subject: [PATCH] Uses my_alloc

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@845 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/exehead/exec.c     | 9 ++++-----
 Source/exehead/fileform.c | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c
index f01a5f1f..80f7666e 100644
--- a/Source/exehead/exec.c
+++ b/Source/exehead/exec.c
@@ -636,7 +636,7 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
         }
         else
         {
-          s=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t));
+          s=(stack_t*)my_alloc(sizeof(stack_t));
           process_string_fromtab(s->text,parm0);
           s->next=g_st;
           g_st=s;
@@ -783,7 +783,7 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
         if (s1)
         {
           void *b1;
-          b1=(void*)GlobalAlloc(GPTR,s1);
+          b1=my_alloc(s1);
           if (b1)
           {
             UINT uLen;
@@ -912,7 +912,6 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
 #ifdef NSIS_SUPPORT_REBOOT
     case EW_REBOOT:
       exec_errorflag++;
-      if (parm0 == 0xbadf00d) 
       {
         HANDLE h=LoadLibrary("advapi32.dll");
         if (h)
@@ -1270,7 +1269,7 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
         {
           unsigned char *filebuf;
           DWORD l;
-          filebuf=(unsigned char *)GlobalAlloc(GMEM_FIXED,g_filehdrsize);
+          filebuf=(unsigned char *)my_alloc(g_filehdrsize);
           if (filebuf)
           {
             int fixoffs=0;
@@ -1279,7 +1278,7 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
             if (g_inst_header->uninstdata_offset != -1)
             {
               // Changed by Amir Szekely 11th July 2002
-              unsigned char* unicon_data = (unsigned char*)GlobalAlloc(GMEM_FIXED, g_inst_header->uninsticon_size);
+              unsigned char* unicon_data = (unsigned char*)my_alloc(g_inst_header->uninsticon_size);
               if (unicon_data) {
                 DWORD i;
                 unsigned char* seeker = unicon_data + sizeof(DWORD);
diff --git a/Source/exehead/fileform.c b/Source/exehead/fileform.c
index 3f2b3172..1f358737 100644
--- a/Source/exehead/fileform.c
+++ b/Source/exehead/fileform.c
@@ -57,7 +57,7 @@ int NSISCALL loadHeaders(void)
 
   if (!ReadFile(g_db_hFile,(LPVOID)&h,sizeof(h),&r,NULL) || r != sizeof(h) || !isheader(&h)) return -1;
 
-  data=(void*)GlobalAlloc(GMEM_FIXED,h.length_of_header);
+  data=(void*)my_alloc(h.length_of_header);
 
 #ifdef NSIS_CONFIG_COMPRESSION_SUPPORT
   inflateInit(&g_inflate_stream);