From 0a97d7aafcbb564b7bc9f4e754f39055fd38ae4f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 10 Aug 2022 19:24:45 -0500 Subject: Allow wixstdba special controls to have declarative text. Fixes 6855 --- src/api/burn/balutil/inc/BAFunctions.h | 2 +- src/api/burn/balutil/inc/BalBaseBAFunctions.h | 2 +- src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h | 2 +- src/api/burn/balutil/inc/IBAFunctions.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/api') diff --git a/src/api/burn/balutil/inc/BAFunctions.h b/src/api/burn/balutil/inc/BAFunctions.h index 8ecc04ff..4a0b8599 100644 --- a/src/api/burn/balutil/inc/BAFunctions.h +++ b/src/api/burn/balutil/inc/BAFunctions.h @@ -164,7 +164,7 @@ struct BA_FUNCTIONS_ONTHEMECONTROLLOADING_RESULTS DWORD cbSize; BOOL fProcessed; WORD wId; - BOOL fDisableAutomaticFunctionality; + DWORD dwAutomaticBehaviorType; }; struct BA_FUNCTIONS_ONTHEMECONTROLWMCOMMAND_ARGS diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h index 49e97815..3f99673d 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h @@ -947,7 +947,7 @@ public: // IBAFunctions __in LPCWSTR /*wzName*/, __inout BOOL* /*pfProcessed*/, __inout WORD* /*pwId*/, - __inout BOOL* /*pfDisableAutomaticFunctionality*/ + __inout DWORD* /*pdwAutomaticBehaviorType*/ ) { return S_OK; diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h index e10decfc..728bd2b5 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h @@ -30,7 +30,7 @@ static HRESULT BalBaseBAFunctionsProcOnThemeControlLoading( __inout BA_FUNCTIONS_ONTHEMECONTROLLOADING_RESULTS* pResults ) { - return pBAFunctions->OnThemeControlLoading(pArgs->wzName, &pResults->fProcessed, &pResults->wId, &pResults->fDisableAutomaticFunctionality); + return pBAFunctions->OnThemeControlLoading(pArgs->wzName, &pResults->fProcessed, &pResults->wId, &pResults->dwAutomaticBehaviorType); } static HRESULT BalBaseBAFunctionsProcOnThemeControlWmCommand( diff --git a/src/api/burn/balutil/inc/IBAFunctions.h b/src/api/burn/balutil/inc/IBAFunctions.h index ea6c116b..bb911040 100644 --- a/src/api/burn/balutil/inc/IBAFunctions.h +++ b/src/api/burn/balutil/inc/IBAFunctions.h @@ -36,7 +36,7 @@ DECLARE_INTERFACE_IID_(IBAFunctions, IBootstrapperApplication, "0FB445ED-17BD-49 __in LPCWSTR wzName, __inout BOOL* pfProcessed, __inout WORD* pwId, - __inout BOOL* pfDisableAutomaticFunctionality + __inout DWORD* pdwAutomaticBehaviorType ) = 0; // OnThemeControlWmCommand - Called when WM_COMMAND is received for a control. -- cgit v1.2.3-55-g6feb