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

   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
   4 @@ -74,7 +74,7 @@
   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); \
  11      } \
  12      else { \
  13 @@ -622,7 +622,7 @@
  14      }
  15    }
  16
  17 -  assert((DWORD) seeker - (DWORD) pbDlg == dwSize);
  18 +  assert((long) seeker - (long) pbDlg == dwSize);
  19
  20    // DONE!
  21    return pbDlg;
  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
  25 @@ -185,7 +185,7 @@
  26  #    define MAKEINTRESOURCE MAKEINTRESOURCEA
  27  #  endif
  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) ) )
  33  #  endif
  34 @@ -197,7 +197,7 @@
  35  #  endif
  36  #endif
  37  #ifndef IS_INTRESOURCE
  38 -#  define IS_INTRESOURCE(_r) (((ULONG_PTR)(_r) >> 16) == 0)
  39 +#  define IS_INTRESOURCE(_r) (((unsigned long)(_r) >> 16) == 0)
  40  #endif
  41
  42  // functions
  43 @@ -722,7 +722,7 @@
  44    WORD e_oemid;
  45    WORD e_oeminfo;
  46    WORD e_res2[10];
  47 -  LONG e_lfanew;
  48 +  DWORD e_lfanew;
  49  } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
  50  #  pragma pack()
  51  #  pragma pack(4)
  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
  55 @@ -136,7 +136,7 @@
  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++)
  62          {
  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
  67 @@ -665,7 +665,7 @@
  68      rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
  69
  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);
  74
  75      for (int i = 0; i < crd->CountEntries(); i++) {
  76 @@ -686,7 +686,7 @@
  77        rDirE.UName.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
  78
  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);
  83      }
  84      qDirs.pop();
  85 @@ -702,7 +702,7 @@
  86      rDataE.Size = ConvertEndianness(cRDataE->GetSize());
  87
  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);
  92
  93      qDataEntries.pop();
  94 @@ -714,7 +714,7 @@
  95    while (!qStrings.empty()) {
  96      CResourceDirectoryEntry* cRDirE = qStrings.front();
  97
  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));
 100
 101      WCHAR* szName = cRDirE->GetName();
 102      WORD iLen = winchar_strlen(szName) + 1;
 103 @@ -745,7 +745,7 @@
 104    /*
 105     * Set all of the directory entries offsets.
 106     */
 107 -  SetOffsets(m_cResDir, DWORD(pbRsrcSec));
 108 +  SetOffsets(m_cResDir, long(pbRsrcSec));
 109  }
 110
 111  // Sets the offsets in directory entries
 112 @@ -868,7 +868,7 @@
 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);
 118    else
 119      if (szName[0] == '#')
 120        return Find(WORD(winchar_stoi(szName + 1)));
 121 @@ -946,7 +946,7 @@
 122    if (IS_INTRESOURCE(szName)) {
 123      m_bHasName = false;
 124      m_szName = 0;
 125 -    m_wId = (WORD) (DWORD) szName;
 126 +    m_wId = (WORD) (long) szName;
 127    }
 128    else {
 129      m_bHasName = true;
 130 @@ -960,7 +960,7 @@
 131    if (IS_INTRESOURCE(szName)) {
 132      m_bHasName = false;
 133      m_szName = 0;
 134 -    m_wId = (WORD) (DWORD) szName;
 135 +    m_wId = (WORD) (long) szName;
 136    }
 137    else {
 138      m_bHasName = true;
 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
 142 @@ -75,9 +75,9 @@
 143    }
 144
 145    if (width != 0) {
 146 -    LONG biWidth;
 147 +    DWORD biWidth;
 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) {
 153        fclose(f);
 154 @@ -86,12 +86,12 @@
 155    }
 156
 157    if (height != 0) {
 158 -    LONG biHeight;
 159 +    DWORD biHeight;
 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)) {
 167        fclose(f);
 168        return -3;
 169      }