From d21eed76c48960707561c45c492c10a6a23c052e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 31 Jul 2020 17:06:35 -0600 Subject: WIXFEAT:4763 Change "string" variable type to literal and add "formatted". --- .../inc/BootstrapperEngine.h | 1 + .../inc/BundleExtensionEngine.h | 14 +------------- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'src/WixToolset.BootstrapperCore.Native') diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h index 0dcaba75..e3792177 100644 --- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h +++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h @@ -398,6 +398,7 @@ typedef struct _BAENGINE_SETVARIABLESTRING_ARGS DWORD cbSize; LPCWSTR wzVariable; LPCWSTR wzValue; + BOOL fFormatted; } BAENGINE_SETVARIABLESTRING_ARGS; typedef struct _BAENGINE_SETVARIABLESTRING_RESULTS diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h b/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h index 03c4f206..61a55693 100644 --- a/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h +++ b/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h @@ -24,7 +24,6 @@ enum BUNDLE_EXTENSION_ENGINE_MESSAGE BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLESTRING, BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLEVERSION, BUNDLE_EXTENSION_ENGINE_MESSAGE_LOG, - BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLELITERALSTRING, BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLENUMERIC, BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLESTRING, BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLEVERSION, @@ -124,18 +123,6 @@ typedef struct _BUNDLE_EXTENSION_ENGINE_LOG_RESULTS DWORD cbSize; } BUNDLE_EXTENSION_ENGINE_LOG_RESULTS; -typedef struct _BUNDLE_EXTENSION_ENGINE_SETVARIABLELITERALSTRING_ARGS -{ - DWORD cbSize; - LPCWSTR wzVariable; - LPCWSTR wzValue; -} BUNDLE_EXTENSION_ENGINE_SETVARIABLELITERALSTRING_ARGS; - -typedef struct _BUNDLE_EXTENSION_ENGINE_SETVARIABLELITERALSTRING_RESULTS -{ - DWORD cbSize; -} BUNDLE_EXTENSION_ENGINE_SETVARIABLELITERALSTRING_RESULTS; - typedef struct _BUNDLE_EXTENSION_ENGINE_SETVARIABLENUMERIC_ARGS { DWORD cbSize; @@ -153,6 +140,7 @@ typedef struct _BUNDLE_EXTENSION_ENGINE_SETVARIABLESTRING_ARGS DWORD cbSize; LPCWSTR wzVariable; LPCWSTR wzValue; + BOOL fFormatted; } BUNDLE_EXTENSION_ENGINE_SETVARIABLESTRING_ARGS; typedef struct _BUNDLE_EXTENSION_ENGINE_SETVARIABLESTRING_RESULTS -- cgit v1.2.3-55-g6feb