diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-10-27 15:29:47 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-11-01 16:34:09 -0500 |
commit | 3d73efba15565f5995a492e660dff72286e0b672 (patch) | |
tree | fc2364f88aed27d0bdf633f837c5b9ac29511760 /src/api/burn/balutil/inc/BalBaseBAFunctions.h | |
parent | dce1c97c7d3e76c18e4f80d4ffe288d2933a74bc (diff) | |
download | wix-3d73efba15565f5995a492e660dff72286e0b672.tar.gz wix-3d73efba15565f5995a492e660dff72286e0b672.tar.bz2 wix-3d73efba15565f5995a492e660dff72286e0b672.zip |
Remove dutil types from BAFunctions.
Diffstat (limited to 'src/api/burn/balutil/inc/BalBaseBAFunctions.h')
-rw-r--r-- | src/api/burn/balutil/inc/BalBaseBAFunctions.h | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h index d97df350..1493253b 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h | |||
@@ -5,9 +5,6 @@ | |||
5 | #include <windows.h> | 5 | #include <windows.h> |
6 | #include <msiquery.h> | 6 | #include <msiquery.h> |
7 | 7 | ||
8 | #include "dutil.h" | ||
9 | #include "locutil.h" | ||
10 | #include "thmutil.h" | ||
11 | #include "BAFunctions.h" | 8 | #include "BAFunctions.h" |
12 | #include "IBAFunctions.h" | 9 | #include "IBAFunctions.h" |
13 | #include "BootstrapperEngine.h" | 10 | #include "BootstrapperEngine.h" |
@@ -803,32 +800,26 @@ public: // IBAFunctions | |||
803 | } | 800 | } |
804 | 801 | ||
805 | virtual STDMETHODIMP OnThemeLoaded( | 802 | virtual STDMETHODIMP OnThemeLoaded( |
806 | THEME* pTheme, | 803 | __in HWND hWnd |
807 | WIX_LOCALIZATION* pWixLoc | ||
808 | ) | 804 | ) |
809 | { | 805 | { |
810 | HRESULT hr = S_OK; | 806 | HRESULT hr = S_OK; |
811 | 807 | ||
812 | m_pTheme = pTheme; | 808 | m_hwndParent = hWnd; |
813 | m_pWixLoc = pWixLoc; | ||
814 | 809 | ||
815 | return hr; | 810 | return hr; |
816 | } | 811 | } |
817 | 812 | ||
818 | virtual STDMETHODIMP WndProc( | 813 | virtual STDMETHODIMP WndProc( |
819 | __in THEME* pTheme, | 814 | __in HWND /*hWnd*/, |
820 | __in HWND hWnd, | 815 | __in UINT /*uMsg*/, |
821 | __in UINT uMsg, | 816 | __in WPARAM /*wParam*/, |
822 | __in WPARAM wParam, | 817 | __in LPARAM /*lParam*/, |
823 | __in LPARAM lParam, | 818 | __inout BOOL* /*pfProcessed*/, |
824 | __inout LRESULT* plRes | 819 | __inout LRESULT* /*plResult*/ |
825 | ) | 820 | ) |
826 | { | 821 | { |
827 | HRESULT hr = S_OK; | 822 | return S_OK; |
828 | |||
829 | *plRes = ThemeDefWindowProc(pTheme, hWnd, uMsg, wParam, lParam); | ||
830 | |||
831 | return hr; | ||
832 | } | 823 | } |
833 | 824 | ||
834 | virtual STDMETHODIMP BAFunctionsProc( | 825 | virtual STDMETHODIMP BAFunctionsProc( |
@@ -917,6 +908,5 @@ protected: | |||
917 | BA_FUNCTIONS_CREATE_ARGS m_bafCreateArgs; | 908 | BA_FUNCTIONS_CREATE_ARGS m_bafCreateArgs; |
918 | BOOTSTRAPPER_CREATE_ARGS m_baCreateArgs; | 909 | BOOTSTRAPPER_CREATE_ARGS m_baCreateArgs; |
919 | BOOTSTRAPPER_COMMAND m_command; | 910 | BOOTSTRAPPER_COMMAND m_command; |
920 | THEME* m_pTheme; | 911 | HWND m_hwndParent; |
921 | WIX_LOCALIZATION* m_pWixLoc; | ||
922 | }; | 912 | }; |