[v3] mingw: replace deprecated GetVersion with RtlGetVersion

Commit Message

Seija Kijin Jan. 21, 2023, 7:50 p.m. UTC

From: Seija Kijin <[e-mail]>

The previous way is deprecated and returns
the wrong value in Windows 8 and up,
returning the manifest Windows data
as opposed to the actual Windows data.

RtlGetVersion is the correct way
to get the Windows version now.

Note: ntdll does not need to be
manually loaded into the runtime,
as this is the one special library
that is automatically loaded upon launch.

Signed-off-by: Seija Kijin <[e-mail]>
---
    mingw: replace deprecated GetVersion with RtlGetVersion
    
    GetVersion has its behavior changed in Windows 8 and above anyway, so
    this is the right way to do it now.
    
    The previous way returns the wrong value in Windows 8 and up, returning
    the manifest Windows data as opposed to the actual Windows data.
    
    Signed-off-by: Seija Kijin [e-mail]

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1438%2FAtariDreams%2Fmingw-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1438/AtariDreams/mingw-v3
Pull-Request: https://github.com/git/git/pull/1438

Range-diff vs v2:

 1:  e5457905028 ! 1:  31f778a6b34 mingw: replace deprecated GetVersion with RtlGetVersion
     @@ Commit message
          returning the manifest Windows data
          as opposed to the actual Windows data.
      
     -    RtlGetVersion is the correct way to get the Windows version now.
     +    RtlGetVersion is the correct way
     +    to get the Windows version now.
     +
     +    Note: ntdll does not need to be
     +    manually loaded into the runtime,
     +    as this is the one special library
     +    that is automatically loaded upon launch.
      
          Signed-off-by: Seija Kijin <[e-mail]>
      
     @@ compat/mingw.c: int wmain(int argc, const wchar_t **wargv)
       {
      -	unsigned v = (unsigned)GetVersion();
      +	union winprocaddr RtlGetVersionInternal;
     -+	OSVERSIONINFOA version;
     ++	OSVERSIONINFOW version;
     ++
     ++	memset(&version, 0, sizeof(version));
     ++	version.dwOSVersionInfoSize = sizeof(version);
      +
     ++	/* RtlGetVersion always gets the true Windows version, even when running
     ++	 * under Windows's compatibility mode*/
      +	RtlGetVersionInternal.procaddr =
      +		GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlGetVersion");
     -+	if (!RtlGetVersionInternal.procaddr) {
     -+		/* if this is reached, something is seriously, seriously wrong
     -+		 */
     -+		perror("Could not call RtlGetVersion in ntdll.dll");
     -+		abort();
     -+	}
      +
     -+	version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     -+	RtlGetVersionInternal.procGetVersion((PRTL_OSVERSIONINFOW)&version);
     ++	if (RtlGetVersionInternal.procaddr) {
     ++		RtlGetVersionInternal.procGetVersion((PRTL_OSVERSIONINFOW)&version);
     ++	} else {
     ++		/* Should not happen, but just in case, fallback to deprecated
     ++		 * GetVersionExW */
     ++		GetVersionExW(&version);
     ++	}
      +
       	memset(buf, 0, sizeof(*buf));
       	xsnprintf(buf->sysname, sizeof(buf->sysname), "Windows");


 compat/mingw.c | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)


base-commit: 904d404274fef6695c78a6b055edd184b72e2f9b

Patch

diff --git a/compat/mingw.c b/compat/mingw.c
index af397e68a1d..b1d75c93cfe 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3081,15 +3081,42 @@  int wmain(int argc, const wchar_t **wargv)
 	return exit_status;
 }
 
+/*
+ * for RtlGetVersion in uname
+ */
+
+typedef NTSTATUS(WINAPI *RtlGetVersionPtr)(PRTL_OSVERSIONINFOW);
+union winprocaddr {
+	FARPROC procaddr;
+	RtlGetVersionPtr procGetVersion;
+};
+
 int uname(struct utsname *buf)
 {
-	unsigned v = (unsigned)GetVersion();
+	union winprocaddr RtlGetVersionInternal;
+	OSVERSIONINFOW version;
+
+	memset(&version, 0, sizeof(version));
+	version.dwOSVersionInfoSize = sizeof(version);
+
+	/* RtlGetVersion always gets the true Windows version, even when running
+	 * under Windows's compatibility mode*/
+	RtlGetVersionInternal.procaddr =
+		GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlGetVersion");
+
+	if (RtlGetVersionInternal.procaddr) {
+		RtlGetVersionInternal.procGetVersion((PRTL_OSVERSIONINFOW)&version);
+	} else {
+		/* Should not happen, but just in case, fallback to deprecated
+		 * GetVersionExW */
+		GetVersionExW(&version);
+	}
+
 	memset(buf, 0, sizeof(*buf));
 	xsnprintf(buf->sysname, sizeof(buf->sysname), "Windows");
-	xsnprintf(buf->release, sizeof(buf->release),
-		 "%u.%u", v & 0xff, (v >> 8) & 0xff);
-	/* assuming NT variants only.. */
-	xsnprintf(buf->version, sizeof(buf->version),
-		  "%u", (v >> 16) & 0x7fff);
+	xsnprintf(buf->release, sizeof(buf->release), "%lu.%lu",
+		  version.dwMajorVersion, version.dwMinorVersion);
+	xsnprintf(buf->version, sizeof(buf->version), "%lu",
+		  version.dwBuildNumber);
 	return 0;
 }