dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Basic Win64 support (MSVC)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6439 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-02-08 00:13:52 +00:00
parent 204f371097
commit d799ee53d7
52 changed files with 380 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/exehead/fileform.h
View file

@ -473,13 +473,31 @@ typedef struct {
COLORREF text;
COLORREF bkc;
UINT lbStyle;
#ifndef MAKENSIS
HBRUSH bkb;
#ifdef _WIN64
#error Should we swap lbStyle and bkb to get better alignment? If we are going to do it, now is our only chance before plugins in the wild start depending on the ctlcolors layout on x64
#else
INT32 bkb;
#endif
int bkmode;
int flags;
} ctlcolors;
} ctlcolors32;
typedef struct {
COLORREF text;
COLORREF bkc;
#ifndef MAKENSIS
HBRUSH bkb; // NOTE: Placed above lbStyle for better alignment
#else
INT64 bkb;
#endif
UINT lbStyle;
int bkmode;
int flags;
} ctlcolors64;
#if defined(_WIN64) && !defined(MAKENSIS)
# define ctlcolors ctlcolors64
#else
# define ctlcolors ctlcolors32
#endif
#pragma pack(pop)
// constants for myDelete (util.c)