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

PROPVARIANT struct is larger on 64-bit

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7109 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2019-08-11 17:12:33 +00:00
parent 91cda12540
commit 734e9567f9
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Include/Win/Propkey.nsh
View file

@ -28,6 +28,12 @@ WTypes.h
!define VT_LPSTR 30 !define VT_LPSTR 30
!define VT_LPWSTR 31 !define VT_LPWSTR 31
!define VT_FILETIME 64 !define VT_FILETIME 64
!define VT_STREAM 66
!define VT_CLSID 72
!define VT_TYPEMASK 0xFFF
!define VT_VECTOR 0x1000
!define VT_ARRAY 0x2000
!define VT_BYREF 0x4000
!define /ifndef VARIANT_TRUE -1 !define /ifndef VARIANT_TRUE -1
!define /ifndef VARIANT_FALSE 0 !define /ifndef VARIANT_FALSE 0
@ -42,11 +48,23 @@ WTypes.h
!define STGC_CONSOLIDATE 8 !define STGC_CONSOLIDATE 8
/**************************************************
OAIdl.h
**************************************************/
!define /ifndef SYSSIZEOF_VARIANT 16
!define /ifndef SYSSTRUCT_VARIANT (&i2,&i6,&i8)
/************************************************** /**************************************************
PropIdl.h PropIdl.h
**************************************************/ **************************************************/
!if "${NSIS_PTR_SIZE}" > 4
!define SYSSIZEOF_PROPVARIANT 24
!define SYSSTRUCT_PROPVARIANT (&i2,&i6,&i8,&i8)
!else
!define SYSSIZEOF_PROPVARIANT 16 !define SYSSIZEOF_PROPVARIANT 16
!define SYSSTRUCT_PROPVARIANT (&i2,&i6,&i8) !define SYSSTRUCT_PROPVARIANT (&i2,&i6,&i8)
!endif
!define PRSPEC_LPWSTR 0 !define PRSPEC_LPWSTR 0
!define PRSPEC_PROPID 1 !define PRSPEC_PROPID 1