1 --- ./Source/Plugins.cpp.lfarkas 2009-01-14 17:03:11.000000000 +0100
2 +++ ./Source/Plugins.cpp 2009-01-14 17:03:58.000000000 +0100
4 DWORD prd = FIX_ENDIAN_INT32(sections[i].PointerToRawData);
5 PIMAGE_EXPORT_DIRECTORY exports = PIMAGE_EXPORT_DIRECTORY(&dlldata[0] + prd + ExportDirVA - va);
6 DWORD na = FIX_ENDIAN_INT32(exports->AddressOfNames);
7 - unsigned long *names = (unsigned long*)((unsigned long) exports + (char *) na - ExportDirVA);
8 + unsigned int *names = (unsigned int*)((unsigned long) exports + (char *) na - ExportDirVA);
9 for (unsigned long j = 0; j < FIX_ENDIAN_INT32(exports->NumberOfNames); j++)
11 const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA);
12 --- ./Source/ResourceEditor.cpp.lfarkas 2009-01-14 17:04:08.000000000 +0100
13 +++ ./Source/ResourceEditor.cpp 2009-01-14 17:07:47.000000000 +0100
15 rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
17 CopyMemory(seeker, &rdDir, sizeof(IMAGE_RESOURCE_DIRECTORY));
18 - crd->m_dwWrittenAt = DWORD(seeker);
19 + crd->m_dwWrittenAt = long(seeker);
20 seeker += sizeof(IMAGE_RESOURCE_DIRECTORY);
22 for (int i = 0; i < crd->CountEntries(); i++) {
24 rDirE.UName.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
26 CopyMemory(seeker, &rDirE, sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY));
27 - crd->GetEntry(i)->m_dwWrittenAt = DWORD(seeker);
28 + crd->GetEntry(i)->m_dwWrittenAt = long(seeker);
29 seeker += sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY);
33 rDataE.Size = ConvertEndianness(cRDataE->GetSize());
35 CopyMemory(seeker, &rDataE, sizeof(IMAGE_RESOURCE_DATA_ENTRY));
36 - cRDataE->m_dwWrittenAt = DWORD(seeker);
37 + cRDataE->m_dwWrittenAt = long(seeker);
38 seeker += sizeof(IMAGE_RESOURCE_DATA_ENTRY);
42 while (!qStrings.empty()) {
43 CResourceDirectoryEntry* cRDirE = qStrings.front();
45 - PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(DWORD(seeker) - DWORD(pbRsrcSec));
46 + PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(long(seeker) - long(pbRsrcSec));
48 WCHAR* szName = cRDirE->GetName();
49 WORD iLen = winchar_strlen(szName) + 1;
52 * Set all of the directory entries offsets.
54 - SetOffsets(m_cResDir, DWORD(pbRsrcSec));
55 + SetOffsets(m_cResDir, long(pbRsrcSec));
58 // Sets the offsets in directory entries
60 // Returns -1 if can not be found
61 int CResourceDirectory::Find(WCHAR* szName) {
62 if (IS_INTRESOURCE(szName))
63 - return Find((WORD) (DWORD) szName);
64 + return Find((WORD) (long) szName);
67 return Find(WORD(winchar_stoi(szName + 1)));
69 if (IS_INTRESOURCE(szName)) {
72 - m_wId = (WORD) (DWORD) szName;
73 + m_wId = (WORD) (long) szName;
78 if (IS_INTRESOURCE(szName)) {
81 - m_wId = (WORD) (DWORD) szName;
82 + m_wId = (WORD) (long) szName;
86 --- ./Source/DialogTemplate.cpp.lfarkas 2009-01-14 16:56:31.000000000 +0100
87 +++ ./Source/DialogTemplate.cpp 2009-01-14 17:01:14.000000000 +0100
89 if (IS_INTRESOURCE(x)) { \
90 *(WORD*)seeker = 0xFFFF; \
91 seeker += sizeof(WORD); \
92 - *(WORD*)seeker = ConvertEndianness(WORD(DWORD(x))); \
93 + *(WORD*)seeker = ConvertEndianness(WORD(long(x))); \
94 seeker += sizeof(WORD); \
101 - assert((DWORD) seeker - (DWORD) pbDlg == dwSize);
102 + assert((long) seeker - (long) pbDlg == dwSize);
106 --- ./Source/mmap.cpp.lfarkas 2009-01-14 17:00:12.000000000 +0100
107 +++ ./Source/mmap.cpp 2009-01-14 17:01:36.000000000 +0100
112 - unsigned int alignment = ((unsigned int)pView) % m_iAllocationGranularity;
113 + unsigned int alignment = ((unsigned long)pView) % m_iAllocationGranularity;
114 pView = (char *)pView - alignment;
117 --- ./Source/util.cpp.lfarkas 2009-01-14 17:07:59.000000000 +0100
118 +++ ./Source/util.cpp 2009-01-14 17:09:25.000000000 +0100
125 fseek(f, 18, SEEK_SET); // Seek to the width member of the header
126 - fread(&biWidth, sizeof(LONG), 1, f);
127 + fread(&biWidth, sizeof(DWORD), 1, f);
128 FIX_ENDIAN_INT32_INPLACE(biWidth);
129 if (width != biWidth) {
137 fseek(f, 22, SEEK_SET); // Seek to the height member of the header
138 - fread(&biHeight, sizeof(LONG), 1, f);
139 + fread(&biHeight, sizeof(DWORD), 1, f);
140 FIX_ENDIAN_INT32_INPLACE(biHeight);
141 // Bitmap height can be negative too...
142 - if (height != abs(biHeight)) {
143 + if (height != abs((long int)biHeight)) {
147 --- ./Source/Platform.h.lfarkas 2009-01-14 17:01:43.000000000 +0100
148 +++ ./Source/Platform.h 2009-01-14 17:03:03.000000000 +0100
150 # define MAKEINTRESOURCE MAKEINTRESOURCEA
152 # ifndef IMAGE_FIRST_SECTION
153 -# define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (DWORD) h + \
154 +# define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (long) h + \
155 FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + \
156 FIX_ENDIAN_INT16(PIMAGE_NT_HEADERS(h)->FileHeader.SizeOfOptionalHeader) ) )
162 -# define ULONG_PTR DWORD
163 +# define ULONG_PTR ULONG
173 } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
176 --- ./SCons/Config/gnu.lfarkas 2009-01-14 16:55:33.000000000 +0100
177 +++ ./SCons/Config/gnu 2009-01-14 16:56:21.000000000 +0100
179 makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings
181 conf = FlagsConfigure(makensis_env)
182 -conf.CheckCompileFlag('-m32') #
183 -conf.CheckLinkFlag('-m32') #
184 conf.CheckLinkFlag('$MAP_FLAG') # generate map file
185 if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
186 TestStrip(conf) # strip