more of patch #1643633
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4882 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
1750a886af
commit
33800e2160
1 changed files with 26 additions and 1 deletions
|
@ -64,6 +64,24 @@ typedef unsigned long HBRUSH;
|
|||
# define TRUE 1
|
||||
// more
|
||||
typedef WORD LANGID;
|
||||
// ULONGLONG
|
||||
#ifdef __GNUC__
|
||||
#define _HAVE_INT64
|
||||
#define _INTEGRAL_MAX_BITS 64
|
||||
#undef __int64
|
||||
#define __int64 long long
|
||||
#elif defined(__WATCOMC__) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 )
|
||||
#define _HAVE_INT64
|
||||
#endif /* __GNUC__/__WATCOMC */
|
||||
#if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64)
|
||||
typedef __int64 LONGLONG;
|
||||
typedef unsigned __int64 DWORDLONG;
|
||||
#else
|
||||
typedef double LONGLONG,DWORDLONG;
|
||||
#endif
|
||||
typedef LONGLONG *PLONGLONG;
|
||||
typedef DWORDLONG *PDWORDLONG;
|
||||
typedef DWORDLONG ULONGLONG,*PULONGLONG;
|
||||
#endif
|
||||
|
||||
#ifndef __BIG_ENDIAN__
|
||||
|
@ -738,7 +756,7 @@ typedef struct _IMAGE_OPTIONAL_HEADER {
|
|||
DWORD LoaderFlags;
|
||||
DWORD NumberOfRvaAndSizes;
|
||||
IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
|
||||
} IMAGE_OPTIONAL_HEADER,*PIMAGE_OPTIONAL_HEADER;
|
||||
} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32;
|
||||
typedef struct _IMAGE_OPTIONAL_HEADER64 {
|
||||
WORD Magic;
|
||||
BYTE MajorLinkerVersion;
|
||||
|
@ -771,6 +789,13 @@ typedef struct _IMAGE_OPTIONAL_HEADER64 {
|
|||
DWORD NumberOfRvaAndSizes;
|
||||
IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
|
||||
} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64;
|
||||
#ifdef _WIN64
|
||||
typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER;
|
||||
typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER;
|
||||
#else
|
||||
typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER;
|
||||
typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER;
|
||||
#endif
|
||||
#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b
|
||||
#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x20b
|
||||
typedef struct _IMAGE_NT_HEADERS {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue