8 files changed, 104 insertions, 104 deletions

diff --git a/src/api/burn/bextutil/inc/BextBaseBundleExtension.h b/src/api/burn/bextutil/inc/BextBaseBootstrapperExtension.h
index 5bda04e1..83ba23a6 100644
--- a/src/api/burn/bextutil/inc/BextBaseBundleExtension.h
+++ b/src/api/burn/bextutil/inc/BextBaseBootstrapperExtension.h
@@ -4,7 +4,7 @@
 
 #include "bextutil.h"
 
-class CBextBaseBundleExtension : public IBundleExtension
+class CBextBaseBootstrapperExtension : public IBootstrapperExtension
 {
 public: // IUnknown
     virtual STDMETHODIMP QueryInterface(
@@ -19,9 +19,9 @@ public: // IUnknown
 
         *ppvObject = NULL;
 
-        if (::IsEqualIID(__uuidof(IBundleExtension), riid))
+        if (::IsEqualIID(__uuidof(IBootstrapperExtension), riid))
         {
-            *ppvObject = static_cast<IBundleExtension*>(this);
+            *ppvObject = static_cast<IBootstrapperExtension*>(this);
         }
         else if (::IsEqualIID(IID_IUnknown, riid))
         {
@@ -53,7 +53,7 @@ public: // IUnknown
         return 0;
     }
 
-public: // IBundleExtension
+public: // IBootstrapperExtension
     virtual STDMETHODIMP Search(
         __in LPCWSTR /*wzId*/,
         __in LPCWSTR /*wzVariable*/
@@ -62,8 +62,8 @@ public: // IBundleExtension
         return E_NOTIMPL;
     }
 
-    virtual STDMETHODIMP BundleExtensionProc(
-        __in BUNDLE_EXTENSION_MESSAGE /*message*/,
+    virtual STDMETHODIMP BootstrapperExtensionProc(
+        __in BOOTSTRAPPER_EXTENSION_MESSAGE /*message*/,
         __in const LPVOID /*pvArgs*/,
         __inout LPVOID /*pvResults*/,
         __in_opt LPVOID /*pvContext*/
@@ -72,15 +72,15 @@ public: // IBundleExtension
         return E_NOTIMPL;
     }
 
-public: //CBextBaseBundleExtension
+public: //CBextBaseBootstrapperExtension
     virtual STDMETHODIMP Initialize(
-        __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs
+        __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pCreateArgs
         )
     {
         HRESULT hr = S_OK;
 
-        hr = StrAllocString(&m_sczBundleExtensionDataPath, pCreateArgs->wzBundleExtensionDataPath, 0);
-        ExitOnFailure(hr, "Failed to copy BundleExtensionDataPath.");
+        hr = StrAllocString(&m_sczBootstrapperExtensionDataPath, pCreateArgs->wzBootstrapperExtensionDataPath, 0);
+        ExitOnFailure(hr, "Failed to copy BootstrapperExtensionDataPath.");
 
     LExit:
         return hr;
@@ -88,8 +88,8 @@ public: //CBextBaseBundleExtension
 
 protected:
 
-    CBextBaseBundleExtension(
-        __in IBundleExtensionEngine* pEngine
+    CBextBaseBootstrapperExtension(
+        __in IBootstrapperExtensionEngine* pEngine
         )
     {
         m_cReferences = 1;
@@ -97,18 +97,18 @@ protected:
         pEngine->AddRef();
         m_pEngine = pEngine;
 
-        m_sczBundleExtensionDataPath = NULL;
+        m_sczBootstrapperExtensionDataPath = NULL;
     }
 
-    virtual ~CBextBaseBundleExtension()
+    virtual ~CBextBaseBootstrapperExtension()
     {
         ReleaseNullObject(m_pEngine);
-        ReleaseStr(m_sczBundleExtensionDataPath);
+        ReleaseStr(m_sczBootstrapperExtensionDataPath);
     }
 
 protected:
-    IBundleExtensionEngine* m_pEngine;
-    LPWSTR m_sczBundleExtensionDataPath;
+    IBootstrapperExtensionEngine* m_pEngine;
+    LPWSTR m_sczBootstrapperExtensionDataPath;
 
 private:
     long m_cReferences;
diff --git a/src/api/burn/bextutil/inc/BextBaseBootstrapperExtensionProc.h b/src/api/burn/bextutil/inc/BextBaseBootstrapperExtensionProc.h
new file mode 100644
index 00000000..4f96399c
--- /dev/null
+++ b/src/api/burn/bextutil/inc/BextBaseBootstrapperExtensionProc.h
@@ -0,0 +1,46 @@
+#pragma once
+// 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.
+
+
+#include <windows.h>
+
+#include <IBootstrapperExtensionEngine.h>
+#include <IBootstrapperExtension.h>
+
+static HRESULT BextBaseBEProcSearch(
+    __in IBootstrapperExtension* pBE,
+    __in BOOTSTRAPPER_EXTENSION_SEARCH_ARGS* pArgs,
+    __inout BOOTSTRAPPER_EXTENSION_SEARCH_RESULTS* /*pResults*/
+    )
+{
+    return pBE->Search(pArgs->wzId, pArgs->wzVariable);
+}
+
+/*******************************************************************
+BextBaseBootstrapperExtensionProc - requires pvContext to be of type IBootstrapperExtension.
+                              Provides a default mapping between the message based
+                              BootstrapperExtension interface and the COM-based BootstrapperExtension interface.
+
+*******************************************************************/
+static HRESULT WINAPI BextBaseBootstrapperExtensionProc(
+    __in BOOTSTRAPPER_EXTENSION_MESSAGE message,
+    __in const LPVOID pvArgs,
+    __inout LPVOID pvResults,
+    __in_opt LPVOID pvContext
+    )
+{
+    IBootstrapperExtension* pBE = reinterpret_cast<IBootstrapperExtension*>(pvContext);
+    HRESULT hr = pBE->BootstrapperExtensionProc(message, pvArgs, pvResults, pvContext);
+
+    if (E_NOTIMPL == hr)
+    {
+        switch (message)
+        {
+        case BOOTSTRAPPER_EXTENSION_MESSAGE_SEARCH:
+            hr = BextBaseBEProcSearch(pBE, reinterpret_cast<BOOTSTRAPPER_EXTENSION_SEARCH_ARGS*>(pvArgs), reinterpret_cast<BOOTSTRAPPER_EXTENSION_SEARCH_RESULTS*>(pvResults));
+            break;
+        }
+    }
+
+    return hr;
+}
diff --git a/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h b/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h
deleted file mode 100644
index cd7e3cb3..00000000
--- a/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-// 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.
-
-
-#include <windows.h>
-
-#include <IBundleExtensionEngine.h>
-#include <IBundleExtension.h>
-
-static HRESULT BextBaseBEProcSearch(
-    __in IBundleExtension* pBE,
-    __in BUNDLE_EXTENSION_SEARCH_ARGS* pArgs,
-    __inout BUNDLE_EXTENSION_SEARCH_RESULTS* /*pResults*/
-    )
-{
-    return pBE->Search(pArgs->wzId, pArgs->wzVariable);
-}
-
-/*******************************************************************
-BextBaseBundleExtensionProc - requires pvContext to be of type IBundleExtension.
-                              Provides a default mapping between the message based
-                              BundleExtension interface and the COM-based BundleExtension interface.
-
-*******************************************************************/
-static HRESULT WINAPI BextBaseBundleExtensionProc(
-    __in BUNDLE_EXTENSION_MESSAGE message,
-    __in const LPVOID pvArgs,
-    __inout LPVOID pvResults,
-    __in_opt LPVOID pvContext
-    )
-{
-    IBundleExtension* pBE = reinterpret_cast<IBundleExtension*>(pvContext);
-    HRESULT hr = pBE->BundleExtensionProc(message, pvArgs, pvResults, pvContext);
-
-    if (E_NOTIMPL == hr)
-    {
-        switch (message)
-        {
-        case BUNDLE_EXTENSION_MESSAGE_SEARCH:
-            hr = BextBaseBEProcSearch(pBE, reinterpret_cast<BUNDLE_EXTENSION_SEARCH_ARGS*>(pvArgs), reinterpret_cast<BUNDLE_EXTENSION_SEARCH_RESULTS*>(pvResults));
-            break;
-        }
-    }
-
-    return hr;
-}
diff --git a/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h b/src/api/burn/bextutil/inc/BextBootstrapperExtensionEngine.h
index 97b02f36..a27ff186 100644
--- a/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/BextBootstrapperExtensionEngine.h
@@ -1,7 +1,7 @@
 #pragma once
 // 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.
 
-#include <IBundleExtensionEngine.h>
+#include <IBootstrapperExtensionEngine.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -9,10 +9,10 @@ extern "C" {
 
 // function declarations
 
-HRESULT BextBundleExtensionEngineCreate(
-    __in PFN_BUNDLE_EXTENSION_ENGINE_PROC pfnBundleExtensionEngineProc,
-    __in_opt LPVOID pvBundleExtensionEngineProcContext,
-    __out IBundleExtensionEngine** ppEngineForExtension
+HRESULT BextBootstrapperExtensionEngineCreate(
+    __in PFN_BOOTSTRAPPER_EXTENSION_ENGINE_PROC pfnBootstrapperExtensionEngineProc,
+    __in_opt LPVOID pvBootstrapperExtensionEngineProcContext,
+    __out IBootstrapperExtensionEngine** ppEngineForExtension
     );
 
 #ifdef __cplusplus
diff --git a/src/api/burn/bextutil/inc/IBootstrapperExtension.h b/src/api/burn/bextutil/inc/IBootstrapperExtension.h
new file mode 100644
index 00000000..4005a9fd
--- /dev/null
+++ b/src/api/burn/bextutil/inc/IBootstrapperExtension.h
@@ -0,0 +1,21 @@
+#pragma once
+// 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.
+
+#include <BootstrapperExtension.h>
+
+DECLARE_INTERFACE_IID_(IBootstrapperExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD")
+{
+    STDMETHOD(Search)(
+        __in LPCWSTR wzId,
+        __in LPCWSTR wzVariable
+        ) = 0;
+
+    // BootstrapperExtensionProc - The PFN_BOOTSTRAPPER_EXTENSION_PROC can call this method to give the BootstrapperExtension raw access to the callback from the engine.
+    //                       This might be used to help the BootstrapperExtension support more than one version of the engine.
+    STDMETHOD(BootstrapperExtensionProc)(
+        __in BOOTSTRAPPER_EXTENSION_MESSAGE message,
+        __in const LPVOID pvArgs,
+        __inout LPVOID pvResults,
+        __in_opt LPVOID pvContext
+        ) = 0;
+};
diff --git a/src/api/burn/bextutil/inc/IBundleExtensionEngine.h b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
index a4a27fb1..b23a57b7 100644
--- a/src/api/burn/bextutil/inc/IBundleExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
@@ -1,9 +1,9 @@
 #pragma once
 // 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.
 
-#include <BundleExtensionEngine.h>
+#include <BootstrapperExtensionEngine.h>
 
-DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263")
+DECLARE_INTERFACE_IID_(IBootstrapperExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263")
 {
     STDMETHOD(EscapeString)(
         __in_z LPCWSTR wzIn,
@@ -40,7 +40,7 @@ DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-973
         ) = 0;
 
     STDMETHOD(Log)(
-        __in BUNDLE_EXTENSION_LOG_LEVEL level,
+        __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level,
         __in_z LPCWSTR wzMessage
         ) = 0;
 
diff --git a/src/api/burn/bextutil/inc/IBundleExtension.h b/src/api/burn/bextutil/inc/IBundleExtension.h
deleted file mode 100644
index 00301672..00000000
--- a/src/api/burn/bextutil/inc/IBundleExtension.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-// 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.
-
-#include <BundleExtension.h>
-
-DECLARE_INTERFACE_IID_(IBundleExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD")
-{
-    STDMETHOD(Search)(
-        __in LPCWSTR wzId,
-        __in LPCWSTR wzVariable
-        ) = 0;
-
-    // BundleExtensionProc - The PFN_BUNDLE_EXTENSION_PROC can call this method to give the BundleExtension raw access to the callback from the engine.
-    //                       This might be used to help the BundleExtension support more than one version of the engine.
-    STDMETHOD(BundleExtensionProc)(
-        __in BUNDLE_EXTENSION_MESSAGE message,
-        __in const LPVOID pvArgs,
-        __inout LPVOID pvResults,
-        __in_opt LPVOID pvContext
-        ) = 0;
-};
diff --git a/src/api/burn/bextutil/inc/bextutil.h b/src/api/burn/bextutil/inc/bextutil.h
index b8536444..64633cf1 100644
--- a/src/api/burn/bextutil/inc/bextutil.h
+++ b/src/api/burn/bextutil/inc/bextutil.h
@@ -4,8 +4,8 @@
 
 #include "dutil.h"
 
-#include "IBundleExtensionEngine.h"
-#include "IBundleExtension.h"
+#include "IBootstrapperExtensionEngine.h"
+#include "IBootstrapperExtension.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,7 +33,7 @@ extern "C" {
 #define BextExitOnOptionalXmlQueryFailure(x, b, f, ...) BextExitOnOptionalXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, b, f, __VA_ARGS__)
 #define BextExitOnRequiredXmlQueryFailure(x, f, ...) BextExitOnRequiredXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__)
 
-const LPCWSTR BUNDLE_EXTENSION_MANIFEST_FILENAME = L"BundleExtensionData.xml";
+const LPCWSTR BOOTSTRAPPER_EXTENSION_MANIFEST_FILENAME = L"BootstrapperExtensionData.xml";
 
 
 /*******************************************************************
@@ -42,17 +42,17 @@ const LPCWSTR BUNDLE_EXTENSION_MANIFEST_FILENAME = L"BundleExtensionData.xml";
 
 ********************************************************************/
 DAPI_(void) BextInitialize(
-    __in IBundleExtensionEngine* pEngine
+    __in IBootstrapperExtensionEngine* pEngine
     );
 
 /*******************************************************************
- BextInitializeFromCreateArgs - convenience function to call BextBundleExtensionEngineCreate
+ BextInitializeFromCreateArgs - convenience function to call BextBootstrapperExtensionEngineCreate
                                 then pass it along to BextInitialize.
 
 ********************************************************************/
 DAPI_(HRESULT) BextInitializeFromCreateArgs(
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __out IBundleExtensionEngine** ppEngine
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBootstrapperExtensionEngine** ppEngine
     );
 
 /*******************************************************************
@@ -62,13 +62,13 @@ DAPI_(HRESULT) BextInitializeFromCreateArgs(
 DAPI_(void) BextUninitialize();
 
 /*******************************************************************
- BextGetBundleExtensionDataNode - gets the requested BundleExtension node.
+ BextGetBootstrapperExtensionDataNode - gets the requested BootstrapperExtension node.
 
 ********************************************************************/
-DAPI_(HRESULT) BextGetBundleExtensionDataNode(
+DAPI_(HRESULT) BextGetBootstrapperExtensionDataNode(
     __in IXMLDOMDocument* pixdManifest,
     __in LPCWSTR wzExtensionId,
-    __out IXMLDOMNode** ppixnBundleExtension
+    __out IXMLDOMNode** ppixnBootstrapperExtension
     );
 
 /*******************************************************************
@@ -76,7 +76,7 @@ DAPI_(HRESULT) BextGetBundleExtensionDataNode(
 
 ********************************************************************/
 DAPIV_(HRESULT) BextLog(
-    __in BUNDLE_EXTENSION_LOG_LEVEL level,
+    __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level,
     __in_z __format_string LPCSTR szFormat,
     ...
     );
@@ -86,7 +86,7 @@ DAPIV_(HRESULT) BextLog(
 
 ********************************************************************/
 DAPI_(HRESULT) BextLogArgs(
-    __in BUNDLE_EXTENSION_LOG_LEVEL level,
+    __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level,
     __in_z __format_string LPCSTR szFormat,
     __in va_list args
     );