ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 21:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: move VEH init before CLR init

Browse source
This commit is contained in:
goat 2021-11-01 21:35:27 +01:00
parent 9ca0ca3d39
commit 3371f2c9e8
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Dalamud.Boot/dllmain.cpp
View file

@ -36,6 +36,20 @@ DllExport DWORD WINAPI Initialize(LPVOID lpParam)
std::wstring runtimeconfig_path = _wcsdup(fs_module_path.replace_filename(L"Dalamud.runtimeconfig.json").c_str()); std::wstring runtimeconfig_path = _wcsdup(fs_module_path.replace_filename(L"Dalamud.runtimeconfig.json").c_str());
std::wstring module_path = _wcsdup(fs_module_path.replace_filename(L"Dalamud.dll").c_str()); std::wstring module_path = _wcsdup(fs_module_path.replace_filename(L"Dalamud.dll").c_str());
// ============================== VEH ======================================== //
printf("Initializing VEH... ");
if(is_running_on_linux())
{
printf("Failed! [Disabled for Wine]\n");
}
else
{
if (veh::add_handler())
printf("Done!\n");
else printf("Failed!\n");
}
// =========================================================================== // // =========================================================================== //
void* entrypoint_vfn; void* entrypoint_vfn;
@ -57,22 +71,6 @@ DllExport DWORD WINAPI Initialize(LPVOID lpParam)
entrypoint_fn(lpParam); entrypoint_fn(lpParam);
printf("Done!\n"); printf("Done!\n");
// ============================== VEH ======================================== //
printf("Initializing VEH... ");
if(is_running_on_linux())
{
printf("Failed! [Disabled for Wine]\n");
}
else
{
if (veh::add_handler())
printf("Done!\n");
else printf("Failed!\n");
}
// =========================================================================== //
#ifndef NDEBUG #ifndef NDEBUG
fclose(stdin); fclose(stdin);
fclose(stdout); fclose(stdout);