[Win32] Remove obsolete checks for non-supported Windows versions #2011

With introducing an explicit minimum supported OS version for Windows,
all code guards for older than the minimum supported Windows version
became obsolete.

This change removes those guards and those OS methods that became
unused. It also makes those methods, whose calls are not version-guarded
anymore, statically instead of dynamically linked. This fixes some issue
with wrong values returned by the AdjustWindowRectExForDpi method when
used via dynamic linking.

Fixes eclipse-platform/eclipse.platform.ui#2852

Fixes #2011

Author: HeikoKlare

bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c

@@ -108,22 +108,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceEx)
 }
 #endif
 
-#ifndef NO_AdjustWindowRectEx
-JNIEXPORT jboolean JNICALL OS_NATIVE(AdjustWindowRectEx)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jboolean arg2, jint arg3)
-{
-	RECT _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, AdjustWindowRectEx_FUNC);
-	if (arg0) if ((lparg0 = getRECTFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)AdjustWindowRectEx(lparg0, arg1, arg2, arg3);
-fail:
-	if (arg0 && lparg0) setRECTFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, AdjustWindowRectEx_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_AdjustWindowRectExForDpi
 JNIEXPORT jboolean JNICALL OS_NATIVE(AdjustWindowRectExForDpi)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jboolean arg2, jint arg3, jint arg4)
@@ -132,15 +116,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AdjustWindowRectExForDpi)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, AdjustWindowRectExForDpi_FUNC);
 	if (arg0) if ((lparg0 = getRECTFields(env, arg0, &_arg0)) == NULL) goto fail;
-/*
 	rc = (jboolean)AdjustWindowRectExForDpi(lparg0, arg1, arg2, arg3, arg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, AdjustWindowRectExForDpi)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(RECT *, jint, jboolean, jint, jint))fp)(lparg0, arg1, arg2, arg3, arg4);
-		}
-	}
 fail:
 	if (arg0 && lparg0) setRECTFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, AdjustWindowRectExForDpi_FUNC);
@@ -3320,15 +3296,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSystemMetricsForDpi)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetSystemMetricsForDpi_FUNC);
-/*
 	rc = (jint)GetSystemMetricsForDpi(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetSystemMetricsForDpi)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, GetSystemMetricsForDpi_FUNC);
 	return rc;
 }
@@ -9329,15 +9297,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoForDpi)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SystemParametersInfoForDpi_FUNC);
 	if (arg2) if ((lparg2 = getNONCLIENTMETRICSFields(env, arg2, &_arg2)) == NULL) goto fail;
-/*
 	rc = (jboolean)SystemParametersInfoForDpi(arg0, arg1, lparg2, arg3, arg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SystemParametersInfoForDpi)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint, jint, NONCLIENTMETRICS *, jint, jint))fp)(arg0, arg1, lparg2, arg3, arg4);
-		}
-	}
 fail:
 	if (arg2 && lparg2) setNONCLIENTMETRICSFields(env, arg2, lparg2);
 	OS_NATIVE_EXIT(env, that, SystemParametersInfoForDpi_FUNC);

bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h

@@ -22,8 +22,5 @@
 #define GetDpiForWindow_LIB "user32.dll"
 #define RtlGetVersion_LIB "ntdll.dll"
 #define OpenThemeDataForDpi_LIB "uxtheme.dll"
-#define GetSystemMetricsForDpi_LIB "user32.dll"
 #define GetThreadDpiAwarenessContext_LIB "user32.dll"
 #define SetThreadDpiAwarenessContext_LIB "user32.dll"
-#define SystemParametersInfoForDpi_LIB "user32.dll"
-#define AdjustWindowRectExForDpi_LIB "user32.dll"

bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h

@@ -29,7 +29,6 @@ typedef enum {
 	ActivateActCtx_FUNC,
 	ActivateKeyboardLayout_FUNC,
 	AddFontResourceEx_FUNC,
-	AdjustWindowRectEx_FUNC,
 	AdjustWindowRectExForDpi_FUNC,
 	AllowDarkModeForWindow_FUNC,
 	AllowSetForegroundWindow_FUNC,

bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/osversion.h

@@ -28,6 +28,7 @@
 
 #define OsVersion_LOAD_FUNCTION LOAD_FUNCTION
 
-#include "osversion_custom.h"
+/* Libraries for dynamic loaded functions */
+#define RtlGetVersion_LIB "ntdll.dll"
 
 #endif /* INC_osversion_H */

bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/osversion_custom.c

