2004-01-30 22:04:10 +00:00
|
|
|
#include "Platform.h"
|
2002-08-02 10:01:35 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <conio.h>
|
|
|
|
#include "exedata.h"
|
|
|
|
#include "exehead/fileform.h"
|
|
|
|
#include "util.h"
|
|
|
|
#include "strlist.h"
|
|
|
|
|
|
|
|
int g_dopause=0;
|
|
|
|
extern int g_display_errors;
|
|
|
|
extern FILE *g_output;
|
|
|
|
|
|
|
|
void dopause(void)
|
|
|
|
{
|
|
|
|
if (g_dopause)
|
|
|
|
{
|
|
|
|
if (g_display_errors) fprintf(g_output,"MakeNSIS done - hit enter to close...");
|
|
|
|
fflush(stdout);
|
|
|
|
int a;
|
|
|
|
while ((a=_getch()) != '\r' && a != 27/*esc*/);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returns 0 if everything is OK
|
2003-05-09 19:50:16 +00:00
|
|
|
// Returns -1 if can't find the file
|
|
|
|
// Returns -2 if the file is an invalid bitmap
|
|
|
|
// Returns -3 if the size doesn't match
|
|
|
|
// Returns -4 if the bpp doesn't match
|
|
|
|
int update_bitmap(CResourceEditor* re, WORD id, char* filename, int width/*=0*/, int height/*=0*/, int maxbpp/*=0*/) {
|
2002-08-02 10:01:35 +00:00
|
|
|
FILE *f = fopen(filename, "rb");
|
|
|
|
if (!f) return -1;
|
|
|
|
|
|
|
|
if (fgetc(f) != 'B' || fgetc(f) != 'M') {
|
|
|
|
fclose(f);
|
2003-05-09 19:50:16 +00:00
|
|
|
return -2;
|
2002-08-02 10:01:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (width != 0) {
|
|
|
|
LONG biWidth;
|
|
|
|
fseek(f, 18, SEEK_SET); // Seek to the width member of the header
|
|
|
|
fread(&biWidth, sizeof(LONG), 1, f);
|
|
|
|
if (width != biWidth) {
|
|
|
|
fclose(f);
|
2003-05-09 19:50:16 +00:00
|
|
|
return -3;
|
2002-08-02 10:01:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (height != 0) {
|
|
|
|
LONG biHeight;
|
|
|
|
fseek(f, 22, SEEK_SET); // Seek to the height member of the header
|
|
|
|
fread(&biHeight, sizeof(LONG), 1, f);
|
2003-05-09 19:50:16 +00:00
|
|
|
// Bitmap height can be negative too...
|
2002-08-02 10:01:35 +00:00
|
|
|
if (height != abs(biHeight)) {
|
|
|
|
fclose(f);
|
2003-05-09 19:50:16 +00:00
|
|
|
return -3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxbpp != 0) {
|
|
|
|
WORD biBitCount;
|
|
|
|
fseek(f, 28, SEEK_SET); // Seek to the height member of the header
|
|
|
|
fread(&biBitCount, sizeof(WORD), 1, f);
|
|
|
|
if (biBitCount > maxbpp) {
|
|
|
|
fclose(f);
|
|
|
|
return -4;
|
2002-08-02 10:01:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DWORD dwSize;
|
|
|
|
fseek(f, 2, SEEK_SET);
|
|
|
|
fread(&dwSize, sizeof(DWORD), 1, f);
|
|
|
|
dwSize -= 14;
|
|
|
|
|
|
|
|
unsigned char* bitmap = (unsigned char*)malloc(dwSize);
|
|
|
|
if (!bitmap) throw bad_alloc();
|
|
|
|
|
|
|
|
fseek(f, 14, SEEK_SET);
|
|
|
|
if (fread(bitmap, 1, dwSize, f) != dwSize) {
|
|
|
|
fclose(f);
|
2003-05-09 19:50:16 +00:00
|
|
|
return -2;
|
2002-08-02 10:01:35 +00:00
|
|
|
}
|
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
re->UpdateResource(RT_BITMAP, MAKEINTRESOURCE(id), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), bitmap, dwSize);
|
|
|
|
|
2003-09-12 11:16:33 +00:00
|
|
|
free(bitmap);
|
|
|
|
|
2002-08-02 10:01:35 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Added by Amir Szekely 8th July 2002
|
|
|
|
// Icon editing structures
|
|
|
|
typedef struct {
|
|
|
|
WORD wReserved;
|
|
|
|
WORD wIsIcon;
|
|
|
|
WORD wCount;
|
|
|
|
} IconGroupHeader;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
BYTE bWidth;
|
|
|
|
BYTE bHeight;
|
|
|
|
BYTE bPaletteEntries;
|
|
|
|
BYTE bReserved;
|
|
|
|
WORD wPlanes;
|
|
|
|
WORD wBitsPerPixel;
|
|
|
|
DWORD dwRawSize;
|
|
|
|
DWORD dwImageOffset;
|
|
|
|
} FileIconGroupEntry;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
BYTE bWidth;
|
|
|
|
BYTE bHeight;
|
|
|
|
BYTE bPaletteEntries;
|
|
|
|
BYTE bReserved;
|
|
|
|
WORD wPlanes;
|
|
|
|
WORD wBitsPerPixel;
|
|
|
|
DWORD dwRawSize;
|
|
|
|
WORD wRsrcId;
|
|
|
|
} RsrcIconGroupEntry;
|
|
|
|
|
|
|
|
#define SIZEOF_RSRC_ICON_GROUP_ENTRY 14
|
|
|
|
|
|
|
|
// Added by Amir Szekely 8th July 2002
|
|
|
|
// replace_icon, must get an initialized resource editor
|
|
|
|
// return values:
|
|
|
|
// 0 - All OK
|
|
|
|
// -1 - Bad icon file
|
|
|
|
int replace_icon(CResourceEditor* re, WORD wIconId, char* filename)
|
|
|
|
{
|
|
|
|
FILE* f = fopen(filename, "rb");
|
|
|
|
if (!f) return -1;
|
|
|
|
|
|
|
|
IconGroupHeader igh;
|
|
|
|
fread(&igh, sizeof(IconGroupHeader), 1, f);
|
|
|
|
|
|
|
|
if (igh.wIsIcon != 1 && igh.wReserved != 0) return -1;
|
|
|
|
|
|
|
|
BYTE* rsrcIconGroup = (BYTE*)malloc(sizeof(IconGroupHeader) + igh.wCount*SIZEOF_RSRC_ICON_GROUP_ENTRY);
|
|
|
|
if (!rsrcIconGroup) throw bad_alloc();
|
|
|
|
|
|
|
|
CopyMemory(rsrcIconGroup, &igh, sizeof(IconGroupHeader));
|
|
|
|
|
|
|
|
RsrcIconGroupEntry* ige = (RsrcIconGroupEntry*)(rsrcIconGroup + sizeof(IconGroupHeader));
|
|
|
|
|
2002-12-29 19:46:29 +00:00
|
|
|
int i = 1;
|
|
|
|
|
|
|
|
// Delete old icons
|
|
|
|
while (re->UpdateResource(RT_ICON, MAKEINTRESOURCE(i++), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 0, 0));
|
|
|
|
|
2002-08-02 10:01:35 +00:00
|
|
|
int iNewIconSize = 0;
|
|
|
|
|
2002-12-29 19:46:29 +00:00
|
|
|
for (i = 0; i < igh.wCount; i++) {
|
2002-08-02 10:01:35 +00:00
|
|
|
fread(ige, sizeof(FileIconGroupEntry)-sizeof(DWORD), 1, f);
|
|
|
|
ige->wRsrcId = i+1;
|
|
|
|
|
|
|
|
DWORD dwOffset;
|
|
|
|
fread(&dwOffset, sizeof(DWORD), 1, f);
|
|
|
|
|
|
|
|
fpos_t pos;
|
|
|
|
fgetpos(f, &pos);
|
|
|
|
|
2003-09-12 11:16:33 +00:00
|
|
|
if (fseek(f, dwOffset, SEEK_SET)) {
|
|
|
|
free(rsrcIconGroup);
|
|
|
|
return -1;
|
|
|
|
}
|
2002-08-02 10:01:35 +00:00
|
|
|
BYTE* iconData = (BYTE*)malloc(ige->dwRawSize);
|
2003-09-12 11:16:33 +00:00
|
|
|
if (!iconData) {
|
|
|
|
free(rsrcIconGroup);
|
|
|
|
throw bad_alloc();
|
|
|
|
}
|
2002-08-02 10:01:35 +00:00
|
|
|
fread(iconData, sizeof(BYTE), ige->dwRawSize, f);
|
|
|
|
re->UpdateResource(RT_ICON, MAKEINTRESOURCE(i+1), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), iconData, ige->dwRawSize);
|
|
|
|
free(iconData);
|
|
|
|
|
|
|
|
fsetpos(f, &pos);
|
|
|
|
|
|
|
|
// Every icon entry should be 8 aligned
|
|
|
|
iNewIconSize += ((ige->dwRawSize%8 == 0) ? ige->dwRawSize : ige->dwRawSize - (ige->dwRawSize%8) + 8);
|
|
|
|
|
|
|
|
// Seems like the compiler refuses to increase the pointer by just 14.
|
|
|
|
// If you'll replace this line by ige++ you will get unwanted results.
|
|
|
|
ige = (RsrcIconGroupEntry*)((BYTE*)ige + SIZEOF_RSRC_ICON_GROUP_ENTRY);
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
re->UpdateResource(RT_GROUP_ICON, MAKEINTRESOURCE(wIconId), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), rsrcIconGroup, sizeof(IconGroupHeader) + igh.wCount*SIZEOF_RSRC_ICON_GROUP_ENTRY);
|
|
|
|
|
2003-09-10 13:44:24 +00:00
|
|
|
free(rsrcIconGroup);
|
|
|
|
|
2002-08-02 10:01:35 +00:00
|
|
|
icondata_size = iNewIconSize;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Added by Amir Szekely 8th July 2002
|
|
|
|
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
|
|
|
|
// returns the data of the uninstaller icon that should replace the installer icon data
|
|
|
|
// return values:
|
|
|
|
// 0 - Bad icon file
|
|
|
|
// Anything else - Pointer to the uninstaller icon data
|
|
|
|
unsigned char* generate_uninstall_icon_data(char* filename)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
FILE* f = fopen(filename, "rb");
|
|
|
|
if (!f) return 0;
|
|
|
|
|
|
|
|
IconGroupHeader igh;
|
|
|
|
if (!fread(&igh, sizeof(IconGroupHeader), 1, f)) return 0;
|
|
|
|
|
|
|
|
if (igh.wIsIcon != 1 && igh.wReserved != 0) return 0;
|
|
|
|
|
|
|
|
int iNewIconSize = 0;
|
|
|
|
FileIconGroupEntry ige;
|
|
|
|
|
|
|
|
DWORD* offsets = (DWORD*)malloc(sizeof(DWORD)*igh.wCount);
|
|
|
|
DWORD* rawSizes = (DWORD*)malloc(sizeof(DWORD)*igh.wCount);
|
|
|
|
if (!offsets || !rawSizes) throw bad_alloc();
|
|
|
|
|
|
|
|
for (i = 0; i < igh.wCount; i++) {
|
|
|
|
if (!fread(&ige, sizeof(FileIconGroupEntry), 1, f)) return 0;
|
|
|
|
offsets[i] = ige.dwImageOffset;
|
|
|
|
rawSizes[i] = ige.dwRawSize;
|
|
|
|
iNewIconSize += ige.dwRawSize;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Before each icon come two DWORDs, one for size and the other for offset (set later)
|
2002-09-23 14:07:39 +00:00
|
|
|
// The last size is 0, no offset
|
2002-08-02 10:01:35 +00:00
|
|
|
iNewIconSize += sizeof(DWORD)*(1 + igh.wCount*2);
|
|
|
|
|
|
|
|
BYTE* pbUninstIcon = (BYTE*)malloc(iNewIconSize);
|
|
|
|
if (!pbUninstIcon) throw bad_alloc();
|
|
|
|
|
|
|
|
BYTE* seeker = pbUninstIcon;
|
|
|
|
|
|
|
|
for (i = 0; i < igh.wCount; i++) {
|
|
|
|
*(DWORD*)seeker = rawSizes[i];
|
|
|
|
seeker += sizeof(DWORD);
|
|
|
|
*(DWORD*)seeker = 0;
|
|
|
|
seeker += sizeof(DWORD);
|
|
|
|
fseek(f, offsets[i], SEEK_SET);
|
|
|
|
fread(seeker, 1, rawSizes[i], f);
|
|
|
|
seeker += rawSizes[i];
|
|
|
|
}
|
|
|
|
|
2002-09-23 14:07:39 +00:00
|
|
|
// This is how we know there are no more icons (size = 0)
|
|
|
|
*(DWORD*)seeker = 0;
|
|
|
|
|
2002-08-02 10:01:35 +00:00
|
|
|
free(offsets);
|
|
|
|
free(rawSizes);
|
|
|
|
|
|
|
|
unicondata_size = iNewIconSize;
|
|
|
|
|
|
|
|
return pbUninstIcon;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Added by Amir Szekely 11th July 2002
|
2003-05-12 15:34:58 +00:00
|
|
|
#define MY_ASSERT(x, y) if (x) {if (g_display_errors) fprintf(g_output,"\nError finding icon resources: %s -- failing!\n", y);return 0;}
|
2002-08-02 10:01:35 +00:00
|
|
|
|
|
|
|
int find_in_dir(PRESOURCE_DIRECTORY rd, WORD id) {
|
|
|
|
for (int i = rd->Header.NumberOfNamedEntries; i < rd->Header.NumberOfNamedEntries + rd->Header.NumberOfIdEntries; i++) {
|
|
|
|
if (rd->Entries[i].Id == id) {
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fill the array of icons for uninstall with their offsets
|
|
|
|
// Returns 0 if failed, anything else is icon_offset.
|
|
|
|
int generate_unicons_offsets(unsigned char* exeHeader, unsigned char* uninstIconData) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
MY_ASSERT(PIMAGE_DOS_HEADER(exeHeader)->e_magic != IMAGE_DOS_SIGNATURE, "invalid dos header");
|
|
|
|
|
|
|
|
PIMAGE_NT_HEADERS ntHeaders = PIMAGE_NT_HEADERS(exeHeader + PIMAGE_DOS_HEADER(exeHeader)->e_lfanew);
|
|
|
|
|
|
|
|
MY_ASSERT(ntHeaders->Signature != IMAGE_NT_SIGNATURE, "invalid nt headers");
|
|
|
|
|
|
|
|
DWORD dwResourceSectionVA = ntHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress;
|
|
|
|
PIMAGE_SECTION_HEADER sectionHeadersArray = IMAGE_FIRST_SECTION(ntHeaders);
|
|
|
|
|
|
|
|
for (i = 0; i < ntHeaders->FileHeader.NumberOfSections; i++)
|
2003-07-12 15:19:49 +00:00
|
|
|
if (dwResourceSectionVA == sectionHeadersArray[i].VirtualAddress)
|
|
|
|
break;
|
2002-08-02 10:01:35 +00:00
|
|
|
|
|
|
|
MY_ASSERT(i == ntHeaders->FileHeader.NumberOfSections, "can't find resource section");
|
|
|
|
|
|
|
|
PRESOURCE_DIRECTORY rdRoot = PRESOURCE_DIRECTORY(exeHeader + sectionHeadersArray[i].PointerToRawData);
|
|
|
|
|
2003-05-27 14:51:00 +00:00
|
|
|
int iNextSection;
|
2003-05-12 15:34:58 +00:00
|
|
|
if (i == ntHeaders->FileHeader.NumberOfSections - 1)
|
2003-05-27 14:51:00 +00:00
|
|
|
iNextSection = (int)ntHeaders->OptionalHeader.SizeOfImage;
|
2003-05-12 15:34:58 +00:00
|
|
|
else
|
2003-05-27 14:51:00 +00:00
|
|
|
iNextSection = (int)sectionHeadersArray[i+1].PointerToRawData;
|
2003-05-12 15:34:58 +00:00
|
|
|
|
2003-05-27 14:51:00 +00:00
|
|
|
MY_ASSERT((int)rdRoot - (int)exeHeader > iNextSection, "corrupted EXE - invalid pointer");
|
2003-05-12 15:34:58 +00:00
|
|
|
|
2004-03-12 20:43:54 +00:00
|
|
|
int idx = find_in_dir(rdRoot, (WORD) (int) RT_ICON);
|
2002-08-02 10:01:35 +00:00
|
|
|
MY_ASSERT(idx == -1, "no icons?!");
|
|
|
|
MY_ASSERT(!rdRoot->Entries[idx].DataIsDirectory, "bad resource directory");
|
|
|
|
|
|
|
|
PRESOURCE_DIRECTORY rdIcons = PRESOURCE_DIRECTORY(rdRoot->Entries[idx].OffsetToDirectory + DWORD(rdRoot));
|
|
|
|
|
2003-05-27 14:51:00 +00:00
|
|
|
MY_ASSERT((int)rdIcons - (int)exeHeader > iNextSection, "corrupted EXE - invalid pointer");
|
2003-05-12 15:34:58 +00:00
|
|
|
|
2003-12-08 09:32:30 +00:00
|
|
|
MY_ASSERT(rdIcons->Header.NumberOfIdEntries == 0, "no icons found");
|
2002-08-02 10:01:35 +00:00
|
|
|
|
|
|
|
for (i = 0; i < rdIcons->Header.NumberOfIdEntries; i++) { // Icons dir can't have named entries
|
|
|
|
MY_ASSERT(!rdIcons->Entries[i].DataIsDirectory, "bad resource directory");
|
|
|
|
PRESOURCE_DIRECTORY rd = PRESOURCE_DIRECTORY(rdIcons->Entries[i].OffsetToDirectory + DWORD(rdRoot));
|
2003-05-12 15:34:58 +00:00
|
|
|
|
2003-05-27 14:51:00 +00:00
|
|
|
MY_ASSERT((int)rd - (int)exeHeader > iNextSection, "corrupted EXE - invalid pointer");
|
2002-08-02 10:01:35 +00:00
|
|
|
MY_ASSERT(rd->Entries[0].DataIsDirectory, "bad resource directory");
|
2003-05-12 15:34:58 +00:00
|
|
|
|
2002-08-02 10:01:35 +00:00
|
|
|
PIMAGE_RESOURCE_DATA_ENTRY rde = PIMAGE_RESOURCE_DATA_ENTRY(rd->Entries[0].OffsetToData + DWORD(rdRoot));
|
|
|
|
|
2003-05-27 14:51:00 +00:00
|
|
|
MY_ASSERT((int)rde - (int)exeHeader > iNextSection, "corrupted EXE - invalid pointer");
|
2003-05-12 15:34:58 +00:00
|
|
|
|
2003-12-08 09:32:30 +00:00
|
|
|
// find icon to replace
|
|
|
|
LPBYTE seeker = uninstIconData;
|
|
|
|
while (*seeker) {
|
|
|
|
DWORD dwSize = *(DWORD*)seeker;
|
|
|
|
seeker += sizeof(DWORD);
|
|
|
|
DWORD dwOffset = *(DWORD*)seeker;
|
|
|
|
// if we haven't set the offset yet and the size is the same, it's a match
|
|
|
|
if (!dwOffset && dwSize == rde->Size)
|
|
|
|
break;
|
|
|
|
|
|
|
|
seeker += dwSize + sizeof(DWORD);
|
|
|
|
|
|
|
|
// reached the end of the list and no match
|
|
|
|
MY_ASSERT(!*seeker, "installer, uninstaller icon size mismatch - see the Icon instruction's documentation for more information");
|
|
|
|
}
|
|
|
|
|
2002-08-02 10:01:35 +00:00
|
|
|
// Set offset
|
2003-12-08 09:32:30 +00:00
|
|
|
*(LPDWORD) seeker = rde->OffsetToData + DWORD(rdRoot) - dwResourceSectionVA - DWORD(exeHeader);
|
2003-05-12 15:34:58 +00:00
|
|
|
|
2003-05-27 14:51:00 +00:00
|
|
|
MY_ASSERT(*(int*)seeker > iNextSection || *(int*)seeker < (int)rdRoot - (int)exeHeader, "invalid data offset - icon resource probably compressed");
|
2002-08-02 10:01:35 +00:00
|
|
|
}
|
2003-12-08 09:32:30 +00:00
|
|
|
|
|
|
|
LPBYTE seeker = uninstIconData;
|
|
|
|
while (*seeker) {
|
|
|
|
DWORD dwSize = *(DWORD*)seeker;
|
|
|
|
seeker += sizeof(DWORD);
|
|
|
|
DWORD dwOffset = *(DWORD*)seeker;
|
|
|
|
seeker += sizeof(DWORD);
|
|
|
|
// offset isn't set which means we found no match for this one
|
|
|
|
MY_ASSERT(!dwOffset, "number of icons doesn't match");
|
|
|
|
seeker += dwSize;
|
|
|
|
}
|
2002-08-02 10:01:35 +00:00
|
|
|
|
|
|
|
return PIMAGE_RESOURCE_DATA_ENTRY(PRESOURCE_DIRECTORY(rdIcons->Entries[0].OffsetToDirectory + DWORD(rdRoot))->Entries[0].OffsetToData + DWORD(rdRoot))->OffsetToData + DWORD(rdRoot) - dwResourceSectionVA - DWORD(exeHeader);
|
|
|
|
}
|
|
|
|
#endif // NSIS_CONFIG_UNINSTALL_SUPPORT
|
2002-08-06 11:24:49 +00:00
|
|
|
|
|
|
|
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
|
|
|
|
BYTE* get_dlg(HINSTANCE hUIFile, WORD dlgId, char* filename) {
|
|
|
|
HRSRC hUIRes = FindResource(hUIFile, MAKEINTRESOURCE(dlgId), RT_DIALOG);
|
|
|
|
if (!hUIRes) {
|
|
|
|
if (g_display_errors) fprintf(g_output, "Error: \"%s\" doesn't contain a dialog with the ID %u!\n", filename, dlgId);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
HGLOBAL hUIMem = LoadResource(hUIFile, hUIRes);
|
|
|
|
if (!hUIMem) {
|
|
|
|
if (g_display_errors) fprintf(g_output, "Error: Can't load a dialog from \"%s\"!\n", filename);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
BYTE* pbUIData = (BYTE*)LockResource(hUIMem);
|
|
|
|
if (!pbUIData) {
|
|
|
|
if (g_display_errors) fprintf(g_output, "Error: Can't lock resource from \"%s\"!\n", filename);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return pbUIData;
|
|
|
|
}
|
2002-11-27 16:04:34 +00:00
|
|
|
#endif //NSIS_CONFIG_VISIBLE_SUPPORT
|
|
|
|
|
|
|
|
void *operator new(size_t size) {
|
2003-05-09 19:50:16 +00:00
|
|
|
void *p = malloc(size);
|
|
|
|
if (!p)
|
|
|
|
throw bad_alloc();
|
|
|
|
return p;
|
2002-11-27 16:04:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void operator delete(void *p) {
|
2003-05-09 19:50:16 +00:00
|
|
|
if (p) free(p);
|
2002-11-27 16:04:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void operator delete [](void *p) {
|
2003-05-09 19:50:16 +00:00
|
|
|
if (p) free(p);
|
2004-03-12 20:43:54 +00:00
|
|
|
}
|