Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2024-12-23 12:09:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2586 from SChernykh/dev

Browse source 
Fixed Windows 7 compatibility
This commit is contained in:
xmrig 2021-09-17 17:11:09 +07:00 committed by GitHub
commit 6d66051d92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/base/io/Env.cpp
View file

@ -142,10 +142,30 @@ xmrig::String xmrig::Env::get(const String &name, const std::map<String, String>
xmrig::String xmrig::Env::hostname() xmrig::String xmrig::Env::hostname()
{ {
# ifdef _WIN32
const HMODULE hLib = LoadLibraryA("Ws2_32.dll");
if (hLib) {
typedef int (WSAAPI* GetHostNameW_proc)(PWSTR, int);
GetHostNameW_proc GetHostNameW_ptr = reinterpret_cast<GetHostNameW_proc>(GetProcAddress(hLib, "GetHostNameW"));
if (GetHostNameW_ptr) {
WCHAR buf[UV_MAXHOSTNAMESIZE];
if (GetHostNameW_ptr(buf, UV_MAXHOSTNAMESIZE) != 0) {
return {};
}
char utf8_str[UV_MAXHOSTNAMESIZE * 4 + 1];
const int len = WideCharToMultiByte(CP_UTF8, 0, buf, -1, utf8_str, sizeof(utf8_str), nullptr, nullptr);
if (len <= 0) {
return {};
}
return utf8_str;
}
}
# endif
char buf[UV_MAXHOSTNAMESIZE]{}; char buf[UV_MAXHOSTNAMESIZE]{};
size_t size = sizeof(buf); size_t size = sizeof(buf);
# if UV_VERSION_HEX >= 0x010c00 # if (UV_VERSION_HEX >= 0x010c00) && !defined(_WIN32)
if (uv_os_gethostname(buf, &size) == 0) { if (uv_os_gethostname(buf, &size) == 0) {
return static_cast<const char *>(buf); return static_cast<const char *>(buf);
} }