diff options
Diffstat (limited to 'src/ext/NetFx/be/netfxbe.cpp')
-rw-r--r-- | src/ext/NetFx/be/netfxbe.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/ext/NetFx/be/netfxbe.cpp b/src/ext/NetFx/be/netfxbe.cpp index 3a34cea3..72eda51a 100644 --- a/src/ext/NetFx/be/netfxbe.cpp +++ b/src/ext/NetFx/be/netfxbe.cpp | |||
@@ -1,10 +1,10 @@ | |||
1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
2 | 2 | ||
3 | #include "precomp.h" | 3 | #include "precomp.h" |
4 | #include "BextBaseBundleExtensionProc.h" | 4 | #include "BextBaseBootstrapperExtensionProc.h" |
5 | 5 | ||
6 | static HINSTANCE vhInstance = NULL; | 6 | static HINSTANCE vhInstance = NULL; |
7 | static IBundleExtension* vpBundleExtension = NULL; | 7 | static IBootstrapperExtension* vpBootstrapperExtension = NULL; |
8 | 8 | ||
9 | // function definitions | 9 | // function definitions |
10 | 10 | ||
@@ -28,13 +28,13 @@ extern "C" BOOL WINAPI DllMain( | |||
28 | return TRUE; | 28 | return TRUE; |
29 | } | 29 | } |
30 | 30 | ||
31 | extern "C" HRESULT WINAPI BundleExtensionCreate( | 31 | extern "C" HRESULT WINAPI BootstrapperExtensionCreate( |
32 | __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, | 32 | __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs, |
33 | __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults | 33 | __inout BOOTSTRAPPER_EXTENSION_CREATE_RESULTS* pResults |
34 | ) | 34 | ) |
35 | { | 35 | { |
36 | HRESULT hr = S_OK; | 36 | HRESULT hr = S_OK; |
37 | IBundleExtensionEngine* pEngine = NULL; | 37 | IBootstrapperExtensionEngine* pEngine = NULL; |
38 | 38 | ||
39 | hr = XmlInitialize(); | 39 | hr = XmlInitialize(); |
40 | ExitOnFailure(hr, "Failed to initialize XML."); | 40 | ExitOnFailure(hr, "Failed to initialize XML."); |
@@ -42,11 +42,11 @@ extern "C" HRESULT WINAPI BundleExtensionCreate( | |||
42 | hr = BextInitializeFromCreateArgs(pArgs, &pEngine); | 42 | hr = BextInitializeFromCreateArgs(pArgs, &pEngine); |
43 | ExitOnFailure(hr, "Failed to initialize bext"); | 43 | ExitOnFailure(hr, "Failed to initialize bext"); |
44 | 44 | ||
45 | hr = NetfxBundleExtensionCreate(vhInstance, pEngine, pArgs, &vpBundleExtension); | 45 | hr = NetfxBootstrapperExtensionCreate(vhInstance, pEngine, pArgs, &vpBootstrapperExtension); |
46 | BextExitOnFailure(hr, "Failed to create WixNetfxBundleExtension"); | 46 | BextExitOnFailure(hr, "Failed to create WixNetfxBootstrapperExtension"); |
47 | 47 | ||
48 | pResults->pfnBundleExtensionProc = BextBaseBundleExtensionProc; | 48 | pResults->pfnBootstrapperExtensionProc = BextBaseBootstrapperExtensionProc; |
49 | pResults->pvBundleExtensionProcContext = vpBundleExtension; | 49 | pResults->pvBootstrapperExtensionProcContext = vpBootstrapperExtension; |
50 | 50 | ||
51 | LExit: | 51 | LExit: |
52 | ReleaseObject(pEngine); | 52 | ReleaseObject(pEngine); |
@@ -54,9 +54,9 @@ LExit: | |||
54 | return hr; | 54 | return hr; |
55 | } | 55 | } |
56 | 56 | ||
57 | extern "C" void WINAPI BundleExtensionDestroy() | 57 | extern "C" void WINAPI BootstrapperExtensionDestroy() |
58 | { | 58 | { |
59 | BextUninitialize(); | 59 | BextUninitialize(); |
60 | ReleaseNullObject(vpBundleExtension); | 60 | ReleaseNullObject(vpBootstrapperExtension); |
61 | XmlUninitialize(); | 61 | XmlUninitialize(); |
62 | } | 62 | } |