nsis/nsis-2.39-debian-64bit-fixes.patch

   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
   4 @@ -85,8 +85,6 @@
   5  makensis_env.Append(CXXFLAGS = '-Wno-non-virtual-dtor') # ignore virtual dtor warnings
   6
   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
  16 @@ -74,7 +74,7 @@
  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); \
  23      } \
  24      else { \
  25 @@ -622,7 +622,7 @@
  26      }
  27    }
  28
  29 -  assert((DWORD) seeker - (DWORD) pbDlg == dwSize);
  30 +  assert((long) seeker - (long) pbDlg == dwSize);
  31
  32    // DONE!
  33    return pbDlg;
  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
  37 @@ -324,7 +324,7 @@
  38    if (!pView)
  39      return;
  40
  41 -  unsigned int alignment = ((unsigned int)pView) % m_iAllocationGranularity;
  42 +  unsigned int alignment = ((unsigned long)pView) % m_iAllocationGranularity;
  43    pView = (char *)pView - alignment;
  44    size += alignment;
  45  #ifdef _WIN32
  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
  49 @@ -185,7 +185,7 @@
  50  #    define MAKEINTRESOURCE MAKEINTRESOURCEA
  51  #  endif
  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) ) )
  57  #  endif
  58 @@ -217,7 +217,7 @@
  59  #endif
  60
  61  #ifndef ULONG_PTR
  62 -#  define ULONG_PTR DWORD
  63 +#  define ULONG_PTR ULONG
  64  #endif
  65
  66  #ifndef IDC_HAND
  67 @@ -722,7 +722,7 @@
  68    WORD e_oemid;
  69    WORD e_oeminfo;
  70    WORD e_res2[10];
  71 -  LONG e_lfanew;
  72 +  DWORD e_lfanew;
  73  } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
  74  #  pragma pack()
  75  #  pragma pack(4)
  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
  79 @@ -136,7 +136,7 @@
  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++)
  86          {
  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
  91 @@ -665,7 +665,7 @@
  92      rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
  93
  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);
  98
  99      for (int i = 0; i < crd->CountEntries(); i++) {
 100 @@ -686,7 +686,7 @@
 101        rDirE.UName.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
 102
 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);
 107      }
 108      qDirs.pop();
 109 @@ -702,7 +702,7 @@
 110      rDataE.Size = ConvertEndianness(cRDataE->GetSize());
 111
 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);
 116
 117      qDataEntries.pop();
 118 @@ -714,7 +714,7 @@
 119    while (!qStrings.empty()) {
 120      CResourceDirectoryEntry* cRDirE = qStrings.front();
 121
 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));
 124
 125      WCHAR* szName = cRDirE->GetName();
 126      WORD iLen = winchar_strlen(szName) + 1;
 127 @@ -745,7 +745,7 @@
 128    /*
 129     * Set all of the directory entries offsets.
 130     */
 131 -  SetOffsets(m_cResDir, DWORD(pbRsrcSec));
 132 +  SetOffsets(m_cResDir, long(pbRsrcSec));
 133  }
 134
 135  // Sets the offsets in directory entries
 136 @@ -868,7 +868,7 @@
 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);
 142    else
 143      if (szName[0] == '#')
 144        return Find(WORD(winchar_stoi(szName + 1)));
 145 @@ -946,7 +946,7 @@
 146    if (IS_INTRESOURCE(szName)) {
 147      m_bHasName = false;
 148      m_szName = 0;
 149 -    m_wId = (WORD) (DWORD) szName;
 150 +    m_wId = (WORD) (long) szName;
 151    }
 152    else {
 153      m_bHasName = true;
 154 @@ -960,7 +960,7 @@
 155    if (IS_INTRESOURCE(szName)) {
 156      m_bHasName = false;
 157      m_szName = 0;
 158 -    m_wId = (WORD) (DWORD) szName;
 159 +    m_wId = (WORD) (long) szName;
 160    }
 161    else {
 162      m_bHasName = true;
 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
 166 @@ -75,9 +75,9 @@
 167    }
 168
 169    if (width != 0) {
 170 -    LONG biWidth;
 171 +    DWORD biWidth;
 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) {
 177        fclose(f);
 178 @@ -86,12 +86,12 @@
 179    }
 180
 181    if (height != 0) {
 182 -    LONG biHeight;
 183 +    DWORD biHeight;
 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)) {
 191        fclose(f);
 192        return -3;
 193      }