[v2] mingw: replace deprecated GetVersion with RtlGetVersion

Commit Message

Seija Kijin Jan. 19, 2023, 5:36 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.

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-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1438/AtariDreams/mingw-v2
Pull-Request: https://github.com/git/git/pull/1438

Range-diff vs v1:

 1:  8fe920c653e ! 1:  e5457905028 mingw: replace deprecated GetVersion with RtlGetVersion
     @@ compat/mingw.c: int wmain(int argc, const wchar_t **wargv)
       }
       
      +/*
     -+ * For RtlGetVersion in uname
     ++ * for RtlGetVersion in uname
      + */
      +
      +typedef NTSTATUS(WINAPI *RtlGetVersionPtr)(PRTL_OSVERSIONINFOW);
     @@ compat/mingw.c: int wmain(int argc, const wchar_t **wargv)
      +	RtlGetVersionInternal.procaddr =
      +		GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlGetVersion");
      +	if (!RtlGetVersionInternal.procaddr) {
     -+		die_message_errno(
     -+			"Could not get handle to RtlGetVersion in ntdll.dll");
     ++		/* if this is reached, something is seriously, seriously wrong
     ++		 */
     ++		perror("Could not call RtlGetVersion in ntdll.dll");
     ++		abort();
      +	}
      +
      +	version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);


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


base-commit: a7caae2729742fc80147bca1c02ae848cb55921a

Patch

diff --git a/compat/mingw.c b/compat/mingw.c
index af397e68a1d..07d81fb8d69 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3081,15 +3081,38 @@  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;
+	OSVERSIONINFOA version;
+
+	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);
+
 	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;
 }