ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 04:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into new_im_hooks

Browse source
This commit is contained in:
Soreepeong 2024-03-21 00:39:26 +09:00
commit 50f74c55a7
460 changed files with 40079 additions and 12893 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/CoreCLR/boot.cpp
View file

@ -27,7 +27,7 @@ void ConsoleTeardown()
std::optional<CoreCLR> g_clr;
int InitializeClrAndGetEntryPoint(
HRESULT InitializeClrAndGetEntryPoint(
void* calling_module,
bool enable_etw,
std::wstring runtimeconfig_path,
@ -76,7 +76,7 @@ int InitializeClrAndGetEntryPoint(
if (result != 0)
{
logging::E("Unable to get RoamingAppData path (err={})", result);
return result;
return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
}
std::filesystem::path fs_app_data(_appdata);
@ -92,7 +92,7 @@ int InitializeClrAndGetEntryPoint(
if (!std::filesystem::exists(dotnet_path))
{
logging::E("Error: Unable to find .NET runtime path");
return 1;
return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
}
get_hostfxr_parameters init_parameters
@ -137,12 +137,12 @@ int InitializeClrAndGetEntryPoint(
entrypoint_delegate_type_name.c_str(),
nullptr, entrypoint_fn)) != 0)
{
logging::E("Failed to load module (err={})", result);
logging::E("Failed to load module (err=0x{:X})", static_cast<uint32_t>(result));
return result;
}
logging::I("Done!");
// =========================================================================== //
return 0;
return S_OK;
}

2
lib/CoreCLR/boot.h
View file

@ -1,7 +1,7 @@
void ConsoleSetup(const std::wstring console_name);
void ConsoleTeardown();
int InitializeClrAndGetEntryPoint(
HRESULT InitializeClrAndGetEntryPoint(
void* calling_module,
bool enable_etw,
std::wstring runtimeconfig_path,

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 9b2eab0f212030c062427b307b96118881d36b99
Subproject commit ac2ced26fc98153c65f5b8f0eaf0f464258ff683