libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-06 22:40:36 +08:00
Code Issues Projects Releases Wiki Activity

* cygcheck.cc (RtlGetVersion): Declare.

Browse Source 
(dump_sysinfo): Call RtlGetVersion rather than GetVersionEx to get
	correct OS info even on Windows 8.1.  Don't check return value since
	RtlGetVersion never fails per MSDN.  Move fetching kernel32 module
	handle where it's really needed.  Drop temporary comment added by
	previous checkin.
This commit is contained in:
Corinna Vinschen 2013-11-19 22:26:37 +00:00
parent c9f36df332
commit 8856f1f00e
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/utils/ChangeLog
View File

@ -1,3 +1,12 @@
2013-11-19 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (RtlGetVersion): Declare.
(dump_sysinfo): Call RtlGetVersion rather than GetVersionEx to get
correct OS info even on Windows 8.1. Don't check return value since
RtlGetVersion never fails per MSDN. Move fetching kernel32 module
handle where it's really needed. Drop temporary comment added by
previous checkin.
2013-11-19 Corinna Vinschen <corinna@vinschen.de> 2013-11-19 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (dump_sysinfo): Revert Windows 8.1 hack. It's not * cygcheck.cc (dump_sysinfo): Revert Windows 8.1 hack. It's not

18
winsup/utils/cygcheck.cc
View File

@ -1422,6 +1422,8 @@ handle_unique_object_name (int opt, char *path)
return 1; return 1;
} }
extern "C" NTSTATUS NTAPI RtlGetVersion (PRTL_OSVERSIONINFOEXW);
static void static void
dump_sysinfo () dump_sysinfo ()
{ {
@ -1438,12 +1440,9 @@ dump_sysinfo ()
time (&now); time (&now);
printf ("Current System Time: %s\n", ctime (&now)); printf ("Current System Time: %s\n", ctime (&now));
OSVERSIONINFOEX osversion; RTL_OSVERSIONINFOEXW osversion;
osversion.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX); osversion.dwOSVersionInfoSize = sizeof (RTL_OSVERSIONINFOEXW);
if (!GetVersionEx (reinterpret_cast<LPOSVERSIONINFO>(&osversion))) RtlGetVersion (&osversion);
display_error ("dump_sysinfo: GetVersionEx()");
HMODULE k32 = GetModuleHandleW (L"kernel32.dll");
switch (osversion.dwPlatformId) switch (osversion.dwPlatformId)
{ {
@ -1451,6 +1450,7 @@ dump_sysinfo ()
is_nt = true; is_nt = true;
if (osversion.dwMajorVersion == 6) if (osversion.dwMajorVersion == 6)
{ {
HMODULE k32 = GetModuleHandleW (L"kernel32.dll");
BOOL (WINAPI *GetProductInfo) (DWORD, DWORD, DWORD, DWORD, PDWORD) = BOOL (WINAPI *GetProductInfo) (DWORD, DWORD, DWORD, DWORD, PDWORD) =
(BOOL (WINAPI *)(DWORD, DWORD, DWORD, DWORD, PDWORD)) (BOOL (WINAPI *)(DWORD, DWORD, DWORD, DWORD, PDWORD))
GetProcAddress (k32, "GetProductInfo"); GetProcAddress (k32, "GetProductInfo");
@ -1468,7 +1468,7 @@ dump_sysinfo ()
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
? "8" : "2012"); ? "8" : "2012");
break; break;
case 3: /* Unreached due to mainfest nonsense. */ case 3:
default: default:
osversion.dwMinorVersion = 3; osversion.dwMinorVersion = 3;
strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
@ -1639,12 +1639,12 @@ dump_sysinfo ()
strcpy (osname, "??"); strcpy (osname, "??");
break; break;
} }
printf ("Windows %s Ver %lu.%lu Build %lu %s\n", osname, printf ("Windows %s Ver %lu.%lu Build %lu %ls\n", osname,
osversion.dwMajorVersion, osversion.dwMinorVersion, osversion.dwMajorVersion, osversion.dwMinorVersion,
osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ? osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ?
osversion.dwBuildNumber : (osversion.dwBuildNumber & 0xffff), osversion.dwBuildNumber : (osversion.dwBuildNumber & 0xffff),
osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ? osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ?
osversion.szCSDVersion : ""); osversion.szCSDVersion : L"");
if (osversion.dwPlatformId == VER_PLATFORM_WIN32s if (osversion.dwPlatformId == VER_PLATFORM_WIN32s
|| osversion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) || osversion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)