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

Revert "fix: move VEH init before CLR init"

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

30
Dalamud.Boot/dllmain.cpp
View file

@ -36,20 +36,6 @@ 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;
@ -71,6 +57,22 @@ 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);

2
Dalamud/EntryPoint.cs
View file

@ -76,7 +76,7 @@ namespace Dalamud
// This is due to GitHub not supporting TLS 1.0, so we enable all TLS versions globally // This is due to GitHub not supporting TLS 1.0, so we enable all TLS versions globally
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls; ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls;
if (!Util.IsLinux()) if (!Util.IsLinux())
InitSymbolHandler(info); InitSymbolHandler(info);