From 734e9567f9c29e6e5e3c24921c78cb8b8805ba6a Mon Sep 17 00:00:00 2001 From: anders_k Date: Sun, 11 Aug 2019 17:12:33 +0000 Subject: [PATCH] PROPVARIANT struct is larger on 64-bit git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7109 212acab6-be3b-0410-9dea-997c60f758d6 --- Include/Win/Propkey.nsh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Include/Win/Propkey.nsh b/Include/Win/Propkey.nsh index cb5f1481..548243c0 100644 --- a/Include/Win/Propkey.nsh +++ b/Include/Win/Propkey.nsh @@ -28,6 +28,12 @@ WTypes.h !define VT_LPSTR 30 !define VT_LPWSTR 31 !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_FALSE 0 @@ -42,11 +48,23 @@ WTypes.h !define STGC_CONSOLIDATE 8 +/************************************************** +OAIdl.h +**************************************************/ +!define /ifndef SYSSIZEOF_VARIANT 16 +!define /ifndef SYSSTRUCT_VARIANT (&i2,&i6,&i8) + + /************************************************** PropIdl.h **************************************************/ +!if "${NSIS_PTR_SIZE}" > 4 +!define SYSSIZEOF_PROPVARIANT 24 +!define SYSSTRUCT_PROPVARIANT (&i2,&i6,&i8,&i8) +!else !define SYSSIZEOF_PROPVARIANT 16 !define SYSSTRUCT_PROPVARIANT (&i2,&i6,&i8) +!endif !define PRSPEC_LPWSTR 0 !define PRSPEC_PROPID 1