1 diff -ur nsis-2.34-src/SCons/Config/gnu nsis-2.34-src-64bit-fixes/SCons/Config/gnu
2 --- nsis-2.34-src/SCons/Config/gnu 2007-11-14 07:20:44.000000000 +0100
3 +++ nsis-2.34-src-64bit-fixes/SCons/Config/gnu 2008-01-13 22:15:21.000000000 +0100
5 makensis_env.Append(CXXFLAGS = '-Wno-non-virtual-dtor') # ignore virtual dtor warnings
7 conf = FlagsConfigure(makensis_env)
8 -conf.CheckCompileFlag('-m32') #
9 -conf.CheckLinkFlag('-m32') #
10 conf.CheckLinkFlag('$MAP_FLAG') # generate map file
11 if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
12 TestStrip(conf) # strip
13 diff -ur nsis-2.34-src/Source/DialogTemplate.cpp nsis-2.34-src-64bit-fixes/Source/DialogTemplate.cpp
14 --- nsis-2.34-src/Source/DialogTemplate.cpp 2007-11-30 10:54:13.000000000 +0100
15 +++ nsis-2.34-src-64bit-fixes/Source/DialogTemplate.cpp 2008-01-13 19:01:02.000000000 +0100
17 if (IS_INTRESOURCE(x)) { \
18 *(WORD*)seeker = 0xFFFF; \
19 seeker += sizeof(WORD); \
20 - *(WORD*)seeker = ConvertEndianness(WORD(DWORD(x))); \
21 + *(WORD*)seeker = ConvertEndianness(WORD(long(x))); \
22 seeker += sizeof(WORD); \
29 - assert((DWORD) seeker - (DWORD) pbDlg == dwSize);
30 + assert((long) seeker - (long) pbDlg == dwSize);
34 diff -ur nsis-2.34-src/Source/mmap.cpp nsis-2.34-src-64bit-fixes/Source/mmap.cpp
35 --- nsis-2.34-src/Source/mmap.cpp 2007-12-22 10:41:57.000000000 +0100
36 +++ nsis-2.34-src-64bit-fixes/Source/mmap.cpp 2008-01-13 19:01:59.000000000 +0100
41 - unsigned int alignment = ((unsigned int)pView) % m_iAllocationGranularity;
42 + unsigned int alignment = ((unsigned long)pView) % m_iAllocationGranularity;
43 pView = (char *)pView - alignment;
46 diff -ur nsis-2.34-src/Source/Platform.h nsis-2.34-src-64bit-fixes/Source/Platform.h
47 --- nsis-2.34-src/Source/Platform.h 2007-12-22 10:41:57.000000000 +0100
48 +++ nsis-2.34-src-64bit-fixes/Source/Platform.h 2008-01-13 19:36:04.000000000 +0100
50 # define MAKEINTRESOURCE MAKEINTRESOURCEA
52 # ifndef IMAGE_FIRST_SECTION
53 -# define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (DWORD) h + \
54 +# define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (long) h + \
55 FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + \
56 FIX_ENDIAN_INT16(PIMAGE_NT_HEADERS(h)->FileHeader.SizeOfOptionalHeader) ) )
62 -# define ULONG_PTR DWORD
63 +# define ULONG_PTR ULONG
73 } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
76 diff -ur nsis-2.34-src/Source/Plugins.cpp nsis-2.34-src-64bit-fixes/Source/Plugins.cpp
77 --- nsis-2.34-src/Source/Plugins.cpp 2007-12-22 10:41:57.000000000 +0100
78 +++ nsis-2.34-src-64bit-fixes/Source/Plugins.cpp 2008-01-13 19:01:59.000000000 +0100
80 DWORD prd = FIX_ENDIAN_INT32(sections[i].PointerToRawData);
81 PIMAGE_EXPORT_DIRECTORY exports = PIMAGE_EXPORT_DIRECTORY(&dlldata[0] + prd + ExportDirVA - va);
82 DWORD na = FIX_ENDIAN_INT32(exports->AddressOfNames);
83 - unsigned long *names = (unsigned long*)((unsigned long) exports + (char *) na - ExportDirVA);
84 + unsigned int *names = (unsigned int*)((unsigned long) exports + (char *) na - ExportDirVA);
85 for (unsigned long j = 0; j < FIX_ENDIAN_INT32(exports->NumberOfNames); j++)
87 const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA);
88 diff -ur nsis-2.34-src/Source/ResourceEditor.cpp nsis-2.34-src-64bit-fixes/Source/ResourceEditor.cpp
89 --- nsis-2.34-src/Source/ResourceEditor.cpp 2007-12-22 10:41:57.000000000 +0100
90 +++ nsis-2.34-src-64bit-fixes/Source/ResourceEditor.cpp 2008-01-13 19:40:29.000000000 +0100
92 rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
94 CopyMemory(seeker, &rdDir, sizeof(IMAGE_RESOURCE_DIRECTORY));
95 - crd->m_dwWrittenAt = DWORD(seeker);
96 + crd->m_dwWrittenAt = long(seeker);
97 seeker += sizeof(IMAGE_RESOURCE_DIRECTORY);
99 for (int i = 0; i < crd->CountEntries(); i++) {
101 rDirE.UName.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
103 CopyMemory(seeker, &rDirE, sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY));
104 - crd->GetEntry(i)->m_dwWrittenAt = DWORD(seeker);
105 + crd->GetEntry(i)->m_dwWrittenAt = long(seeker);
106 seeker += sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY);
110 rDataE.Size = ConvertEndianness(cRDataE->GetSize());
112 CopyMemory(seeker, &rDataE, sizeof(IMAGE_RESOURCE_DATA_ENTRY));
113 - cRDataE->m_dwWrittenAt = DWORD(seeker);
114 + cRDataE->m_dwWrittenAt = long(seeker);
115 seeker += sizeof(IMAGE_RESOURCE_DATA_ENTRY);
119 while (!qStrings.empty()) {
120 CResourceDirectoryEntry* cRDirE = qStrings.front();
122 - PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(DWORD(seeker) - DWORD(pbRsrcSec));
123 + PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(long(seeker) - long(pbRsrcSec));
125 WCHAR* szName = cRDirE->GetName();
126 WORD iLen = winchar_strlen(szName) + 1;
129 * Set all of the directory entries offsets.
131 - SetOffsets(m_cResDir, DWORD(pbRsrcSec));
132 + SetOffsets(m_cResDir, long(pbRsrcSec));
135 // Sets the offsets in directory entries
137 // Returns -1 if can not be found
138 int CResourceDirectory::Find(WCHAR* szName) {
139 if (IS_INTRESOURCE(szName))
140 - return Find((WORD) (DWORD) szName);
141 + return Find((WORD) (long) szName);
143 if (szName[0] == '#')
144 return Find(WORD(winchar_stoi(szName + 1)));
146 if (IS_INTRESOURCE(szName)) {
149 - m_wId = (WORD) (DWORD) szName;
150 + m_wId = (WORD) (long) szName;
155 if (IS_INTRESOURCE(szName)) {
158 - m_wId = (WORD) (DWORD) szName;
159 + m_wId = (WORD) (long) szName;
163 diff -ur nsis-2.34-src/Source/util.cpp nsis-2.34-src-64bit-fixes/Source/util.cpp
164 --- nsis-2.34-src/Source/util.cpp 2007-12-22 10:41:57.000000000 +0100
165 +++ nsis-2.34-src-64bit-fixes/Source/util.cpp 2008-01-13 19:01:59.000000000 +0100
172 fseek(f, 18, SEEK_SET); // Seek to the width member of the header
173 - fread(&biWidth, sizeof(LONG), 1, f);
174 + fread(&biWidth, sizeof(DWORD), 1, f);
175 FIX_ENDIAN_INT32_INPLACE(biWidth);
176 if (width != biWidth) {
184 fseek(f, 22, SEEK_SET); // Seek to the height member of the header
185 - fread(&biHeight, sizeof(LONG), 1, f);
186 + fread(&biHeight, sizeof(DWORD), 1, f);
187 FIX_ENDIAN_INT32_INPLACE(biHeight);
188 // Bitmap height can be negative too...
189 - if (height != abs(biHeight)) {
190 + if (height != abs((long int)biHeight)) {