Skip to content

Fix MrmGetFilePathFromName regression for unpackaged apps in WinAppSDK 1.8 #27

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

Open
qiutongMS wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix MrmGetFilePathFromName regression for unpackaged apps in WinAppSDK 1.8 #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions dev/MRTCore/mrt/Core/src/MRM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,9 +992,15 @@ STDAPI MrmGetFilePathFromName(_In_opt_ PCWSTR filename, _Outptr_ PWSTR* filePath
wil::unique_cotaskmem_string baseDir;
if (SUCCEEDED(wil::TryGetEnvironmentVariableW(L"MICROSOFT_WINDOWSAPPRUNTIME_BASE_DIRECTORY", baseDir)) && baseDir)
{
path.swap(baseDir);
RETURN_IF_FAILED(StringCchLengthW(path.get(), STRSAFE_MAX_CCH, &length));
RETURN_IF_FAILED(SizeTAdd(length, 1, &bufferCount));
// Validate that the base directory is accessible before using it
DWORD baseDirAttributes = GetFileAttributes(baseDir.get());
if (baseDirAttributes != INVALID_FILE_ATTRIBUTES && (baseDirAttributes & FILE_ATTRIBUTE_DIRECTORY))
{
path.swap(baseDir);
RETURN_IF_FAILED(StringCchLengthW(path.get(), STRSAFE_MAX_CCH, &length));
RETURN_IF_FAILED(SizeTAdd(length, 1, &bufferCount));
}
// If base directory is invalid, continue with the original exe path
}
filenameToUse = c_defaultPriFilename;
}
Expand Down