Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-11-27 13:14:01 +08:00
Code Issues 1 Projects Releases Wiki Activity

* use const ref for get/set env var

Browse Source 
* lock global mutex when generating steam api call id
This commit is contained in:
otavepto 2024-03-22 19:31:24 +02:00 committed by otavepto
parent 6b721266ea
commit 2427ee12fd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dll/base.cpp
View File

@ -29,7 +29,7 @@ void randombytes(char *buf, size_t size)
} }
std::string get_env_variable(std::string name) std::string get_env_variable(const std::string &name)
{ {
wchar_t env_variable[1024]{}; wchar_t env_variable[1024]{};
DWORD ret = GetEnvironmentVariableW(utf8_decode(name).c_str(), env_variable, _countof(env_variable)); DWORD ret = GetEnvironmentVariableW(utf8_decode(name).c_str(), env_variable, _countof(env_variable));
@ -41,7 +41,7 @@ std::string get_env_variable(std::string name)
return utf8_encode(env_variable); return utf8_encode(env_variable);
} }
bool set_env_variable(std::string name, std::string value) bool set_env_variable(const std::string &name, const std::string &value)
{ {
return SetEnvironmentVariableW(utf8_decode(name).c_str(), utf8_decode(value).c_str()); return SetEnvironmentVariableW(utf8_decode(name).c_str(), utf8_decode(value).c_str());
} }
@ -76,7 +76,7 @@ void randombytes(char *buf, size_t size)
} }
} }
std::string get_env_variable(std::string name) std::string get_env_variable(const std::string &name)
{ {
char *env = getenv(name.c_str()); char *env = getenv(name.c_str());
if (!env) { if (!env) {
@ -86,7 +86,7 @@ std::string get_env_variable(std::string name)
return std::string(env); return std::string(env);
} }
bool set_env_variable(std::string name, std::string value) bool set_env_variable(const std::string &name, const std::string &value)
{ {
return setenv(name.c_str(), value.c_str(), 1) == 0; return setenv(name.c_str(), value.c_str(), 1) == 0;
} }
@ -119,6 +119,8 @@ CSteamID generate_steam_anon_user()
SteamAPICall_t generate_steam_api_call_id() { SteamAPICall_t generate_steam_api_call_id() {
static SteamAPICall_t a; static SteamAPICall_t a;
std::lock_guard<std::recursive_mutex> lock(global_mutex);
randombytes((char *)&a, sizeof(a)); randombytes((char *)&a, sizeof(a));
++a; ++a;
if (a == 0) ++a; if (a == 0) ++a;

4
dll/dll/base.h
View File

@ -32,8 +32,8 @@ extern const std::chrono::time_point<std::chrono::high_resolution_clock> startup
extern const std::chrono::time_point<std::chrono::system_clock> startup_time; extern const std::chrono::time_point<std::chrono::system_clock> startup_time;
void randombytes(char *buf, size_t size); void randombytes(char *buf, size_t size);
std::string get_env_variable(std::string name); std::string get_env_variable(const std::string &name);
bool set_env_variable(std::string name, std::string value); bool set_env_variable(const std::string &name, const std::string &value);
bool check_timedout(std::chrono::high_resolution_clock::time_point old, double timeout); bool check_timedout(std::chrono::high_resolution_clock::time_point old, double timeout);
class CCallbackMgr class CCallbackMgr