Skip to content

[2.0-stable] Fix: Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars #6329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agniuks merged 2 commits into from
Mar 25, 2026
Merged

[2.0-stable] Fix: Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLastFailure logging single chars #6329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
582361d
Fix: Deployment exceptions masked as ERROR_UNHANDLED_EXCEPTION; SetLa…
agniuks Mar 23, 2026
978ca6c
Merge branch 'release/2.0-stable' into user/agnel/telemetryfixes20
agniuks Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dev/Common/WindowsAppRuntimeAutoInitializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#include <wil/cppwinrt.h>

// Forward-declare the various AutoInitialize functions
namespace Microsoft::Windows::ApplicationModel::DynamicDependency::Bootstrap
{
Expand Down
6 changes: 3 additions & 3 deletions dev/Deployment/DeploymentActivityContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil:

if (failure.pszFile)
{
m_lastFailure.file = *failure.pszFile;
m_lastFailure.file = failure.pszFile;
}
else
{
Expand All @@ -48,7 +48,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil:

if (failure.pszMessage)
{
m_lastFailure.message = *failure.pszMessage;
m_lastFailure.message = failure.pszMessage;
}
else
{
Expand All @@ -57,7 +57,7 @@ void WindowsAppRuntime::Deployment::Activity::Context::SetLastFailure(const wil:

if (failure.pszModule)
{
m_lastFailure.module = *failure.pszModule;
m_lastFailure.module = failure.pszModule;
}
else
{
Expand Down
8 changes: 4 additions & 4 deletions dev/Deployment/DeploymentManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,17 +232,17 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
{
deploymentResult = _Initialize(initializeActivityContext, packageFullName, deploymentInitializeOptions, isRepair);
}
catch (winrt::hresult_error const& e)
catch (...)
{
const HRESULT hr{ e.code() };
const HRESULT hr{ wil::ResultFromCaughtException() };

auto packageIdentity{ AppModel::Identity::PackageIdentity::FromPackageFullName(packageFullName.c_str()) };
PCWSTR c_packageNamePrefix{ L"microsoft.windowsappruntime." };
const size_t c_packageNamePrefixLength{ ARRAYSIZE(L"microsoft.windowsappruntime.") - 1 };
std::wstring release;
if (CompareStringOrdinal(packageIdentity.Name(), -1, c_packageNamePrefix, -1, TRUE) == CSTR_EQUAL)
{
release = packageIdentity.Name() + c_packageNamePrefixLength;
release = packageIdentity.Name() + c_packageNamePrefixLength;
}
else
{
Expand All @@ -265,7 +265,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem

THROW_HR_MSG(hr, "PackageFullName=%ls Options: ForceDeployment=%c OnErrorShowUI=%c isRepair:%c",
packageFullName.c_str(), deploymentInitializeOptions.ForceDeployment() ? 'Y' : 'N',
deploymentInitializeOptions.OnErrorShowUI() ? 'Y' : 'N', isRepair ? 'Y' : 'N' );
deploymentInitializeOptions.OnErrorShowUI() ? 'Y' : 'N', isRepair ? 'Y' : 'N');
}

// Success!
Expand Down
2 changes: 2 additions & 0 deletions dev/Deployment/DeploymentManagerAutoInitializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <Windows.h>
#include <stdlib.h>

#include <wil/cppwinrt.h>

#include <winrt/Windows.Foundation.h>
#include <winrt/Windows.Foundation.Collections.h>

Expand Down
2 changes: 2 additions & 0 deletions dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <Windows.h>
#include <stdlib.h>

#include <wil/cppwinrt.h>

// Ensure the including PE file has an import reference to
// the WindowsAppSDK runtime DLL and thus gets loaded when
// the including PE file gets loaded.
Expand Down
6 changes: 3 additions & 3 deletions dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapActivity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi

if (failure.pszFile)
{
m_lastFailure.file = *failure.pszFile;
m_lastFailure.file = failure.pszFile;
}
else
{
Expand All @@ -29,7 +29,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi

if (failure.pszMessage)
{
m_lastFailure.message = *failure.pszMessage;
m_lastFailure.message = failure.pszMessage;
}
else
{
Expand All @@ -38,7 +38,7 @@ void WindowsAppRuntime::MddBootstrap::Activity::Context::SetLastFailure(const wi

if (failure.pszModule)
{
m_lastFailure.module = *failure.pszModule;
m_lastFailure.module = failure.pszModule;
}
else
{
Expand Down
3 changes: 3 additions & 0 deletions dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapAutoInitializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#include <Windows.h>
#include <stdint.h>
#include <stdlib.h>

#include <wil/cppwinrt.h>

#include <MddBootstrap.h>
#include <WindowsAppSDK-VersionInfo.h>

Expand Down
4 changes: 2 additions & 2 deletions installer/dev/InstallActivityContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const

if (failure.pszFile)
{
m_lastFailure.file = *failure.pszFile;
m_lastFailure.file = failure.pszFile;
}
else
{
Expand All @@ -48,7 +48,7 @@ void WindowsAppRuntimeInstaller::InstallActivity::Context::SetLastFailure(const

if (failure.pszMessage)
{
m_lastFailure.message = *failure.pszMessage;
m_lastFailure.message = failure.pszMessage;
}
else
{
Expand Down