Mercurial > mxe-octave

comparison src/nsis-1-fixes.patch @ 4118:a14a5640d12b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis: update to 2.50 * src/nsis.mk: update version, checksum * src/nsis-1-fixes.patch: updated match from mxe.cc
author John Donoghue
date Thu, 31 Mar 2016 07:50:33 -0400
parents d76aee4b2c2b
children a62c4469e2aa
comparison
equal deleted inserted replaced
4117:1c80153e7e8e 4118:a14a5640d12b
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 From d143dbb2e06d8597dfea89d4b9f55f44ddc6e7f1 Mon Sep 17 00:00:00 2001 6 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
7 From: MXE 7 From: Mark Brand <mabrand@mabrand.nl>
8 Date: Sun, 12 Aug 2012 12:33:26 +0200 8 Date: Sun, 12 Aug 2012 12:33:26 +0200
9 Subject: [PATCH 1/4] explicit mingw cross prefix 9 Subject: [PATCH] explicit mingw cross prefix
10 10
11 This patch has been taken from: 11 This patch has been taken from:
12 http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 12 http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085
13 13
14 diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py 14 diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py
15 index d27e01c..fef9150 100755 15 index 1111111..2222222 100755
16 --- a/SCons/Tools/crossmingw.py 16 --- a/SCons/Tools/crossmingw.py
17 +++ b/SCons/Tools/crossmingw.py 17 +++ b/SCons/Tools/crossmingw.py
18 @@ -61,6 +61,9 @@ prefixes = SCons.Util.Split(""" 18 @@ -61,6 +61,9 @@ prefixes = SCons.Util.Split("""
19 """) 19 """)
20 20
24 + 24 +
25 for prefix in prefixes: 25 for prefix in prefixes:
26 # First search in the SCons path and then the OS path: 26 # First search in the SCons path and then the OS path:
27 if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'): 27 if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
28 diff --git a/SConstruct b/SConstruct 28 diff --git a/SConstruct b/SConstruct
29 index 80872bc..4f113dd 100755 29 index 1111111..2222222 100755
30 --- a/SConstruct 30 --- a/SConstruct
31 +++ b/SConstruct 31 +++ b/SConstruct
32 @@ -59,6 +59,7 @@ doc = [ 32 @@ -59,6 +59,7 @@ doc = [
33 33
34 path = ARGUMENTS.get('PATH', '') 34 path = ARGUMENTS.get('PATH', '')
44 +if mingw_cross_prefix: 44 +if mingw_cross_prefix:
45 + defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix 45 + defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix
46 46
47 Export('defenv') 47 Export('defenv')
48 48
49 -- 49
50 1.8.2.2 50 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
51 51 From: freeman <free.man.uu@gmail.com>
52
53 From 2c32b56851aa15ad8460ed3dd0944ecb78b43ea9 Mon Sep 17 00:00:00 2001
54 From: MXE
55 Date: Sun, 12 Aug 2012 12:36:39 +0200 52 Date: Sun, 12 Aug 2012 12:36:39 +0200
56 Subject: [PATCH 2/4] add missing header 53 Subject: [PATCH] add missing header
57 54
58 55
59 diff --git a/Source/util.h b/Source/util.h 56 diff --git a/Source/util.h b/Source/util.h
60 index 4259a6a..664923e 100755 57 index 1111111..2222222 100755
61 --- a/Source/util.h 58 --- a/Source/util.h
62 +++ b/Source/util.h 59 +++ b/Source/util.h
63 @@ -25,6 +25,7 @@ 60 @@ -25,6 +25,7 @@
64 #ifndef _WIN32 61 #ifndef _WIN32
65 # include <iconv.h> 62 # include <iconv.h>
66 # include <stdio.h> 63 # include <stdio.h>
67 +# include <unistd.h> 64 +# include <unistd.h>
68 #endif 65 #endif
69 66
70 67
71 -- 68
72 1.8.2.2 69 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
73 70 From: Tony Theodore <tonyt@logyst.com>
74
75 From ad29c1f6af0eba959e3bcb96992d1a709ba58aca Mon Sep 17 00:00:00 2001
76 From: MXE
77 Date: Fri, 3 May 2013 17:28:44 +1000 71 Date: Fri, 3 May 2013 17:28:44 +1000
78 Subject: [PATCH 3/4] Enable native 64-bit build 72 Subject: [PATCH] Enable native 64-bit build
79 73
80 Taken from: 74 Taken from:
81 http://anonscm.debian.org/gitweb/?p=collab-maint/nsis.git;a=blob;f=debian/patches/makensis_native_64bit.patch;h=2256a0e193db894dd99507ac0de66f8ae060b46b;hb=HEAD 75 http://anonscm.debian.org/gitweb/?p=collab-maint/nsis.git;a=blob;f=debian/patches/makensis_native_64bit.patch;h=2256a0e193db894dd99507ac0de66f8ae060b46b;hb=HEAD
82 76
83 diff --git a/SCons/Config/gnu b/SCons/Config/gnu 77 diff --git a/SCons/Config/gnu b/SCons/Config/gnu
84 index a1f917f..adfcbd1 100755 78 index 1111111..2222222 100755
85 --- a/SCons/Config/gnu 79 --- a/SCons/Config/gnu
86 +++ b/SCons/Config/gnu 80 +++ b/SCons/Config/gnu
87 @@ -95,8 +95,6 @@ makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor 81 @@ -95,8 +95,6 @@ makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor
88 makensis_env.Append(CXXFLAGS = ['-Wall']) # all warnings 82 makensis_env.Append(CXXFLAGS = ['-Wall']) # all warnings
89 83
110 -conf.CheckLinkFlag('-m32') 104 -conf.CheckLinkFlag('-m32')
111 conf.Finish() 105 conf.Finish()
112 106
113 ### weird GCC requirements 107 ### weird GCC requirements
114 diff --git a/Source/DialogTemplate.cpp b/Source/DialogTemplate.cpp 108 diff --git a/Source/DialogTemplate.cpp b/Source/DialogTemplate.cpp
115 index 109a1d7..f821a05 100755 109 index 1111111..2222222 100755
116 --- a/Source/DialogTemplate.cpp 110 --- a/Source/DialogTemplate.cpp
117 +++ b/Source/DialogTemplate.cpp 111 +++ b/Source/DialogTemplate.cpp
118 @@ -74,7 +74,7 @@ void ReadVarLenArr(LPBYTE &seeker, WCHAR* &readInto, unsigned int uCodePage) { 112 @@ -74,7 +74,7 @@ void ReadVarLenArr(LPBYTE &seeker, WCHAR* &readInto, unsigned int uCodePage) {
119 if (IS_INTRESOURCE(x)) { \ 113 if (IS_INTRESOURCE(x)) { \
120 *(WORD*)seeker = 0xFFFF; \ 114 *(WORD*)seeker = 0xFFFF; \
166 + assert((DWORD)(seeker - pbDlg) == dwSize); 160 + assert((DWORD)(seeker - pbDlg) == dwSize);
167 161
168 // DONE! 162 // DONE!
169 return pbDlg; 163 return pbDlg;
170 diff --git a/Source/Platform.h b/Source/Platform.h 164 diff --git a/Source/Platform.h b/Source/Platform.h
171 index 52eb9bc..3cdfe32 100755 165 index 1111111..2222222 100755
172 --- a/Source/Platform.h 166 --- a/Source/Platform.h
173 +++ b/Source/Platform.h 167 +++ b/Source/Platform.h
174 @@ -53,6 +53,7 @@ typedef unsigned char UCHAR; 168 @@ -53,6 +53,7 @@ typedef unsigned char UCHAR;
175 typedef const char *LPCCH, *PCSTR, *LPCSTR; 169 typedef const char *LPCCH, *PCSTR, *LPCSTR;
176 typedef unsigned short WCHAR, OLECHAR, *PWCHAR, *LPWCH, *PWCH, *NWPSTR, *LPWSTR, *PWSTR, *BSTR; 170 typedef unsigned short WCHAR, OLECHAR, *PWCHAR, *LPWCH, *PWCH, *NWPSTR, *LPWSTR, *PWSTR, *BSTR;
229 +# define INVALID_FILE_ATTRIBUTES ((DWORD) -1) 223 +# define INVALID_FILE_ATTRIBUTES ((DWORD) -1)
230 #endif 224 #endif
231 225
232 // shell folders 226 // shell folders
233 diff --git a/Source/Plugins.cpp b/Source/Plugins.cpp 227 diff --git a/Source/Plugins.cpp b/Source/Plugins.cpp
234 index 6872b28..90ad393 100755 228 index 1111111..2222222 100755
235 --- a/Source/Plugins.cpp 229 --- a/Source/Plugins.cpp
236 +++ b/Source/Plugins.cpp 230 +++ b/Source/Plugins.cpp
237 @@ -29,7 +29,7 @@ 231 @@ -29,7 +29,7 @@
238 #include "dirreader.h" 232 #include "dirreader.h"
239 233
253 + for (DWORD j = 0; j < FIX_ENDIAN_INT32(exports->NumberOfNames); j++) 247 + for (DWORD j = 0; j < FIX_ENDIAN_INT32(exports->NumberOfNames); j++)
254 { 248 {
255 const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA); 249 const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA);
256 const string signature = dllName + "::" + name; 250 const string signature = dllName + "::" + name;
257 diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp 251 diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp
258 index 8509414..b819f4e 100755 252 index 1111111..2222222 100755
259 --- a/Source/ResourceEditor.cpp 253 --- a/Source/ResourceEditor.cpp
260 +++ b/Source/ResourceEditor.cpp 254 +++ b/Source/ResourceEditor.cpp
261 @@ -27,20 +27,10 @@ using namespace std; 255 @@ -27,20 +27,10 @@ using namespace std;
262 #define ALIGN(dwToAlign, dwAlignOn) dwToAlign = (dwToAlign%dwAlignOn == 0) ? dwToAlign : dwToAlign - (dwToAlign%dwAlignOn) + dwAlignOn 256 #define ALIGN(dwToAlign, dwAlignOn) dwToAlign = (dwToAlign%dwAlignOn == 0) ? dwToAlign : dwToAlign - (dwToAlign%dwAlignOn) + dwAlignOn
263 #define RALIGN(dwToAlign, dwAlignOn) ((dwToAlign%dwAlignOn == 0) ? dwToAlign : dwToAlign - (dwToAlign%dwAlignOn) + dwAlignOn) 257 #define RALIGN(dwToAlign, dwAlignOn) ((dwToAlign%dwAlignOn == 0) ? dwToAlign : dwToAlign - (dwToAlign%dwAlignOn) + dwAlignOn)
386 + m_wId = (WORD) (ULONG_PTR) szName; 380 + m_wId = (WORD) (ULONG_PTR) szName;
387 } 381 }
388 else { 382 else {
389 m_bHasName = true; 383 m_bHasName = true;
390 diff --git a/Source/ResourceEditor.h b/Source/ResourceEditor.h 384 diff --git a/Source/ResourceEditor.h b/Source/ResourceEditor.h
391 index 59def2e..d25be31 100755 385 index 1111111..2222222 100755
392 --- a/Source/ResourceEditor.h 386 --- a/Source/ResourceEditor.h
393 +++ b/Source/ResourceEditor.h 387 +++ b/Source/ResourceEditor.h
394 @@ -27,7 +27,7 @@ 388 @@ -27,7 +27,7 @@
395 389
396 #include "Platform.h" 390 #include "Platform.h"
435 + ULONG_PTR m_ulWrittenAt; 429 + ULONG_PTR m_ulWrittenAt;
436 430
437 private: 431 private:
438 BYTE* m_pbData; 432 BYTE* m_pbData;
439 diff --git a/Source/ResourceVersionInfo.cpp b/Source/ResourceVersionInfo.cpp 433 diff --git a/Source/ResourceVersionInfo.cpp b/Source/ResourceVersionInfo.cpp
440 index 71df19e..7ed0ccf 100755 434 index 1111111..2222222 100755
441 --- a/Source/ResourceVersionInfo.cpp 435 --- a/Source/ResourceVersionInfo.cpp
442 +++ b/Source/ResourceVersionInfo.cpp 436 +++ b/Source/ResourceVersionInfo.cpp
443 @@ -146,7 +146,7 @@ int GetVersionHeader (LPSTR &p, WORD &wLength, WORD &wValueLength, WORD &wType) 437 @@ -146,7 +146,7 @@ int GetVersionHeader (LPSTR &p, WORD &wLength, WORD &wValueLength, WORD &wType)
444 p += sizeof(WORD); 438 p += sizeof(WORD);
445 szKey = (WCHAR*)p; 439 szKey = (WCHAR*)p;
448 + while ( ((ULONG_PTR)p % 4) != 0 ) 442 + while ( ((ULONG_PTR)p % 4) != 0 )
449 p++; 443 p++;
450 return p - baseP; 444 return p - baseP;
451 } 445 }
452 diff --git a/Source/fileform.cpp b/Source/fileform.cpp 446 diff --git a/Source/fileform.cpp b/Source/fileform.cpp
453 index 72296ba..e879ad5 100755 447 index 1111111..2222222 100755
454 --- a/Source/fileform.cpp 448 --- a/Source/fileform.cpp
455 +++ b/Source/fileform.cpp 449 +++ b/Source/fileform.cpp
456 @@ -149,7 +149,7 @@ void ctlcolors_writer::write(const ctlcolors *data) 450 @@ -149,7 +149,7 @@ void ctlcolors_writer::write(const ctlcolors *data)
457 m_sink->write_int(data->text); 451 m_sink->write_int(data->text);
458 m_sink->write_int(data->bkc); 452 m_sink->write_int(data->bkc);
461 + m_sink->write_int((INT_PTR) data->bkb); 455 + m_sink->write_int((INT_PTR) data->bkb);
462 m_sink->write_int(data->bkmode); 456 m_sink->write_int(data->bkmode);
463 m_sink->write_int(data->flags); 457 m_sink->write_int(data->flags);
464 } 458 }
465 diff --git a/Source/mmap.cpp b/Source/mmap.cpp 459 diff --git a/Source/mmap.cpp b/Source/mmap.cpp
466 index 1e0be7a..562a7ed 100755 460 index 1111111..2222222 100755
467 --- a/Source/mmap.cpp 461 --- a/Source/mmap.cpp
468 +++ b/Source/mmap.cpp 462 +++ b/Source/mmap.cpp
469 @@ -322,7 +322,7 @@ void MMapFile::release(void *pView, int size) 463 @@ -322,7 +322,7 @@ void MMapFile::release(void *pView, int size)
470 if (!pView) 464 if (!pView)
471 return; 465 return;
474 + unsigned int alignment = ((ULONG_PTR)pView) % m_iAllocationGranularity; 468 + unsigned int alignment = ((ULONG_PTR)pView) % m_iAllocationGranularity;
475 pView = (char *)pView - alignment; 469 pView = (char *)pView - alignment;
476 size += alignment; 470 size += alignment;
477 #ifdef _WIN32 471 #ifdef _WIN32
478 diff --git a/Source/script.cpp b/Source/script.cpp 472 diff --git a/Source/script.cpp b/Source/script.cpp
479 index a492051..2951d98 100755 473 index 1111111..2222222 100755
480 --- a/Source/script.cpp 474 --- a/Source/script.cpp
481 +++ b/Source/script.cpp 475 +++ b/Source/script.cpp
482 @@ -2129,7 +2129,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) 476 @@ -2129,7 +2129,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
483 int k=line.gettoken_enum(1,rootkeys[0]); 477 int k=line.gettoken_enum(1,rootkeys[0]);
484 if (k == -1) k=line.gettoken_enum(1,rootkeys[1]); 478 if (k == -1) k=line.gettoken_enum(1,rootkeys[1]);
523 + ent.offsets[1]=(INT_PTR)rootkey_tab[k]; 517 + ent.offsets[1]=(INT_PTR)rootkey_tab[k];
524 ent.offsets[2]=add_string(line.gettoken_str(3)); 518 ent.offsets[2]=add_string(line.gettoken_str(3));
525 ent.offsets[3]=add_string(line.gettoken_str(4)); 519 ent.offsets[3]=add_string(line.gettoken_str(4));
526 ent.offsets[4]=which_token == TOK_ENUMREGKEY; 520 ent.offsets[4]=which_token == TOK_ENUMREGKEY;
527 diff --git a/Source/util.cpp b/Source/util.cpp 521 diff --git a/Source/util.cpp b/Source/util.cpp
528 index 2c0b07f..18c31a2 100755 522 index 1111111..2222222 100755
529 --- a/Source/util.cpp 523 --- a/Source/util.cpp
530 +++ b/Source/util.cpp 524 +++ b/Source/util.cpp
531 @@ -77,9 +77,9 @@ int update_bitmap(CResourceEditor* re, WORD id, const char* filename, int width/ 525 @@ -77,9 +77,9 @@ int update_bitmap(CResourceEditor* re, WORD id, const char* filename, int width/
532 } 526 }
533 527
581 - if ( GetLastError() == ERROR_INSUFFICIENT_BUFFER ) 575 - if ( GetLastError() == ERROR_INSUFFICIENT_BUFFER )
582 + if ( dwError == ERROR_INSUFFICIENT_BUFFER ) 576 + if ( dwError == ERROR_INSUFFICIENT_BUFFER )
583 { 577 {
584 SetLastError( 0 ); 578 SetLastError( 0 );
585 return dwResult; 579 return dwResult;
586 -- 580
587 1.8.2.2 581 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
588 582 From: Tony Theodore <tonyt@logyst.com>
589
590 From 055b07791400ae22bde948f60d71e3311e25f452 Mon Sep 17 00:00:00 2001
591 From: MXE
592 Date: Thu, 9 May 2013 13:08:59 +1000 583 Date: Thu, 9 May 2013 13:08:59 +1000
593 Subject: [PATCH 4/4] i686-w64-mingw32 fixes 584 Subject: [PATCH] i686-w64-mingw32 fixes
594 585
595 586
596 diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp 587 diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
597 index d8303b0..fefc8f8 100755 588 index 1111111..2222222 100755
598 --- a/Contrib/InstallOptions/InstallerOptions.cpp 589 --- a/Contrib/InstallOptions/InstallerOptions.cpp
599 +++ b/Contrib/InstallOptions/InstallerOptions.cpp 590 +++ b/Contrib/InstallOptions/InstallerOptions.cpp
600 @@ -13,6 +13,7 @@ 591 @@ -13,6 +13,7 @@
601 #include <cderr.h> 592 #include <cderr.h>
602 #include "resource.h" 593 #include "resource.h"
603 #include "shellapi.h" 594 #include "shellapi.h"
604 +#include <algorithm> 595 +#include <algorithm>
605 596
606 #include <nsis/pluginapi.h> // nsis plugin 597 #include <nsis/pluginapi.h> // nsis plugin
607 598
608 @@ -149,7 +150,7 @@ struct FieldType {
609 int nField; // field number in INI file
610 char *pszHwndEntry; // "HWND" or "HWND2"
611
612 - long wndProc;
613 + long wndProc;
614 };
615
616 // initial buffer size. buffers will grow as required.
617 @@ -759,7 +760,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) 599 @@ -759,7 +760,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
618 DrawText(lpdis->hDC, pField->pszText, -1, &rc, DT_VCENTER | DT_WORDBREAK | DT_CALCRECT); 600 DrawText(lpdis->hDC, pField->pszText, -1, &rc, DT_VCENTER | DT_WORDBREAK | DT_CALCRECT);
619 601
620 // Make some more room so the focus rect won't cut letters off 602 // Make some more room so the focus rect won't cut letters off
621 - rc.right = min(rc.right + 2, lpdis->rcItem.right); 603 - rc.right = min(rc.right + 2, lpdis->rcItem.right);
622 + rc.right = std::min(rc.right + 2, lpdis->rcItem.right); 604 + rc.right = std::min(rc.right + 2, lpdis->rcItem.right);
623 605
624 // Move rect to right if in RTL mode 606 // Move rect to right if in RTL mode
625 if (bRTL) 607 if (bRTL)
626 @@ -877,7 +878,7 @@ int WINAPI NumbersOnlyPasteWndProc(HWND hWin, UINT uMsg, WPARAM wParam, LPARAM l
627 if (OpenClipboard(hWin))
628 {
629 HGLOBAL hData = GetClipboardData(CF_TEXT);
630 -
631 +
632 if (hData)
633 {
634 char *lpData = (char *) GlobalLock(hData);
635 @@ -1346,7 +1347,7 @@ int WINAPI createCfgDlg()
636
637 int keycolor = *bmp & 0xFFFFFF;
638
639 - // Search for transparent pixels
640 + // Search for transparent pixels
641 for (y = bm.bmHeight - 1; y >= 0; y--) {
642 for (x = 0; x < bm.bmWidth;) {
643 if ((*bmp & 0xFFFFFF) == keycolor) {
644 diff --git a/Contrib/Makensisw/afxres.h b/Contrib/Makensisw/afxres.h 608 diff --git a/Contrib/Makensisw/afxres.h b/Contrib/Makensisw/afxres.h
645 index d4c5e1f..16b729d 100755 609 index 1111111..2222222 100755
646 --- a/Contrib/Makensisw/afxres.h 610 --- a/Contrib/Makensisw/afxres.h
647 +++ b/Contrib/Makensisw/afxres.h 611 +++ b/Contrib/Makensisw/afxres.h
648 @@ -1,4 +1,4 @@ 612 @@ -1,4 +1,4 @@
649 -#define _WIN32_IE 0x0400 613 -#define _WIN32_IE 0x0400
650 +#define _WIN32_IE 0x0501 614 +#define _WIN32_IE 0x0501
651 #include <windows.h> 615 #include <windows.h>
652 616
653 #ifndef IDC_STATIC 617 #ifndef IDC_STATIC
654 diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h 618 diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
655 index beadc3f..1479b2f 100755 619 index 1111111..2222222 100755
656 --- a/Contrib/Makensisw/makensisw.h 620 --- a/Contrib/Makensisw/makensisw.h
657 +++ b/Contrib/Makensisw/makensisw.h 621 +++ b/Contrib/Makensisw/makensisw.h
658 @@ -22,7 +22,7 @@ 622 @@ -22,7 +22,7 @@
659 #ifndef MAKENSIS_H 623 #ifndef MAKENSIS_H
660 #define MAKENSIS_H 624 #define MAKENSIS_H
663 +#define _WIN32_IE 0x0501 627 +#define _WIN32_IE 0x0501
664 #include <windows.h> 628 #include <windows.h>
665 #include <commctrl.h> 629 #include <commctrl.h>
666 #include "utils.h" 630 #include "utils.h"
667 diff --git a/Source/SConscript b/Source/SConscript 631 diff --git a/Source/SConscript b/Source/SConscript
668 index 505e438..f9aee9d 100755 632 index 1111111..2222222 100755
669 --- a/Source/SConscript 633 --- a/Source/SConscript
670 +++ b/Source/SConscript 634 +++ b/Source/SConscript
671 @@ -71,7 +71,7 @@ AddAvailableLibs(env, libs) 635 @@ -71,7 +71,7 @@ AddAvailableLibs(env, libs)
672 636
673 ##### Defines 637 ##### Defines
676 +env.Append(CPPDEFINES = ['_WIN32_IE=0x0501']) 640 +env.Append(CPPDEFINES = ['_WIN32_IE=0x0501'])
677 641
678 ##### Set PCH 642 ##### Set PCH
679 643
680 diff --git a/Source/exehead/SConscript b/Source/exehead/SConscript 644 diff --git a/Source/exehead/SConscript b/Source/exehead/SConscript
681 index bebdd54..2f4e490 100755 645 index 1111111..2222222 100755
682 --- a/Source/exehead/SConscript 646 --- a/Source/exehead/SConscript
683 +++ b/Source/exehead/SConscript 647 +++ b/Source/exehead/SConscript
684 @@ -53,7 +53,7 @@ Import('env compression solid_compression') 648 @@ -53,7 +53,7 @@ Import('env compression solid_compression')
685 649
686 env.Append(CPPDEFINES = ['EXEHEAD']) 650 env.Append(CPPDEFINES = ['EXEHEAD'])
688 -env.Append(CPPDEFINES = ['_WIN32_IE=0x0500']) 652 -env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
689 +env.Append(CPPDEFINES = ['_WIN32_IE=0x0501']) 653 +env.Append(CPPDEFINES = ['_WIN32_IE=0x0501'])
690 654
691 ### Some other settings 655 ### Some other settings
692 656
693 diff --git a/Source/util.cpp b/Source/util.cpp
694 index 18c31a2..fc9443f 100755
695 --- a/Source/util.cpp
696 +++ b/Source/util.cpp
697 @@ -1,15 +1,15 @@
698 /*
699 * util.cpp
700 - *
701 + *
702 * This file is a part of NSIS.
703 - *
704 + *
705 * Copyright (C) 1999-2009 Nullsoft and Contributors
706 - *
707 + *
708 * Licensed under the zlib/libpng license (the "License");
709 * you may not use this file except in compliance with the License.
710 - *
711 + *
712 * Licence details can be found in the file COPYING.
713 - *
714 + *
715 * This software is provided 'as-is', without any express or implied
716 * warranty.
717 */
718 @@ -616,7 +616,7 @@ typedef struct _VXD_VERSION_RESOURCE {
719 } VXD_VERSION_RESOURCE, *PVXD_VERSION_RESOURCE;
720 #pragma pack( pop, pre_vxd_ver )
721
722 -static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
723 +static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
724 {
725
726 HANDLE hFile = NULL;
727 @@ -673,7 +673,7 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
728 pDosExeHdr = (PIMAGE_DOS_HEADER) pView;
729
730 // Check to make sure the file has a DOS EXE header.
731 - if ( pDosExeHdr->e_magic != IMAGE_DOS_SIGNATURE )
732 + if ( pDosExeHdr->e_magic != IMAGE_DOS_SIGNATURE )
733 {
734 if ( pView )
735 UnmapViewOfFile( pView );
736 @@ -693,7 +693,7 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
737 + pDosExeHdr->e_lfanew );
738
739 // Check to make sure the file is a VxD.
740 - if ( (DWORD) pNtExeHdr->Signature != IMAGE_VXD_SIGNATURE )
741 + if ( (DWORD) pNtExeHdr->Signature != IMAGE_VXD_SIGNATURE )
742 {
743 if ( pView )
744 UnmapViewOfFile( pView );
745 @@ -769,18 +769,18 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData )
746 return TRUE;
747 }
748
749 -static DWORD GetVxdVersionInfoSize( LPCSTR szFile )
750 +static DWORD GetVxdVersionInfoSize( LPCSTR szFile )
751 {
752 DWORD dwResult = 0;
753
754 // Call GetVxdVersion() with NULL for the pointer to the buffer.
755 - if ( !GetVxdVersion( szFile, &dwResult, NULL ) )
756 + if ( !GetVxdVersion( szFile, &dwResult, NULL ) )
757 {
758 DWORD dwError = GetLastError();
759
760 // GetVxdVersion() will fail with ERROR_INSUFFICIENT_BUFFER and
761 // the required buffer size will be returned in dwResult.
762 - if ( dwError == ERROR_INSUFFICIENT_BUFFER )
763 + if ( dwError == ERROR_INSUFFICIENT_BUFFER )
764 {
765 SetLastError( 0 );
766 return dwResult;
767 @@ -791,7 +791,7 @@ static DWORD GetVxdVersionInfoSize( LPCSTR szFile )
768 return 0;
769 }
770
771 -static BOOL GetVxdVersionInfo( LPCSTR szFile, DWORD dwLen, LPVOID lpData )
772 +static BOOL GetVxdVersionInfo( LPCSTR szFile, DWORD dwLen, LPVOID lpData )
773 {
774 return GetVxdVersion( szFile, &dwLen, lpData );
775 }
776 --
777 1.8.2.2
778