From 9d3af7547bb790d39157dd36dfa862a1abf47beb Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 8 Nov 2021 15:24:46 -0600 Subject: Go back to thmutil not interfering with wixstdba controls. --- src/api/burn/balutil/inc/BAFunctions.h | 1 + src/api/burn/balutil/inc/BalBaseBAFunctions.h | 3 ++- src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h | 2 +- src/api/burn/balutil/inc/IBAFunctions.h | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/api') diff --git a/src/api/burn/balutil/inc/BAFunctions.h b/src/api/burn/balutil/inc/BAFunctions.h index 149a12f8..21cace1f 100644 --- a/src/api/burn/balutil/inc/BAFunctions.h +++ b/src/api/burn/balutil/inc/BAFunctions.h @@ -141,6 +141,7 @@ struct BA_FUNCTIONS_ONTHEMECONTROLLOADING_RESULTS DWORD cbSize; BOOL fProcessed; WORD wId; + BOOL fDisableAutomaticFunctionality; }; struct BA_FUNCTIONS_ONTHEMECONTROLWMCOMMAND_ARGS diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h index 1493253b..2866f6b0 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h @@ -835,7 +835,8 @@ public: // IBAFunctions virtual STDMETHODIMP OnThemeControlLoading( __in LPCWSTR /*wzName*/, __inout BOOL* /*pfProcessed*/, - __inout WORD* /*pwId*/ + __inout WORD* /*pwId*/, + __inout BOOL* /*pfDisableAutomaticFunctionality*/ ) { return S_OK; diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h index 135f7c76..e841c660 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); + return pBAFunctions->OnThemeControlLoading(pArgs->wzName, &pResults->fProcessed, &pResults->wId, &pResults->fDisableAutomaticFunctionality); } static HRESULT BalBaseBAFunctionsProcOnThemeControlWmCommand( diff --git a/src/api/burn/balutil/inc/IBAFunctions.h b/src/api/burn/balutil/inc/IBAFunctions.h index 50126ba1..ea6c116b 100644 --- a/src/api/burn/balutil/inc/IBAFunctions.h +++ b/src/api/burn/balutil/inc/IBAFunctions.h @@ -35,7 +35,8 @@ DECLARE_INTERFACE_IID_(IBAFunctions, IBootstrapperApplication, "0FB445ED-17BD-49 STDMETHOD(OnThemeControlLoading)( __in LPCWSTR wzName, __inout BOOL* pfProcessed, - __inout WORD* pwId + __inout WORD* pwId, + __inout BOOL* pfDisableAutomaticFunctionality ) = 0; // OnThemeControlWmCommand - Called when WM_COMMAND is received for a control. -- cgit v1.2.3-55-g6feb