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

my_GlobalAlloc no longer reduces the size

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4255 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-09-09 16:08:44 +00:00
parent 8e3f7ed623
commit d6367e4125
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/exehead/Ui.c
View file

@ -1129,7 +1129,7 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
g_SectionHack=hwndDlg; g_SectionHack=hwndDlg;
hTreeItems=(HTREEITEM*)my_GlobalAlloc(sizeof(HTREEITEM)*num_sections); hTreeItems=(HTREEITEM*)GlobalAlloc(GPTR,sizeof(HTREEITEM)*num_sections);
hBMcheck1=LoadBitmap(g_hInstance, MAKEINTRESOURCE(IDB_BITMAP1)); hBMcheck1=LoadBitmap(g_hInstance, MAKEINTRESOURCE(IDB_BITMAP1));

8
Source/exehead/exec.c
View file

@ -696,7 +696,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
} }
else else
{ {
s=(stack_t*)my_GlobalAlloc(sizeof(stack_t)); s=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t));
GetNSISString(s->text,parm0); GetNSISString(s->text,parm0);
s->next=g_st; s->next=g_st;
g_st=s; g_st=s;
@ -900,7 +900,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
if (s1) if (s1)
{ {
void *b1; void *b1;
b1=my_GlobalAlloc(s1); b1=GlobalAlloc(GPTR,s1);
if (b1) if (b1)
{ {
UINT uLen; UINT uLen;
@ -1410,7 +1410,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
{ {
unsigned char *filebuf; unsigned char *filebuf;
int filehdrsize = g_filehdrsize; int filehdrsize = g_filehdrsize;
filebuf=(unsigned char *)my_GlobalAlloc(filehdrsize); filebuf=(unsigned char *)GlobalAlloc(GPTR,filehdrsize);
if (filebuf) if (filebuf)
{ {
DWORD lout; DWORD lout;
@ -1418,7 +1418,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
ReadSelfFile((char*)filebuf,filehdrsize); ReadSelfFile((char*)filebuf,filehdrsize);
{ {
unsigned char* seeker; unsigned char* seeker;
unsigned char* unicon_data = seeker = (unsigned char*)my_GlobalAlloc(parm2); unsigned char* unicon_data = seeker = (unsigned char*)GlobalAlloc(GPTR,parm2);
if (unicon_data) { if (unicon_data) {
GetCompressedDataFromDataBlockToMemory(parm1,unicon_data,parm2); GetCompressedDataFromDataBlockToMemory(parm1,unicon_data,parm2);
while (*seeker) { while (*seeker) {

2
Source/exehead/fileform.c
View file

@ -237,7 +237,7 @@ const char * NSISCALL loadHeaders(int cl_flags)
} }
#endif//NSIS_CONFIG_CRC_SUPPORT #endif//NSIS_CONFIG_CRC_SUPPORT
data = (void *)my_GlobalAlloc(h.length_of_header); data = (void *)GlobalAlloc(GPTR,h.length_of_header);
#ifdef NSIS_COMPRESS_WHOLE #ifdef NSIS_COMPRESS_WHOLE
inflateReset(&g_inflate_stream); inflateReset(&g_inflate_stream);

4
Source/exehead/util.c
View file

@ -90,10 +90,6 @@ int NSISCALL my_MessageBox(const char *text, UINT type) {
return MessageBox(g_hwnd, text, g_caption, _type); return MessageBox(g_hwnd, text, g_caption, _type);
} }
void * NSISCALL my_GlobalAlloc(DWORD dwBytes) {
return (void *)GlobalAlloc(GPTR, dwBytes);
}
void NSISCALL myDelete(char *buf, int flags) void NSISCALL myDelete(char *buf, int flags)
{ {
static char lbuf[NSIS_MAX_STRLEN]; static char lbuf[NSIS_MAX_STRLEN];