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

Boot.cpp getenv improvement

Browse source
This commit is contained in:
Raymond 2021-08-15 15:01:24 -04:00
parent 3cb15f2b9e
commit 3683ae148e
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/CoreCLR/boot.cpp
View file

@ -1,5 +1,4 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define _CRT_SECURE_NO_WARNINGS
#include <cstdio> #include <cstdio>
#include <filesystem> #include <filesystem>
@ -36,12 +35,20 @@ int InitializeClrAndGetEntryPoint(
CoreCLR clr; CoreCLR clr;
SetEnvironmentVariable(L"DOTNET_MULTILEVEL_LOOKUP", L"0"); SetEnvironmentVariable(L"DOTNET_MULTILEVEL_LOOKUP", L"0");
char* env_path = std::getenv("DALAMUD_RUNTIME");
wchar_t* dotnet_path; wchar_t* dotnet_path;
wchar_t* _appdata; wchar_t* _appdata;
if (!env_path) std::wstring buffer;
buffer.resize(0);
result = GetEnvironmentVariableW(L"DALAMUD_RUNTIME", &buffer[0], 0);
if (result)
{
buffer.resize(result); // The first pass returns the required length
result = GetEnvironmentVariableW(L"DALAMUD_RUNTIME", &buffer[0], result);
dotnet_path = _wcsdup(buffer.c_str());
}
else
{ {
result = SHGetKnownFolderPath(FOLDERID_RoamingAppData, KF_FLAG_DEFAULT, nullptr, &_appdata); result = SHGetKnownFolderPath(FOLDERID_RoamingAppData, KF_FLAG_DEFAULT, nullptr, &_appdata);
@ -54,12 +61,6 @@ int InitializeClrAndGetEntryPoint(
std::filesystem::path fs_app_data(_appdata); std::filesystem::path fs_app_data(_appdata);
dotnet_path = _wcsdup(fs_app_data.append("XIVLauncher").append("runtime").c_str()); dotnet_path = _wcsdup(fs_app_data.append("XIVLauncher").append("runtime").c_str());
} }
else
{
const size_t cSize = strlen(env_path)+1;
dotnet_path = new wchar_t[cSize];
mbstowcs (dotnet_path, env_path, cSize);
}
// =========================================================================== // // =========================================================================== //