From e879388d96157db6a6e7b2ee79871ef7ebbd3015 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 18 Oct 2020 14:10:20 -0500 Subject: Add CompareVersions engine method. --- .../inc/BootstrapperEngine.h | 14 ++++++++++++++ .../inc/BundleExtension.h | 1 + .../inc/BundleExtensionEngine.h | 14 ++++++++++++++ 3 files changed, 29 insertions(+) (limited to 'src/WixToolset.BootstrapperCore.Native/inc') diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h index a6a87622..13229c29 100644 --- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h +++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h @@ -124,6 +124,7 @@ enum BOOTSTRAPPER_ENGINE_MESSAGE BOOTSTRAPPER_ENGINE_MESSAGE_APPLY, BOOTSTRAPPER_ENGINE_MESSAGE_QUIT, BOOTSTRAPPER_ENGINE_MESSAGE_LAUNCHAPPROVEDEXE, + BOOTSTRAPPER_ENGINE_MESSAGE_COMPAREVERSIONS, }; typedef struct _BAENGINE_APPLY_ARGS @@ -147,6 +148,19 @@ typedef struct _BAENGINE_CLOSESPLASHSCREEN_RESULTS DWORD cbSize; } BAENGINE_CLOSESPLASHSCREEN_RESULTS; +typedef struct _BAENGINE_COMPAREVERSIONS_ARGS +{ + DWORD cbSize; + LPCWSTR wzVersion1; + LPCWSTR wzVersion2; +} BAENGINE_COMPAREVERSIONS_ARGS; + +typedef struct _BAENGINE_COMPAREVERSIONS_RESULTS +{ + DWORD cbSize; + int nResult; +} BAENGINE_COMPAREVERSIONS_RESULTS; + typedef struct _BAENGINE_DETECT_ARGS { DWORD cbSize; diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BundleExtension.h b/src/WixToolset.BootstrapperCore.Native/inc/BundleExtension.h index 5c7d1260..be76a1a5 100644 --- a/src/WixToolset.BootstrapperCore.Native/inc/BundleExtension.h +++ b/src/WixToolset.BootstrapperCore.Native/inc/BundleExtension.h @@ -38,6 +38,7 @@ typedef struct _BUNDLE_EXTENSION_CREATE_ARGS LPVOID pvBundleExtensionEngineProcContext; LPCWSTR wzBootstrapperWorkingFolder; LPCWSTR wzBundleExtensionDataPath; + LPCWSTR wzExtensionId; } BUNDLE_EXTENSION_CREATE_ARGS; typedef struct _BUNDLE_EXTENSION_CREATE_RESULTS diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h b/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h index adcae1af..becb5be3 100644 --- a/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h +++ b/src/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h @@ -27,8 +27,22 @@ enum BUNDLE_EXTENSION_ENGINE_MESSAGE BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLENUMERIC, BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLESTRING, BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLEVERSION, + BUNDLE_EXTENSION_ENGINE_MESSAGE_COMPAREVERSIONS, }; +typedef struct _BUNDLE_EXTENSION_ENGINE_COMPAREVERSIONS_ARGS +{ + DWORD cbSize; + LPCWSTR wzVersion1; + LPCWSTR wzVersion2; +} BUNDLE_EXTENSION_ENGINE_COMPAREVERSIONS_ARGS; + +typedef struct _BUNDLE_EXTENSION_ENGINE_COMPAREVERSIONS_RESULTS +{ + DWORD cbSize; + int nResult; +} BUNDLE_EXTENSION_ENGINE_COMPAREVERSIONS_RESULTS; + typedef struct _BUNDLE_EXTENSION_ENGINE_ESCAPESTRING_ARGS { DWORD cbSize; -- cgit v1.2.3-55-g6feb