aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Util/be/UtilBundleExtension.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Util/be/UtilBundleExtension.cpp')
-rw-r--r--src/ext/Util/be/UtilBundleExtension.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ext/Util/be/UtilBundleExtension.cpp b/src/ext/Util/be/UtilBundleExtension.cpp
index 110599fa..23f5d94f 100644
--- a/src/ext/Util/be/UtilBundleExtension.cpp
+++ b/src/ext/Util/be/UtilBundleExtension.cpp
@@ -28,16 +28,16 @@ public: //CBextBaseBundleExtension
28 IXMLDOMNode* pixnBundleExtension = NULL; 28 IXMLDOMNode* pixnBundleExtension = NULL;
29 29
30 hr = __super::Initialize(pCreateArgs); 30 hr = __super::Initialize(pCreateArgs);
31 ExitOnFailure(hr, "CBextBaseBundleExtension initialization failed."); 31 BextExitOnFailure(hr, "CBextBaseBundleExtension initialization failed.");
32 32
33 hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest); 33 hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest);
34 ExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath); 34 BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath);
35 35
36 hr = BextGetBundleExtensionDataNode(pixdManifest, UTIL_BUNDLE_EXTENSION_ID, &pixnBundleExtension); 36 hr = BextGetBundleExtensionDataNode(pixdManifest, UTIL_BUNDLE_EXTENSION_ID, &pixnBundleExtension);
37 ExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID); 37 BextExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID);
38 38
39 hr = UtilSearchParseFromXml(&m_searches, pixnBundleExtension); 39 hr = UtilSearchParseFromXml(&m_searches, pixnBundleExtension);
40 ExitOnFailure(hr, "Failed to parse searches from bundle extension manifest."); 40 BextExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
41 41
42 LExit: 42 LExit:
43 ReleaseObject(pixnBundleExtension); 43 ReleaseObject(pixnBundleExtension);
@@ -73,10 +73,10 @@ HRESULT UtilBundleExtensionCreate(
73 CWixUtilBundleExtension* pExtension = NULL; 73 CWixUtilBundleExtension* pExtension = NULL;
74 74
75 pExtension = new CWixUtilBundleExtension(pEngine); 75 pExtension = new CWixUtilBundleExtension(pEngine);
76 ExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension."); 76 BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension.");
77 77
78 hr = pExtension->Initialize(pArgs); 78 hr = pExtension->Initialize(pArgs);
79 ExitOnFailure(hr, "CWixUtilBundleExtension initialization failed."); 79 BextExitOnFailure(hr, "CWixUtilBundleExtension initialization failed.");
80 80
81 *ppBundleExtension = pExtension; 81 *ppBundleExtension = pExtension;
82 pExtension = NULL; 82 pExtension = NULL;