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

   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
   3 @@ -136,7 +136,7 @@
   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++)
  10          {
  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
  14 @@ -665,7 +665,7 @@
  15      rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
  16
  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);
  21
  22      for (int i = 0; i < crd->CountEntries(); i++) {
  23 @@ -686,7 +686,7 @@
  24        rDirE.UName.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
  25
  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);
  30      }
  31      qDirs.pop();
  32 @@ -702,7 +702,7 @@
  33      rDataE.Size = ConvertEndianness(cRDataE->GetSize());
  34
  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);
  39
  40      qDataEntries.pop();
  41 @@ -714,7 +714,7 @@
  42    while (!qStrings.empty()) {
  43      CResourceDirectoryEntry* cRDirE = qStrings.front();
  44
  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));
  47
  48      WCHAR* szName = cRDirE->GetName();
  49      WORD iLen = winchar_strlen(szName) + 1;
  50 @@ -745,7 +745,7 @@
  51    /*
  52     * Set all of the directory entries offsets.
  53     */
  54 -  SetOffsets(m_cResDir, DWORD(pbRsrcSec));
  55 +  SetOffsets(m_cResDir, long(pbRsrcSec));
  56  }
  57
  58  // Sets the offsets in directory entries
  59 @@ -868,7 +868,7 @@
  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);
  65    else
  66      if (szName[0] == '#')
  67        return Find(WORD(winchar_stoi(szName + 1)));
  68 @@ -946,7 +946,7 @@
  69    if (IS_INTRESOURCE(szName)) {
  70      m_bHasName = false;
  71      m_szName = 0;
  72 -    m_wId = (WORD) (DWORD) szName;
  73 +    m_wId = (WORD) (long) szName;
  74    }
  75    else {
  76      m_bHasName = true;
  77 @@ -960,7 +960,7 @@
  78    if (IS_INTRESOURCE(szName)) {
  79      m_bHasName = false;
  80      m_szName = 0;
  81 -    m_wId = (WORD) (DWORD) szName;
  82 +    m_wId = (WORD) (long) szName;
  83    }
  84    else {
  85      m_bHasName = true;
  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
  88 @@ -74,7 +74,7 @@
  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); \
  95      } \
  96      else { \
  97 @@ -622,7 +622,7 @@
  98      }
  99    }
 100
 101 -  assert((DWORD) seeker - (DWORD) pbDlg == dwSize);
 102 +  assert((long) seeker - (long) pbDlg == dwSize);
 103
 104    // DONE!
 105    return pbDlg;
 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
 108 @@ -322,7 +322,7 @@
 109    if (!pView)
 110      return;
 111
 112 -  unsigned int alignment = ((unsigned int)pView) % m_iAllocationGranularity;
 113 +  unsigned int alignment = ((unsigned long)pView) % m_iAllocationGranularity;
 114    pView = (char *)pView - alignment;
 115    size += alignment;
 116  #ifdef _WIN32
 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
 119 @@ -75,9 +75,9 @@
 120    }
 121
 122    if (width != 0) {
 123 -    LONG biWidth;
 124 +    DWORD biWidth;
 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) {
 130        fclose(f);
 131 @@ -86,12 +86,12 @@
 132    }
 133
 134    if (height != 0) {
 135 -    LONG biHeight;
 136 +    DWORD biHeight;
 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)) {
 144        fclose(f);
 145        return -3;
 146      }
 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
 149 @@ -165,7 +165,7 @@
 150  #    define MAKEINTRESOURCE MAKEINTRESOURCEA
 151  #  endif
 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) ) )
 157  #  endif
 158 @@ -197,7 +197,7 @@
 159  #endif
 160
 161  #ifndef ULONG_PTR
 162 -#  define ULONG_PTR DWORD
 163 +#  define ULONG_PTR ULONG
 164  #endif
 165
 166  #ifndef IDC_HAND
 167 @@ -702,7 +702,7 @@
 168    WORD e_oemid;
 169    WORD e_oeminfo;
 170    WORD e_res2[10];
 171 -  LONG e_lfanew;
 172 +  DWORD e_lfanew;
 173  } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
 174  #  pragma pack()
 175  #  pragma pack(4)
 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
 178 @@ -90,8 +90,6 @@
 179  makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings
 180
 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