1 diff -ur nsis-2.39-src.orig/Source/DialogTemplate.cpp nsis-2.39-src.64bit/Source/DialogTemplate.cpp
2 --- nsis-2.39-src.orig/Source/DialogTemplate.cpp 2007-11-30 09:54:13.000000000 +0000
3 +++ nsis-2.39-src.64bit/Source/DialogTemplate.cpp 2008-09-22 12:37:11.000000000 +0100
5 if (IS_INTRESOURCE(x)) { \
6 *(WORD*)seeker = 0xFFFF; \
7 seeker += sizeof(WORD); \
8 - *(WORD*)seeker = ConvertEndianness(WORD(DWORD(x))); \
9 + *(WORD*)seeker = ConvertEndianness(WORD(long(x))); \
10 seeker += sizeof(WORD); \
17 - assert((DWORD) seeker - (DWORD) pbDlg == dwSize);
18 + assert((long) seeker - (long) pbDlg == dwSize);
22 diff -ur nsis-2.39-src.orig/Source/Platform.h nsis-2.39-src.64bit/Source/Platform.h
23 --- nsis-2.39-src.orig/Source/Platform.h 2007-12-22 09:41:57.000000000 +0000
24 +++ nsis-2.39-src.64bit/Source/Platform.h 2008-09-22 12:38:20.000000000 +0100
26 # define MAKEINTRESOURCE MAKEINTRESOURCEA
28 # ifndef IMAGE_FIRST_SECTION
29 -# define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (DWORD) h + \
30 +# define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (long) h + \
31 FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + \
32 FIX_ENDIAN_INT16(PIMAGE_NT_HEADERS(h)->FileHeader.SizeOfOptionalHeader) ) )
37 #ifndef IS_INTRESOURCE
38 -# define IS_INTRESOURCE(_r) (((ULONG_PTR)(_r) >> 16) == 0)
39 +# define IS_INTRESOURCE(_r) (((unsigned long)(_r) >> 16) == 0)
49 } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
52 diff -ur nsis-2.39-src.orig/Source/Plugins.cpp nsis-2.39-src.64bit/Source/Plugins.cpp
53 --- nsis-2.39-src.orig/Source/Plugins.cpp 2007-12-22 09:41:57.000000000 +0000
54 +++ nsis-2.39-src.64bit/Source/Plugins.cpp 2008-09-22 12:42:47.000000000 +0100
56 DWORD prd = FIX_ENDIAN_INT32(sections[i].PointerToRawData);
57 PIMAGE_EXPORT_DIRECTORY exports = PIMAGE_EXPORT_DIRECTORY(&dlldata[0] + prd + ExportDirVA - va);
58 DWORD na = FIX_ENDIAN_INT32(exports->AddressOfNames);
59 - unsigned long *names = (unsigned long*)((unsigned long) exports + (char *) na - ExportDirVA);
60 + unsigned int *names = (unsigned int*)((unsigned long) exports + (char *) na - ExportDirVA);
61 for (unsigned long j = 0; j < FIX_ENDIAN_INT32(exports->NumberOfNames); j++)
63 const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA);
64 diff -ur nsis-2.39-src.orig/Source/ResourceEditor.cpp nsis-2.39-src.64bit/Source/ResourceEditor.cpp
65 --- nsis-2.39-src.orig/Source/ResourceEditor.cpp 2007-12-22 09:41:57.000000000 +0000
66 +++ nsis-2.39-src.64bit/Source/ResourceEditor.cpp 2008-09-22 12:40:20.000000000 +0100
68 rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
70 CopyMemory(seeker, &rdDir, sizeof(IMAGE_RESOURCE_DIRECTORY));
71 - crd->m_dwWrittenAt = DWORD(seeker);
72 + crd->m_dwWrittenAt = long(seeker);
73 seeker += sizeof(IMAGE_RESOURCE_DIRECTORY);
75 for (int i = 0; i < crd->CountEntries(); i++) {
77 rDirE.UName.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
79 CopyMemory(seeker, &rDirE, sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY));
80 - crd->GetEntry(i)->m_dwWrittenAt = DWORD(seeker);
81 + crd->GetEntry(i)->m_dwWrittenAt = long(seeker);
82 seeker += sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY);
86 rDataE.Size = ConvertEndianness(cRDataE->GetSize());
88 CopyMemory(seeker, &rDataE, sizeof(IMAGE_RESOURCE_DATA_ENTRY));
89 - cRDataE->m_dwWrittenAt = DWORD(seeker);
90 + cRDataE->m_dwWrittenAt = long(seeker);
91 seeker += sizeof(IMAGE_RESOURCE_DATA_ENTRY);
95 while (!qStrings.empty()) {
96 CResourceDirectoryEntry* cRDirE = qStrings.front();
98 - PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(DWORD(seeker) - DWORD(pbRsrcSec));
99 + PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(long(seeker) - long(pbRsrcSec));
101 WCHAR* szName = cRDirE->GetName();
102 WORD iLen = winchar_strlen(szName) + 1;
105 * Set all of the directory entries offsets.
107 - SetOffsets(m_cResDir, DWORD(pbRsrcSec));
108 + SetOffsets(m_cResDir, long(pbRsrcSec));
111 // Sets the offsets in directory entries
113 // Returns -1 if can not be found
114 int CResourceDirectory::Find(WCHAR* szName) {
115 if (IS_INTRESOURCE(szName))
116 - return Find((WORD) (DWORD) szName);
117 + return Find((WORD) (long) szName);
119 if (szName[0] == '#')
120 return Find(WORD(winchar_stoi(szName + 1)));
122 if (IS_INTRESOURCE(szName)) {
125 - m_wId = (WORD) (DWORD) szName;
126 + m_wId = (WORD) (long) szName;
131 if (IS_INTRESOURCE(szName)) {
134 - m_wId = (WORD) (DWORD) szName;
135 + m_wId = (WORD) (long) szName;
139 diff -ur nsis-2.39-src.orig/Source/util.cpp nsis-2.39-src.64bit/Source/util.cpp
140 --- nsis-2.39-src.orig/Source/util.cpp 2008-03-04 16:59:51.000000000 +0000
141 +++ nsis-2.39-src.64bit/Source/util.cpp 2008-09-22 12:41:03.000000000 +0100
148 fseek(f, 18, SEEK_SET); // Seek to the width member of the header
149 - fread(&biWidth, sizeof(LONG), 1, f);
150 + fread(&biWidth, sizeof(DWORD), 1, f);
151 FIX_ENDIAN_INT32_INPLACE(biWidth);
152 if (width != biWidth) {
160 fseek(f, 22, SEEK_SET); // Seek to the height member of the header
161 - fread(&biHeight, sizeof(LONG), 1, f);
162 + fread(&biHeight, sizeof(DWORD), 1, f);
163 FIX_ENDIAN_INT32_INPLACE(biHeight);
164 // Bitmap height can be negative too...
165 - if (height != abs(biHeight)) {
166 + if (height != abs((long int)biHeight)) {