From 5b62a8353265b0f94336f0ec22d1dcd5d7436283 Mon Sep 17 00:00:00 2001 From: anders_k Date: Wed, 11 Dec 2019 18:29:16 +0000 Subject: [PATCH] Make VARIANT same size as PROPVARIANT git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7135 212acab6-be3b-0410-9dea-997c60f758d6 --- Include/Win/Propkey.nsh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Include/Win/Propkey.nsh b/Include/Win/Propkey.nsh index d86657ce..6d61d9a7 100644 --- a/Include/Win/Propkey.nsh +++ b/Include/Win/Propkey.nsh @@ -51,8 +51,13 @@ WTypes.h /************************************************** OAIdl.h **************************************************/ -!define /ifndef SYSSIZEOF_VARIANT 16 -!define /ifndef SYSSTRUCT_VARIANT (&i2,&i6,&i8) +!if "${NSIS_PTR_SIZE}" > 4 +!define SYSSIZEOF_VARIANT 24 +!define SYSSTRUCT_VARIANT (&i2,&i6,&i8,&i8) +!else +!define SYSSIZEOF_VARIANT 16 +!define SYSSTRUCT_VARIANT (&i2,&i6,&i8) +!endif /**************************************************