Fix errors in the installer. (#3796) (#3806)

microsoft · Aug 22, 2023 · c90ac9b · c90ac9b
1 parent 8a25a99
commit c90ac9b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/installer/dev/InstallActivityContext.cpp b/installer/dev/InstallActivityContext.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 #include "pch.h"
@@ -65,7 +65,7 @@ BOOL WindowsAppRuntimeInstaller::InstallActivity::Context::LogInstallerCommandLi
         WCHAR message[1024]{};
         PCWSTR messageFormat{ L"Windows App Runtime Installer (ActivityId: %s) is called with Command Line Args: %s" };
         auto installerActivityId{ winrt::to_hstring(*m_activity.Id()) };
-        FAIL_FAST_IF_FAILED(StringCchPrintfW(message, ARRAYSIZE(message), messageFormat, installerActivityId, cmdlineArgs));
+        FAIL_FAST_IF_FAILED(StringCchPrintfW(message, ARRAYSIZE(message), messageFormat, installerActivityId.data(), cmdlineArgs));
         PCWSTR messageStrings[1]{ message };
         return ReportEventW(m_hEventLog, EVENTLOG_INFORMATION_TYPE, 0, eventId, nullptr, ARRAYSIZE(messageStrings), 0, messageStrings, nullptr);
     }
@@ -76,8 +76,6 @@ BOOL WindowsAppRuntimeInstaller::InstallActivity::Context::LogInstallerFailureEv
 {
     if (m_hEventLog)
     {
-        std::wstring customMessage{};
-
         switch (m_installStage)
         {
             case InstallStage::None:
@@ -98,15 +96,15 @@ BOOL WindowsAppRuntimeInstaller::InstallActivity::Context::LogInstallerFailureEv
             case InstallStage::AddPackage:
             {
                 WCHAR customMessage[1024]{};
-                auto deploymentActivityId{ winrt::to_hstring(*m_activity.Id()) };
+                auto deploymentErrorActivityId{ winrt::to_hstring(m_deploymentErrorActivityId) };
                 auto customMessageFormat{ L"Installing Package %s with DeploymentExtendedError: 0x%08X, DeploymentExtendedText:%s, DeploymentActivityId: %s" };
                 FAIL_FAST_IF_FAILED(StringCchPrintfW(customMessage,
                                                      ARRAYSIZE(customMessage),
                                                      customMessageFormat,
-                                                     m_currentResourceId,
+                                                     m_currentResourceId.c_str(),
                                                      m_deploymentErrorExtendedHresult,
-                                                     m_deploymentErrorText,
-                                                     m_deploymentErrorActivityId));
+                                                     m_deploymentErrorText.c_str(),
+                                                     deploymentErrorActivityId.data()));
                 THROW_IF_WIN32_BOOL_FALSE(LogInstallerFailureEventWithResourceId(EVENTLOG_ERROR_TYPE, hresult, customMessage));
                 break;
             }
@@ -125,22 +123,22 @@ BOOL WindowsAppRuntimeInstaller::InstallActivity::Context::LogInstallerFailureEv
                 WCHAR customProvisionMessage[1024]{};
                 auto provisionActivityId{ winrt::to_hstring(*m_activity.Id()) };
                 auto customProvisionMessageFormat{ L"Provisioning Package %s (Activity Id:%s)" };
-                FAIL_FAST_IF_FAILED(StringCchPrintfW(customProvisionMessage, ARRAYSIZE(customProvisionMessage), customProvisionMessageFormat, provisionActivityId));
+                FAIL_FAST_IF_FAILED(StringCchPrintfW(customProvisionMessage, ARRAYSIZE(customProvisionMessage), customProvisionMessageFormat, m_currentResourceId.c_str(), provisionActivityId.data()));
                 THROW_IF_WIN32_BOOL_FALSE(LogInstallerFailureEventWithResourceId(EVENTLOG_WARNING_TYPE, hresult, customProvisionMessage));
                 break;
             }
             case InstallStage::StagePackage:
             {
                 WCHAR customMessage[1024]{};
-                auto deploymentActivityId{ winrt::to_hstring(*m_activity.Id()) };
+                auto deploymentErrorActivityId{ winrt::to_hstring(m_deploymentErrorActivityId) };
                 auto customMessageFormat{ L"Staging Package %s with DeploymentExtendedError: 0x%08X, DeploymentExtendedText:%s, DeploymentActivityId: %s" };
                 FAIL_FAST_IF_FAILED(StringCchPrintfW(customMessage,
                                                      ARRAYSIZE(customMessage),
                                                      customMessageFormat,
-                                                     m_currentResourceId,
+                                                     m_currentResourceId.c_str(),
                                                      m_deploymentErrorExtendedHresult,
-                                                     m_deploymentErrorText,
-                                                     m_deploymentErrorActivityId));
+                                                     m_deploymentErrorText.c_str(),
+                                                     deploymentErrorActivityId.data()));
                 THROW_IF_WIN32_BOOL_FALSE(LogInstallerFailureEventWithResourceId(EVENTLOG_ERROR_TYPE, hresult, customMessage));
                 break;
             }
@@ -166,7 +164,7 @@ BOOL WindowsAppRuntimeInstaller::InstallActivity::Context::LogInstallerFailureEv
         WCHAR message[1024]{};
         PCWSTR messageFormat{ L"Error 0x%08X: Windows App Runtime Installer (Activity ID: %s) failed in %s" };
         auto installerActivityId{ winrt::to_hstring(*m_activity.Id()) };
-        FAIL_FAST_IF_FAILED(StringCchPrintfW(message, ARRAYSIZE(message), messageFormat, hresult, installerActivityId, (resourceId ? failedComponentMessage : failedComponentMessageFormat)));
+        FAIL_FAST_IF_FAILED(StringCchPrintfW(message, ARRAYSIZE(message), messageFormat, hresult, installerActivityId.data(), (resourceId ? failedComponentMessage : failedComponentMessageFormat)));
 
         PCWSTR messageStrings[1]{ message };
         return ReportEventW(m_hEventLog, eventLogType, 0, eventId, nullptr, ARRAYSIZE(messageStrings), 0, messageStrings, nullptr);

diff --git a/installer/dev/InstallActivityContext.h b/installer/dev/InstallActivityContext.h
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 #pragma once
@@ -137,7 +137,7 @@ namespace WindowsAppRuntimeInstaller::InstallActivity
             return m_hEventLog;
         }
 
-        const BOOL& DeregisterInstallerEventSourceW()
+        const BOOL DeregisterInstallerEventSourceW()
         {
             return DeregisterEventSource(m_hEventLog);
         }

diff --git a/installer/dev/install.cpp b/installer/dev/install.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 #include "pch.h"
@@ -35,6 +35,8 @@ namespace WindowsAppRuntimeInstaller
 
             RETURN_HR(static_cast<HRESULT>(deploymentResult.ExtendedErrorCode() ? deploymentResult.ExtendedErrorCode() : deploymentOperation.ErrorCode()));
         }
+
+        return S_OK;
     }
 
     HRESULT RegisterPackage(