Skip to content

Add fallback for MrmGetFilePathFromName #5828

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add fallback for MrmGetFilePathFromName #5828

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
20 changes: 17 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 @@ -988,6 +988,7 @@ STDAPI MrmGetFilePathFromName(_In_opt_ PCWSTR filename, _Outptr_ PWSTR* filePath
BaseDirForModulePri,
exeDirForResourcesPri,
exeDirForModulePri,
DefaultFallback,
Final,
};
SearchPass searchStart = SearchPass::exeDirForFileName;
Expand Down Expand Up @@ -1052,6 +1053,18 @@ STDAPI MrmGetFilePathFromName(_In_opt_ PCWSTR filename, _Outptr_ PWSTR* filePath
searchFilename = modulePriFileName;
pass = SearchPass::Final;
break;
case SearchPass::DefaultFallback:
searchDir = exeDir.get();
searchDirCount = exeDirCount;
if (filename == nullptr || *filename == L'\0')
{
searchFilename = ResourcesPriFileName;
}
else
{
searchFilename = filename;
}
break;
}

size_t searchFilenameCount;
Expand All @@ -1074,13 +1087,14 @@ STDAPI MrmGetFilePathFromName(_In_opt_ PCWSTR filename, _Outptr_ PWSTR* filePath
PATHCCH_ALLOW_LONG_PATHS));

DWORD attributes = GetFileAttributes(outputPath.get());
if ((attributes != INVALID_FILE_ATTRIBUTES) && !(attributes & FILE_ATTRIBUTE_DIRECTORY))
if ((pass == SearchPass::DefaultFallback) ||
((attributes != INVALID_FILE_ATTRIBUTES) && !(attributes & FILE_ATTRIBUTE_DIRECTORY)))
{
// The file exists. Done.
*filePath = outputPath.release();
return S_OK;
break;
}
}

return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
return S_OK;
}