diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-07-02 10:18:08 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-07-02 12:50:09 -0500 |
commit | f43d176f95601ff7524e06247166d4f3b6e61c05 (patch) | |
tree | 2e3580ca60c85e1d07a0ab4a2b1279d25fd41f6c /src/api/burn/test | |
parent | 9bdf3730cd43e1af8a4ea9be6cf2fba77fcff2d2 (diff) | |
download | wix-f43d176f95601ff7524e06247166d4f3b6e61c05.tar.gz wix-f43d176f95601ff7524e06247166d4f3b6e61c05.tar.bz2 wix-f43d176f95601ff7524e06247166d4f3b6e61c05.zip |
Make the BA responsible for parsing restart prompt behavior.
Fixes #4975
Diffstat (limited to 'src/api/burn/test')
-rw-r--r-- | src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp | 10 | ||||
-rw-r--r-- | src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp b/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp index 13d22e72..daa1d690 100644 --- a/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp +++ b/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp | |||
@@ -8,9 +8,8 @@ class CTestBootstrapperApplication : public CBalBaseBootstrapperApplication | |||
8 | { | 8 | { |
9 | public: | 9 | public: |
10 | CTestBootstrapperApplication( | 10 | CTestBootstrapperApplication( |
11 | __in IBootstrapperEngine* pEngine, | 11 | __in IBootstrapperEngine* pEngine |
12 | __in const BOOTSTRAPPER_CREATE_ARGS* pArgs | 12 | ) : CBalBaseBootstrapperApplication(pEngine) |
13 | ) : CBalBaseBootstrapperApplication(pEngine, pArgs) | ||
14 | { | 13 | { |
15 | } | 14 | } |
16 | }; | 15 | }; |
@@ -25,9 +24,12 @@ HRESULT CreateBootstrapperApplication( | |||
25 | HRESULT hr = S_OK; | 24 | HRESULT hr = S_OK; |
26 | CTestBootstrapperApplication* pApplication = NULL; | 25 | CTestBootstrapperApplication* pApplication = NULL; |
27 | 26 | ||
28 | pApplication = new CTestBootstrapperApplication(pEngine, pArgs); | 27 | pApplication = new CTestBootstrapperApplication(pEngine); |
29 | ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new test bootstrapper application object."); | 28 | ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new test bootstrapper application object."); |
30 | 29 | ||
30 | hr = pApplication->Initialize(pArgs); | ||
31 | ExitOnFailure(hr, "CTestBootstrapperApplication initialization failed."); | ||
32 | |||
31 | pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; | 33 | pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; |
32 | pResults->pvBootstrapperApplicationProcContext = pApplication; | 34 | pResults->pvBootstrapperApplicationProcContext = pApplication; |
33 | *ppApplication = pApplication; | 35 | *ppApplication = pApplication; |
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs b/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs index b49b3927..8705ed13 100644 --- a/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs +++ b/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs | |||
@@ -101,7 +101,6 @@ namespace WixToolsetTest.Mba.Core | |||
101 | public int cbSize; | 101 | public int cbSize; |
102 | public LaunchAction action; | 102 | public LaunchAction action; |
103 | public Display display; | 103 | public Display display; |
104 | public Restart restart; | ||
105 | [MarshalAs(UnmanagedType.LPWStr)] public string wzCommandLine; | 104 | [MarshalAs(UnmanagedType.LPWStr)] public string wzCommandLine; |
106 | public int nCmdShow; | 105 | public int nCmdShow; |
107 | public ResumeType resume; | 106 | public ResumeType resume; |