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

Correct return types on boot

Browse source
This commit is contained in:
Soreepeong 2022-03-31 23:29:37 +09:00
parent 0cf9b80172
commit 6da762dc3c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/CoreCLR/CoreCLR.cpp
View file

@ -37,12 +37,12 @@ int CoreCLR::load_hostfxr(const struct get_hostfxr_parameters* parameters)
&& m_hostfxr_close_fptr ? 0 : -1; && m_hostfxr_close_fptr ? 0 : -1;
} }
bool CoreCLR::load_runtime(const std::wstring& runtime_config_path) int CoreCLR::load_runtime(const std::wstring& runtime_config_path)
{ {
return CoreCLR::load_runtime(runtime_config_path, nullptr); return CoreCLR::load_runtime(runtime_config_path, nullptr);
} }
bool CoreCLR::load_runtime(const std::wstring& runtime_config_path, const struct hostfxr_initialize_parameters* parameters) int CoreCLR::load_runtime(const std::wstring& runtime_config_path, const struct hostfxr_initialize_parameters* parameters)
{ {
int result; int result;

4
lib/CoreCLR/CoreCLR.h
View file

@ -12,8 +12,8 @@ class CoreCLR {
int load_hostfxr(); int load_hostfxr();
int load_hostfxr(const get_hostfxr_parameters* parameters); int load_hostfxr(const get_hostfxr_parameters* parameters);
bool load_runtime(const std::wstring& runtime_config_path); int load_runtime(const std::wstring& runtime_config_path);
bool load_runtime( int load_runtime(
const std::wstring& runtime_config_path, const std::wstring& runtime_config_path,
const struct hostfxr_initialize_parameters* parameters); const struct hostfxr_initialize_parameters* parameters);

2
lib/CoreCLR/boot.cpp
View file

@ -90,7 +90,7 @@ int InitializeClrAndGetEntryPoint(
printf("Loading hostfxr... "); printf("Loading hostfxr... ");
if ((result = g_clr->load_hostfxr(&init_parameters)) != 0) if ((result = g_clr->load_hostfxr(&init_parameters)) != 0)
{ {
printf("\nError: Failed to load the `hostfxr` library (err=%d)\n", result); printf("\nError: Failed to load the `hostfxr` library (err=0x%08x)\n", result);
return result; return result;
} }
printf("Done!\n"); printf("Done!\n");