From 3259bdcbe840e549f5264279664d3c0554a1f7b6 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Tue, 9 Mar 2021 20:26:37 +0100 Subject: [PATCH] Add Windows OS version --- src/dev/win32/hasp_win32.cpp | 2 +- src/dev/win32/hasp_win32.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/dev/win32/hasp_win32.cpp b/src/dev/win32/hasp_win32.cpp index 6142cdb8..2a30ec1d 100644 --- a/src/dev/win32/hasp_win32.cpp +++ b/src/dev/win32/hasp_win32.cpp @@ -52,7 +52,7 @@ void Win32Device::set_hostname(const char* hostname) } const char* Win32Device::get_core_version() { - return "win32"; + return _core_version.c_str(); } const char* Win32Device::get_display_driver() { diff --git a/src/dev/win32/hasp_win32.h b/src/dev/win32/hasp_win32.h index 75f72bac..f833b60f 100644 --- a/src/dev/win32/hasp_win32.h +++ b/src/dev/win32/hasp_win32.h @@ -35,6 +35,17 @@ class Win32Device : public BaseDevice { _hostname = "localhost"; } + // Get the Windows version. + DWORD dwBuild = 0; + DWORD dwVersion = GetVersion(); + DWORD dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion))); + DWORD dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion))); + if(dwVersion < 0x80000000) dwBuild = (DWORD)(HIWORD(dwVersion)); + + char version[128]; + snprintf(version, sizeof(version), "Windows %d.%d-%d", dwMajorVersion, dwMinorVersion, dwBuild); + _core_version = version; + // _backlight_pin = -1; _backlight_power = 1; _backlight_level = 100; @@ -63,6 +74,7 @@ class Win32Device : public BaseDevice { private: std::string _hostname; + std::string _core_version; uint8_t _backlight_pin; uint8_t _backlight_level;