aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-08-10 19:24:45 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-08-10 20:27:48 -0500
commit0a97d7aafcbb564b7bc9f4e754f39055fd38ae4f (patch)
tree9806619cb509dcb18a36f990ce9a2f37e30d1cdd /src/api
parent3756ae7c8dc60d459511d0b067ebef5efb052746 (diff)
downloadwix-0a97d7aafcbb564b7bc9f4e754f39055fd38ae4f.tar.gz
wix-0a97d7aafcbb564b7bc9f4e754f39055fd38ae4f.tar.bz2
wix-0a97d7aafcbb564b7bc9f4e754f39055fd38ae4f.zip
Allow wixstdba special controls to have declarative text.
Fixes 6855
Diffstat (limited to 'src/api')
-rw-r--r--src/api/burn/balutil/inc/BAFunctions.h2
-rw-r--r--src/api/burn/balutil/inc/BalBaseBAFunctions.h2
-rw-r--r--src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h2
-rw-r--r--src/api/burn/balutil/inc/IBAFunctions.h2
4 files changed, 4 insertions, 4 deletions
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
164 DWORD cbSize; 164 DWORD cbSize;
165 BOOL fProcessed; 165 BOOL fProcessed;
166 WORD wId; 166 WORD wId;
167 BOOL fDisableAutomaticFunctionality; 167 DWORD dwAutomaticBehaviorType;
168}; 168};
169 169
170struct BA_FUNCTIONS_ONTHEMECONTROLWMCOMMAND_ARGS 170struct 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
947 __in LPCWSTR /*wzName*/, 947 __in LPCWSTR /*wzName*/,
948 __inout BOOL* /*pfProcessed*/, 948 __inout BOOL* /*pfProcessed*/,
949 __inout WORD* /*pwId*/, 949 __inout WORD* /*pwId*/,
950 __inout BOOL* /*pfDisableAutomaticFunctionality*/ 950 __inout DWORD* /*pdwAutomaticBehaviorType*/
951 ) 951 )
952 { 952 {
953 return S_OK; 953 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(
30 __inout BA_FUNCTIONS_ONTHEMECONTROLLOADING_RESULTS* pResults 30 __inout BA_FUNCTIONS_ONTHEMECONTROLLOADING_RESULTS* pResults
31 ) 31 )
32{ 32{
33 return pBAFunctions->OnThemeControlLoading(pArgs->wzName, &pResults->fProcessed, &pResults->wId, &pResults->fDisableAutomaticFunctionality); 33 return pBAFunctions->OnThemeControlLoading(pArgs->wzName, &pResults->fProcessed, &pResults->wId, &pResults->dwAutomaticBehaviorType);
34} 34}
35 35
36static HRESULT BalBaseBAFunctionsProcOnThemeControlWmCommand( 36static 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
36 __in LPCWSTR wzName, 36 __in LPCWSTR wzName,
37 __inout BOOL* pfProcessed, 37 __inout BOOL* pfProcessed,
38 __inout WORD* pwId, 38 __inout WORD* pwId,
39 __inout BOOL* pfDisableAutomaticFunctionality 39 __inout DWORD* pdwAutomaticBehaviorType
40 ) = 0; 40 ) = 0;
41 41
42 // OnThemeControlWmCommand - Called when WM_COMMAND is received for a control. 42 // OnThemeControlWmCommand - Called when WM_COMMAND is received for a control.