asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #96526 from bruvzg/win_env

Browse source 
[Windows] Use the same API for all `OS_Windows::*_environment` functions.
This commit is contained in:
Rémi Verschelde 2024-09-04 18:55:46 +02:00
commit 82799d7687
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platform/windows/os_windows.cpp
View file

@ -1614,16 +1614,7 @@ String OS_Windows::get_executable_path() const {
} }
bool OS_Windows::has_environment(const String &p_var) const { bool OS_Windows::has_environment(const String &p_var) const {
#ifdef MINGW_ENABLED return GetEnvironmentVariableW((LPCWSTR)(p_var.utf16().get_data()), nullptr, 0) > 0;
return _wgetenv((LPCWSTR)(p_var.utf16().get_data())) != nullptr;
#else
WCHAR *env;
size_t len;
_wdupenv_s(&env, &len, (LPCWSTR)(p_var.utf16().get_data()));
const bool has_env = env != nullptr;
free(env);
return has_env;
#endif
} }
String OS_Windows::get_environment(const String &p_var) const { String OS_Windows::get_environment(const String &p_var) const {