@@ -39,8 +39,6 @@ public class OS extends C {
 	/**
 	 * Values taken from https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions
 	 */
-	public static final int WIN32_BUILD_WIN8_1 = 9600; // "Windows 8.1"
-	public static final int WIN32_BUILD_WIN10_1607 = 14393; // "Windows 10 August 2016 Update"
 	public static final int WIN32_BUILD_WIN10_1809 = 17763; // "Windows 10 October 2018 Update"
 	public static final int WIN32_BUILD_WIN10_2004 = 19041; // "Windows 10 May 2020 Update"
 	public static final int WIN32_BUILD_WIN11_21H2 = 22000; // Initial Windows 11 release
@@ -2353,8 +2351,6 @@ public static int HRESULT_FROM_WIN32(int x) {
  * @param pdv cast=(PVOID)
  */
 public static final native int AddFontResourceEx(char[] lpszFilename, int fl, long pdv);
-public static final native boolean AdjustWindowRectEx (RECT lpRect, int dwStyle, boolean bMenu, int dwExStyle);
-/** @method flags=dynamic */
 public static final native boolean AdjustWindowRectExForDpi (RECT lpRect, int dwStyle, boolean bMenu, int dwExStyle, int dpi);
 /** @method flags=no_gen */
 public static final native boolean AllowDarkModeForWindow(long hWnd, boolean allow);
@@ -3006,7 +3002,6 @@ public static int HRESULT_FROM_WIN32(int x) {
 /** @param hWnd cast=(HWND) */
 public static final native long GetSystemMenu (long hWnd, boolean bRevert);
 public static final native int GetSystemMetrics (int nIndex);
-/** @method flags=dynamic */
 public static final native int GetSystemMetricsForDpi (int nIndex, int dpi);
 /** @param hDC cast=(HDC) */
 public static final native int GetTextColor (long hDC);
@@ -4496,7 +4491,6 @@ public static int HRESULT_FROM_WIN32(int x) {
 public static final native boolean SystemParametersInfo (int uiAction, int uiParam, RECT pvParam, int fWinIni);
 public static final native boolean SystemParametersInfo (int uiAction, int uiParam, NONCLIENTMETRICS pvParam, int fWinIni);
 public static final native boolean SystemParametersInfo (int uiAction, int uiParam, int [] pvParam, int fWinIni);
-/** @method flags=dynamic */
 public static final native boolean SystemParametersInfoForDpi (int uiAction, int uiParam, NONCLIENTMETRICS pvParam, int fWinIni, int dpi);
 /**
  * @param lpKeyState cast=(PBYTE)

bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/osversion_custom.h

@@ -42,6 +42,8 @@ public class OsVersion extends Platform {
 	 */
 	public static final int WIN32_MINIMUM_COMPATIBLE_BUILD = WIN32_BUILD_WIN10_1607;
 
+	private static final String DISABLE_WINDOWS_VERSION_CHECK_PROPERTY = "swt.disableWindowsVersionCheck";
+
 	static {
 		/*
 		 * Starting with Windows 10, GetVersionEx() lies about version unless
@@ -59,7 +61,9 @@ public class OsVersion extends Platform {
 	}
 
 	public static void checkCompatibleWindowsVersion() {
-		if (WIN32_BUILD < WIN32_MINIMUM_COMPATIBLE_BUILD) {
+		String disableVersionCheckPropertyValue = System.getProperty(DISABLE_WINDOWS_VERSION_CHECK_PROPERTY, "false");
+		boolean versionCheckDisabled = "".equals(disableVersionCheckPropertyValue) || Boolean.TRUE.toString().equalsIgnoreCase(disableVersionCheckPropertyValue);
+		if (!versionCheckDisabled && WIN32_BUILD < WIN32_MINIMUM_COMPATIBLE_BUILD) {
 			System.err.println(String.format("Incompatible OS: Minimum Windows build version is %s but current is %s",
 					WIN32_MINIMUM_COMPATIBLE_BUILD, WIN32_BUILD));
 			System.exit(1);

bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java

@@ -97,12 +97,8 @@ private long createSystemFontHandle(int zoom) {
 		}
 
 		private static boolean fetchSystemParametersInfo(NONCLIENTMETRICS info, int targetZoom) {
-			if (OS.WIN32_BUILD >= OS.WIN32_BUILD_WIN10_1607) {
-				return OS.SystemParametersInfoForDpi(OS.SPI_GETNONCLIENTMETRICS, NONCLIENTMETRICS.sizeof, info, 0,
-						DPIUtil.mapZoomToDPI(targetZoom));
-			} else {
-				return OS.SystemParametersInfo(OS.SPI_GETNONCLIENTMETRICS, 0, info, 0);
-			}
+			return OS.SystemParametersInfoForDpi(OS.SPI_GETNONCLIENTMETRICS, NONCLIENTMETRICS.sizeof, info, 0,
+					DPIUtil.mapZoomToDPI(targetZoom));
 		}
 
 		@Override

bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/version/OsVersion.java

@@ -2229,13 +2229,11 @@ public boolean print (GC gc) {
 	int flags = OS.RDW_UPDATENOW | OS.RDW_ALLCHILDREN;
 	OS.RedrawWindow (topHandle, null, 0, flags);
 	int printWindowFlags = 0;
-	if (OS.WIN32_BUILD >= OS.WIN32_BUILD_WIN8_1) {
-		/*
-		 * Undocumented flag in windows, which also allows the capturing
-		 * of GPU-drawn areas, e.g. an embedded Edge WebView2.
-		 */
-		printWindowFlags |= OS.PW_RENDERFULLCONTENT;
-	}
+	/*
+	 * Undocumented flag in windows, which also allows the capturing
+	 * of GPU-drawn areas, e.g. an embedded Edge WebView2.
+	 */
+	printWindowFlags |= OS.PW_RENDERFULLCONTENT;
 	printWidget (topHandle, hdc, gc, printWindowFlags);
 	if (gdipGraphics != 0) {
 		OS.RestoreDC(hdc, state);