dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Uses my_alloc

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@845 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-08-31 10:27:01 +00:00
parent 8c7c3c304e
commit a41fe5d416
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/exehead/exec.c
View file

@ -636,7 +636,7 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
} }
else else
{ {
s=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)); s=(stack_t*)my_alloc(sizeof(stack_t));
process_string_fromtab(s->text,parm0); process_string_fromtab(s->text,parm0);
s->next=g_st; s->next=g_st;
g_st=s; g_st=s;
@ -783,7 +783,7 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
if (s1) if (s1)
{ {
void *b1; void *b1;
b1=(void*)GlobalAlloc(GPTR,s1); b1=my_alloc(s1);
if (b1) if (b1)
{ {
UINT uLen; UINT uLen;
@ -912,7 +912,6 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
#ifdef NSIS_SUPPORT_REBOOT #ifdef NSIS_SUPPORT_REBOOT
case EW_REBOOT: case EW_REBOOT:
exec_errorflag++; exec_errorflag++;
if (parm0 == 0xbadf00d)
{ {
HANDLE h=LoadLibrary("advapi32.dll"); HANDLE h=LoadLibrary("advapi32.dll");
if (h) if (h)
@ -1270,7 +1269,7 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
{ {
unsigned char *filebuf; unsigned char *filebuf;
DWORD l; DWORD l;
filebuf=(unsigned char *)GlobalAlloc(GMEM_FIXED,g_filehdrsize); filebuf=(unsigned char *)my_alloc(g_filehdrsize);
if (filebuf) if (filebuf)
{ {
int fixoffs=0; int fixoffs=0;
@ -1279,7 +1278,7 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
if (g_inst_header->uninstdata_offset != -1) if (g_inst_header->uninstdata_offset != -1)
{ {
// Changed by Amir Szekely 11th July 2002 // 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) { if (unicon_data) {
DWORD i; DWORD i;
unsigned char* seeker = unicon_data + sizeof(DWORD); unsigned char* seeker = unicon_data + sizeof(DWORD);

2
Source/exehead/fileform.c
View file

@ -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; 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 #ifdef NSIS_CONFIG_COMPRESSION_SUPPORT
inflateInit(&g_inflate_stream); inflateInit(&g_inflate_stream);