archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 09:48:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

ux: Update vcredist links and optionally disable help text from error dialog

Browse source
This commit is contained in:
kd-11 2022-12-06 18:26:38 +03:00 • committed by Megamouse
parent a6b44ea1bb
commit 0aaa40cd53
6 changed files with 52 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/module_verifier.hpp
View file

@ -11,7 +11,7 @@
#include <Utilities/StrUtil.h>
#include <Utilities/StrFmt.h>
[[noreturn]] void report_fatal_error(std::string_view, bool);
[[noreturn]] void report_fatal_error(std::string_view text, bool is_html = false, bool include_help_text = true);
// Validates that system modules are properly installed
// Only relevant for WIN32
@ -26,10 +26,10 @@ class WIN32_module_verifier
const std::vector<module_info_t> special_module_infos = {
{ L"vulkan-1.dll", "Vulkan Runtime", "https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-runtime.exe" },
{ L"msvcp140.dll", "C++ Redistributable for Visual Studio 2015", "https://www.microsoft.com/en-us/download/details.aspx?id=48145" },
{ L"vcruntime140.dll", "C++ Redistributable for Visual Studio 2015", "https://www.microsoft.com/en-us/download/details.aspx?id=48145" },
{ L"msvcp140_1.dll", "C++ Redistributable for Visual Studio 2015", "https://www.microsoft.com/en-us/download/details.aspx?id=48145" },
{ L"vcruntime140_1.dll", "C++ Redistributable for Visual Studio 2015", "https://www.microsoft.com/en-us/download/details.aspx?id=48145" }
{ L"msvcp140.dll", "Microsoft Visual C++ 2015-2019 Redistributable", "https://aka.ms/vs/16/release/VC_redist.x64.exe" },
{ L"vcruntime140.dll", "Microsoft Visual C++ 2015-2019 Redistributable", "https://aka.ms/vs/16/release/VC_redist.x64.exe" },
{ L"msvcp140_1.dll", "Microsoft Visual C++ 2015-2019 Redistributable", "https://aka.ms/vs/16/release/VC_redist.x64.exe" },
{ L"vcruntime140_1.dll", "Microsoft Visual C++ 2015-2019 Redistributable", "https://aka.ms/vs/16/release/VC_redist.x64.exe" }
};
// Unless we support ReactOS in future, this is a constant
@ -54,8 +54,8 @@ class WIN32_module_verifier
{
const auto error_message = fmt::format(
"<p>"
"The module '%s' was incorrectly installed.<br>"
"This module is part of the '%s' package.<br>"
"The module <strong>%s</strong> was incorrectly installed.<br>"
"This module is part of the <strong>%s</strong> package.<br>"
"You can install this package from this URL:<br>"
"<a href='%s'>%s</a>"
"</p>",
@ -64,7 +64,7 @@ class WIN32_module_verifier
module.dl_link,
module.dl_link
);
report_fatal_error(error_message, true);
report_fatal_error(error_message, true, false);
}
}
}