ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update logging to reflect msvc updates on std::format (#883)

Browse source
This commit is contained in:
kizer 2022-06-17 17:28:10 +09:00 • committed by GitHub
parent c6cf47ea2d
commit 2f4c0bbc97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 238 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/CoreCLR/CoreCLR.cpp
View file

@ -83,7 +83,7 @@ int CoreCLR::load_runtime(const std::wstring& runtime_config_path, const struct
// Success_HostAlreadyInitialized
if (result == 1)
{
logging::print<logging::I>("Success_HostAlreadyInitialized (0x1)");
logging::I("Success_HostAlreadyInitialized (0x1)");
result = 0;
}

28
lib/CoreCLR/boot.cpp
View file

@ -63,7 +63,7 @@ int InitializeClrAndGetEntryPoint(
if (result != 0)
{
logging::print<logging::E>("Unable to get RoamingAppData path (err={})", result);
logging::E("Unable to get RoamingAppData path (err={})", result);
return result;
}
@ -73,13 +73,13 @@ int InitializeClrAndGetEntryPoint(
// =========================================================================== //
logging::print<logging::I>(L"with dotnet_path: {}", dotnet_path);
logging::print<logging::I>(L"with config_path: {}", runtimeconfig_path.c_str());
logging::print<logging::I>(L"with module_path: {}", module_path.c_str());
logging::I("with dotnet_path: {}", dotnet_path);
logging::I("with config_path: {}", runtimeconfig_path);
logging::I("with module_path: {}", module_path);
if (!std::filesystem::exists(dotnet_path))
{
logging::print<logging::E>("Error: Unable to find .NET runtime path");
logging::E("Error: Unable to find .NET runtime path");
return 1;
}
@ -90,13 +90,13 @@ int InitializeClrAndGetEntryPoint(
dotnet_path,
};
logging::print<logging::I>("Loading hostfxr...");
logging::I("Loading hostfxr...");
if ((result = g_clr->load_hostfxr(&init_parameters)) != 0)
{
logging::print<logging::E>("Failed to load the `hostfxr` library (err=0x{:08x})", result);
logging::E("Failed to load the `hostfxr` library (err=0x{:08x})", result);
return result;
}
logging::print<logging::I>("Done!");
logging::I("Done!");
// =========================================================================== //
@ -107,17 +107,17 @@ int InitializeClrAndGetEntryPoint(
dotnet_path,
};
logging::print<logging::I>("Loading coreclr... ");
logging::I("Loading coreclr... ");
if ((result = g_clr->load_runtime(runtimeconfig_path, &runtime_parameters)) != 0)
{
logging::print<logging::E>("Failed to load coreclr (err=0x{:08X})", static_cast<uint32_t>(result));
logging::E("Failed to load coreclr (err=0x{:08X})", static_cast<uint32_t>(result));
return result;
}
logging::print<logging::I>("Done!");
logging::I("Done!");
// =========================================================================== //
logging::print<logging::I>("Loading module...");
logging::I("Loading module...");
if ((result = g_clr->load_assembly_and_get_function_pointer(
module_path.c_str(),
entrypoint_assembly_name.c_str(),
@ -125,10 +125,10 @@ int InitializeClrAndGetEntryPoint(
entrypoint_delegate_type_name.c_str(),
nullptr, entrypoint_fn)) != 0)
{
logging::print<logging::E>("Failed to load module (err={})", result);
logging::E("Failed to load module (err={})", result);
return result;
}
logging::print<logging::I>("Done!");
logging::I("Done!");
// =========================================================================== //