From 3d2b5ea6b691f077155abf0a4ef44cca14d7fcc4 Mon Sep 17 00:00:00 2001
From: xinsheng Ren <285808407@qq.com>
Date: Tue, 31 Jan 2023 00:49:18 +0800
Subject: [PATCH] Fix/xsren/td 20179/win version info (#19708)

* fix:get system info on windows

* fix:head file

* fix:del tchar.h
---
 source/os/CMakeLists.txt   |  2 +-
 source/os/src/osSysinfo.c  | 37 ++++++++++++++++++++++++++++++++++++-
 source/os/test/osTests.cpp |  6 ++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/source/os/CMakeLists.txt b/source/os/CMakeLists.txt
index 3aac5e9775..2a4fcbcf76 100644
--- a/source/os/CMakeLists.txt
+++ b/source/os/CMakeLists.txt
@@ -41,7 +41,7 @@ target_link_libraries(
 )
 if(TD_WINDOWS)
     target_link_libraries(
-        os PUBLIC ws2_32 iconv msvcregex wcwidth winmm crashdump dbghelp
+        os PUBLIC ws2_32 iconv msvcregex wcwidth winmm crashdump dbghelp version
     )
 elseif(TD_DARWIN_64)
     find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation)
diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c
index 9ba8468438..b5c6edc829 100644
--- a/source/os/src/osSysinfo.c
+++ b/source/os/src/osSysinfo.c
@@ -280,11 +280,46 @@ int32_t taosGetEmail(char *email, int32_t maxLen) {
 #endif
 }
 
+#ifdef WINDOWS
+bool getWinVersionReleaseName(char *releaseName, int32_t maxLen) {
+  TCHAR          szFileName[MAX_PATH];
+  DWORD             dwHandle;
+  DWORD             dwLen;
+  LPVOID            lpData;
+  UINT              uLen;
+  VS_FIXEDFILEINFO *pFileInfo;
+
+  GetWindowsDirectory(szFileName, MAX_PATH);
+  wsprintf(szFileName, L"%s%s", szFileName, L"\\explorer.exe");
+  dwLen = GetFileVersionInfoSize(szFileName, &dwHandle);
+  if (dwLen == 0) {
+    return false;
+  }
 
+  lpData = malloc(dwLen);
+  if (lpData == NULL) return false;
+  if (!GetFileVersionInfo(szFileName, dwHandle, dwLen, lpData)) {
+    free(lpData);
+    return false;
+  }
+
+  if (!VerQueryValue(lpData, L"\\", (LPVOID *)&pFileInfo, &uLen)) {
+    free(lpData);
+    return false;
+  }
+
+  snprintf(releaseName, maxLen, "Windows %d.%d", HIWORD(pFileInfo->dwProductVersionMS),
+           LOWORD(pFileInfo->dwProductVersionMS));
+  free(lpData);
+  return true;
+}
+#endif
 
 int32_t taosGetOsReleaseName(char *releaseName, int32_t maxLen) {
 #ifdef WINDOWS
-  snprintf(releaseName, maxLen, "Windows");
+  if (!getWinVersionReleaseName(releaseName, maxLen)) {
+    snprintf(releaseName, maxLen, "Windows");
+  }
   return 0;
 #elif defined(_TD_DARWIN_64)
   char osversion[32];
diff --git a/source/os/test/osTests.cpp b/source/os/test/osTests.cpp
index 2e24bb0526..1d6542e78c 100644
--- a/source/os/test/osTests.cpp
+++ b/source/os/test/osTests.cpp
@@ -34,6 +34,12 @@ TEST(osTest, osSystem) {
   ELogLevel   level = DEBUG_FATAL;
   int32_t     dflag = 255;  // tsLogEmbedded ? 255 : uDebugFlag
   taosPrintTrace(flags, level, dflag, 0);
+
+  const int sysLen = 64;
+  char      osSysName[sysLen];
+  int       ret = taosGetOsReleaseName(osSysName, sysLen);
+  printf("os systeme name:%s\n", osSysName);
+  ASSERT_EQ(ret, 0);
 }
 
 void fileOperateOnFree(void *param) {
-- 
GitLab