[Windows 8.1 and latter] warning C4996: GetVersionExA was declared deprecated

Author: Matthieu Longo

Main/StackWalker/StackWalker.cpp

@@ -1439,14 +1439,10 @@ void StackWalker::OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUser
     buffer[STACKWALK_MAX_NAMELEN - 1] = 0;
     OnOutput(buffer);
   }
-#else
+#elif (_MSC_VER < 1800)
   OSVERSIONINFOEXA ver;
   ZeroMemory(&ver, sizeof(OSVERSIONINFOEXA));
   ver.dwOSVersionInfoSize = sizeof(ver);
-#if _MSC_VER >= 1900
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#endif
   if (GetVersionExA((OSVERSIONINFOA*)&ver) != FALSE)
   {
     _snprintf_s(buffer, maxLen, "OS-Version: %d.%d.%d (%s) 0x%x-0x%x\n", ver.dwMajorVersion,
@@ -1455,9 +1451,30 @@ void StackWalker::OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUser
     buffer[STACKWALK_MAX_NAMELEN - 1] = 0;
     OnOutput(buffer);
   }
-#if _MSC_VER >= 1900
-#pragma warning(pop)
-#endif
+#else
+  OSVERSIONINFOEXW osInfo;
+  // Get a handle on RtlGetVersion
+  HMODULE h_NtDll = GetModuleHandleW(L"ntdll.dll");
+  typedef LONG(WINAPI * tRtlGetVersion)(RTL_OSVERSIONINFOEXW*);
+  tRtlGetVersion f_RtlGetVersion = (tRtlGetVersion)GetProcAddress(h_NtDll, "RtlGetVersion");
+  if (!f_RtlGetVersion)
+  { // This will never happen (all processes load ntdll.dll)
+    _snprintf(buffer, STACKWALK_MAX_NAMELEN, "Windows V00");
+  }
+  else
+  {
+    osInfo.dwOSVersionInfoSize = sizeof(osInfo);
+    f_RtlGetVersion(&osInfo);
+    CHAR servicePack[128] = {'\0'};
+    if (wcslen(osInfo.szCSDVersion) > 0)
+    {
+      _snprintf_s(servicePack, 128, "(%s) ", osInfo.szCSDVersion);
+    }
+    _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "OS-Version: %d.%d.%d %s0x%x-0x%x\n",
+                osInfo.dwMajorVersion, osInfo.dwMinorVersion, osInfo.dwBuildNumber, servicePack,
+                osInfo.wSuiteMask, osInfo.wProductType);
+  }
+  OnOutput(buffer);
 #endif
 }