From 8eb44a68cb0110f9591798c89b0828262f5881e3 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Sat, 13 Mar 2021 23:41:38 +0100
Subject: [PATCH] Native window decorations: support 32-bit JREs

---
 .gitattributes                                |   1 +
 .../java/com/formdev/flatlaf/FlatLaf.java     |   2 +-
 .../formdev/flatlaf/FlatSystemProperties.java |   2 +-
 .../flatlaf/ui/FlatNativeWindowBorder.java    |   4 ++--
 .../ui/FlatWindowsNativeWindowBorder.java     |  15 ++++++++-----
 .../FlatWindowsNativeWindowBorder.java        |  21 +++++++++++++-----
 .../flatlaf-natives-windows/README.md         |   4 ++--
 .../flatlaf-natives-windows/build.gradle.kts  |  21 +++++++++---------
 .../flatlaf-natives-windows/lib/README.md     |   6 +++++
 .../flatlaf-natives-windows/lib/jawt-x86.lib  | Bin 0 -> 1688 bytes
 .../lib/jawt-x86_64.lib                       | Bin 0 -> 1682 bytes
 11 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 flatlaf-natives/flatlaf-natives-windows/lib/README.md
 create mode 100644 flatlaf-natives/flatlaf-natives-windows/lib/jawt-x86.lib
 create mode 100644 flatlaf-natives/flatlaf-natives-windows/lib/jawt-x86_64.lib

diff --git a/.gitattributes b/.gitattributes
index c3a3cc0a..7728e387 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,6 +19,7 @@
 *.dylib binary
 *.gif binary
 *.jar binary
+*.lib binary
 *.png binary
 *.sketch binary
 *.so binary
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
index 2e98e62c..3af73dbd 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
@@ -144,7 +144,7 @@ public abstract class FlatLaf
 	 * <p>
 	 * Returns also {@code false} on Windows 10 if:
 	 * <ul>
-	 * <li>FlatLaf native window border support is available (requires Windows 10 64-bit)</li>
+	 * <li>FlatLaf native window border support is available (requires Windows 10)</li>
 	 * <li>running in
 	 * <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime 11 (or later)</a>
 	 * (<a href="https://github.com/JetBrains/JetBrainsRuntime">source code on github</a>)
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
index 07f01f3c..7ec39204 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
@@ -63,7 +63,7 @@ public interface FlatSystemProperties
 	 * <p>
 	 * Setting this to {@code false} disables using FlatLaf native window decorations.
 	 * <p>
-	 * (requires Window 10 64-bit)
+	 * (requires Window 10)
 	 * <p>
 	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
 	 * <strong>Default</strong> none
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
index 1d5d78c8..5c04f771 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
@@ -221,8 +221,8 @@ public class FlatNativeWindowBorder
 			return;
 		supported = false;
 
-		// requires Windows 10 on x86_64
-		if( !SystemInfo.isWindows_10_orLater || !SystemInfo.isX86_64 )
+		// requires Windows 10
+		if( !SystemInfo.isWindows_10_orLater )
 			return;
 
 		// check whether disabled via system property
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java
index a599d1d3..312d32a4 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java
@@ -79,8 +79,8 @@ class FlatWindowsNativeWindowBorder
 	private static FlatWindowsNativeWindowBorder instance;
 
 	static FlatNativeWindowBorder.Provider getInstance() {
-		// requires Windows 10 on x86_64
-		if( !SystemInfo.isWindows_10_orLater || !SystemInfo.isX86_64 )
+		// requires Windows 10
+		if( !SystemInfo.isWindows_10_orLater )
 			return null;
 
 		// load native library
@@ -98,8 +98,11 @@ class FlatWindowsNativeWindowBorder
 				}
 			}
 
-			nativeLibrary = new NativeLibrary(
-				"com/formdev/flatlaf/natives/flatlaf-windows-x86_64",
+			String libraryName = "com/formdev/flatlaf/natives/flatlaf-windows-x86";
+			if( SystemInfo.isX86_64 )
+				libraryName += "_64";
+
+			nativeLibrary = new NativeLibrary( libraryName,
 				FlatWindowsNativeWindowBorder.class.getClassLoader(), true );
 		}
 
@@ -135,8 +138,8 @@ class FlatWindowsNativeWindowBorder
 	}
 
 	private void install( Window window ) {
-		// requires Windows 10 on x86_64
-		if( !SystemInfo.isWindows_10_orLater || !SystemInfo.isX86_64 )
+		// requires Windows 10
+		if( !SystemInfo.isWindows_10_orLater )
 			return;
 
 		// only JFrame and JDialog are supported
diff --git a/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java b/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java
index 8865b226..bdfc811e 100644
--- a/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java
+++ b/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java
@@ -127,8 +127,8 @@ public class FlatWindowsNativeWindowBorder
 	}
 
 	private void install( Window window ) {
-		// requires Windows 10 on x86_64
-		if( !SystemInfo.isWindows_10_orLater || !SystemInfo.isX86_64 )
+		// requires Windows 10
+		if( !SystemInfo.isWindows_10_orLater )
 			return;
 
 		// only JFrame and JDialog are supported
@@ -321,7 +321,10 @@ public class FlatWindowsNativeWindowBorder
 			hwnd = new HWND( Native.getComponentPointer( window ) );
 
 			// replace window procedure
-			defaultWndProc = User32Ex.INSTANCE.SetWindowLongPtr( hwnd, GWLP_WNDPROC, this );
+			if( SystemInfo.isX86_64 )
+				defaultWndProc = User32Ex.INSTANCE.SetWindowLongPtr( hwnd, GWLP_WNDPROC, this );
+			else
+				defaultWndProc = User32Ex.INSTANCE.SetWindowLong( hwnd, GWLP_WNDPROC, this );
 
 			// remove the OS window title bar
 			updateFrame();
@@ -329,7 +332,10 @@ public class FlatWindowsNativeWindowBorder
 
 		void uninstall() {
 			// restore original window procedure
-			User32Ex.INSTANCE.SetWindowLongPtr( hwnd, GWLP_WNDPROC, defaultWndProc );
+			if( SystemInfo.isX86_64 )
+				User32Ex.INSTANCE.SetWindowLongPtr( hwnd, GWLP_WNDPROC, defaultWndProc );
+			else
+				User32Ex.INSTANCE.SetWindowLong( hwnd, GWLP_WNDPROC, defaultWndProc );
 
 			// show the OS window title bar
 			updateFrame();
@@ -382,7 +388,10 @@ public class FlatWindowsNativeWindowBorder
 			LRESULT lResult = User32Ex.INSTANCE.CallWindowProc( defaultWndProc, hwnd, uMsg, wParam, lParam );
 
 			// restore original window procedure
-			User32Ex.INSTANCE.SetWindowLongPtr( hwnd, GWLP_WNDPROC, defaultWndProc );
+			if( SystemInfo.isX86_64 )
+				User32Ex.INSTANCE.SetWindowLongPtr( hwnd, GWLP_WNDPROC, defaultWndProc );
+			else
+				User32Ex.INSTANCE.SetWindowLong( hwnd, GWLP_WNDPROC, defaultWndProc );
 
 			// cleanup
 			windowsMap.remove( window );
@@ -640,6 +649,8 @@ public class FlatWindowsNativeWindowBorder
 
 		LONG_PTR SetWindowLongPtr( HWND hWnd, int nIndex, WindowProc wndProc );
 		LONG_PTR SetWindowLongPtr( HWND hWnd, int nIndex, LONG_PTR wndProc );
+		LONG_PTR SetWindowLong( HWND hWnd, int nIndex, WindowProc wndProc );
+		LONG_PTR SetWindowLong( HWND hWnd, int nIndex, LONG_PTR wndProc );
 		LRESULT CallWindowProc( LONG_PTR lpPrevWndFunc, HWND hWnd, int uMsg, WPARAM wParam, LPARAM lParam );
 
 		int GetDpiForWindow( HWND hwnd );
diff --git a/flatlaf-natives/flatlaf-natives-windows/README.md b/flatlaf-natives/flatlaf-natives-windows/README.md
index dfa3b063..9183df91 100644
--- a/flatlaf-natives/flatlaf-natives-windows/README.md
+++ b/flatlaf-natives/flatlaf-natives-windows/README.md
@@ -9,9 +9,9 @@ Tested only with Microsoft Visual C++ 2019 (comes with Visual Studio 2019).
 
 To be able to build FlatLaf on any platform, and without C++ compiler, the
 pre-built DLL is checked into Git at
-`flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll`.
+[flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/](https://github.com/JFormDesigner/FlatLaf/tree/main/flatlaf-core/src/main/resources/com/formdev/flatlaf/natives).
 
-This DLL was built on a GitHub server with the help of GitHub Actions. See:
+The DLL was built on a GitHub server with the help of GitHub Actions. See:
 [Native Libraries](https://github.com/JFormDesigner/FlatLaf/actions/workflows/natives.yml)
 workflow. Then the produced Artifacts ZIP was downloaded and the DLL checked
 into Git.
diff --git a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts
index d626f209..0dfa7b08 100644
--- a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts
+++ b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts
@@ -20,18 +20,16 @@ plugins {
 }
 
 library {
-	targetMachines.set( listOf( machines.windows.x86_64 ) )
+	targetMachines.set( listOf( machines.windows.x86, machines.windows.x86_64 ) )
 
 	variants.configureEach {
-		// depend on :flatlaf-core:compileJava because this task generates the JNI headers
-		tasks.named( "compileCpp" ) {
-			dependsOn( ":flatlaf-core:compileJava" )
-		}
-
 		sharedLibrary {
 			compileTasks.configureEach {
 				onlyIf { isBuildable }
 
+				// depend on :flatlaf-core:compileJava because it generates the JNI headers
+				dependsOn( ":flatlaf-core:compileJava" )
+
 				doFirst {
 					println( "Used Tool Chain:" )
 					println( "  - ${toolChain.get()}" )
@@ -67,11 +65,12 @@ library {
 				onlyIf { isBuildable }
 
 				val nativesDir = project( ":flatlaf-core" ).projectDir.resolve( "src/main/resources/com/formdev/flatlaf/natives" )
-				val libraryName = "flatlaf-windows-x86_64.dll"
+				val is64Bit = targetMachine.architecture.is64Bit
+				val libraryName = if( is64Bit ) "flatlaf-windows-x86_64.dll" else "flatlaf-windows-x86.dll"
+				val jawt = if( is64Bit ) "lib/jawt-x86_64" else "lib/jawt-x86"
 
 				outputs.file( "$nativesDir/$libraryName" )
 
-				val jawt = "${org.gradle.internal.jvm.Jvm.current().javaHome}/lib/jawt"
 				linkerArgs.addAll( toolChain.map {
 					when( it ) {
 						is Gcc, is Clang -> listOf( "-l${jawt}", "-lUser32", "-lshell32", "-lAdvAPI32", "-lKernel32" )
@@ -90,8 +89,10 @@ library {
 				}
 			}
 
-			tasks.named( "jar" ) {
-				onlyIf { false }
+			for( taskName in listOf( "jarX86", "jarX86-64" ) ) {
+				tasks.named( taskName ) {
+					onlyIf { false }
+				}
 			}
 		}
 	}
diff --git a/flatlaf-natives/flatlaf-natives-windows/lib/README.md b/flatlaf-natives/flatlaf-natives-windows/lib/README.md
new file mode 100644
index 00000000..c1e55b11
--- /dev/null
+++ b/flatlaf-natives/flatlaf-natives-windows/lib/README.md
@@ -0,0 +1,6 @@
+Contains libraries used to compile FlatLaf Windows 10 native libraries (DLLs).
+
+- `jawt-x86.lib` is `<jdk>/lib/jawt.lib` from AdoptOpenJDK jdk8u282-b08 32-bit,
+  which is required to build 32-bit DLL
+- `jawt-x86_64.lib` is `<jdk>/lib/jawt.lib` from AdoptOpenJDK jdk8u282-b08
+  64-bit, which is required to build 64-bit DLL
diff --git a/flatlaf-natives/flatlaf-natives-windows/lib/jawt-x86.lib b/flatlaf-natives/flatlaf-natives-windows/lib/jawt-x86.lib
new file mode 100644
index 0000000000000000000000000000000000000000..a16a97918c3753301423d80c70c62d7ec8fa85df
GIT binary patch
literal 1688
zcmb_dy-piJ5dQAY7{`i)MN*(hk&J`{X^hW4eu@a46HqW52AM;YYh#mO1TrFyQsxCx
z@c<Ng0vf2PDN>{l6^{`GX4X5{*dT1lEA8ygH*>r5yEp#6d|cUEh)*XU4tLgdT`%ip
zG7s^zVco0<N^t-~fOP^mXF%izh^Bcem0#OfFNSJyY4c+-zY(q%)qeSV14<RPf}mT9
zA1rPP!{x2Qs#?s2IjEJ~cBnq>HfZtZ>Fe6zk?H{Zw%=>nA0Y=$Ea1!mZiq=owL^%&
zf=$%vwxD0f9<}*#Z#e|1>cN3{^js#q`IaYv<>3EVtP~}0V&oMKD^=ay`SxXEv&jMr
zwD~EFS$!lvq-xc2qdbuj(QDdV(Y!VQ1qVLTmqu^az~J=%qbYif`$%5ew2t5fvxtdP
zlX#UFCV&s)@sj5G>F8Rma$Nsf|J+DU72hR;d|_2fI|wWDhkO9lncgLcQt=TcSJ3U1
z`r#3od4BpAx3_W`>+@i{Y>2l$pe@}KMEk|JID&YrLjdk|W?Bg2Z<(0ErvvxFp}mcO
z=%9K*yzI3)GTxl&*it;OY+W4}+A1PXR7X{dTBNNyvVwAT{1V2jTpfeYdN0}J3_SU$
z#QTofTz5zPp&OdH?YpC9Burd^+)?eLt)o1_S?{+nW*uB?dx_^8x^+OWlPCWV{!ef>
R1{S|iW7@As=gTUo!W}+jEr|dC

literal 0
HcmV?d00001

diff --git a/flatlaf-natives/flatlaf-natives-windows/lib/jawt-x86_64.lib b/flatlaf-natives/flatlaf-natives-windows/lib/jawt-x86_64.lib
new file mode 100644
index 0000000000000000000000000000000000000000..d9a9c8f3bbd2e03048230145dfd8b3434d0728e9
GIT binary patch
literal 1682
zcmb_dPfHt75dUS9#&jt(wDwRzSV6D_N!?_VdJx%IOB;<*;!2M%Y1Y;hC88-kddsPw
z!Grh}?Afy?=}Cn4lN9XC?wh!&X`4VEyf<%tGn@JUGPO`YXzVPSFRb2W7i`;ha!x+i
zi_dA+&KC5oW&*ee#5zFy6i8eF$ywe?mDV=atDahZz4@wI+VIw^>Qnto8%kBS%H_LK
z9I-eQdT+NXt7^IE6|qu$=czZ_Z6fq(b8lZok)b`$-FluN*E=!bG!9%5Gn))TK>{%t
zbjJU%J#0L8z3m?%hn?|vcO{npW#5_4cC+ty;+TAzswF9o6ve|U<8QzJ{Be3S<bXxG
zd=*Ah7wM%;)33Md(^(OX)8&HpPYqC7;9~Av>lHK%F8MFoqQ|%k>)asv5cioyN`jif
z<MbE-mjMhsAbNKEXsy{eXdSjbw5?~==T^B?S=I6$!piIgZ|be!mZp;$jxaGn)*G$8
zeRA{c_y=xoqWYu=_RD}o>jHtNJAwppg;unV!#ea4x;pt=gz-r}^x|I!y2+utfij(=
z>VJuH(C)}OFC*Py1l{p1@QMyv{kp>sMcp&f9XSEHJ5Gerl)Gc}RUf39T!FtnB<9dL
zo0pfZX39ielZCLh{d4w@iONfwcp`bCqRWLV6Xgibdf$c7l=ViN+d=X=LDom~O4+&%
YE&h+-sq{PiQauUcOZ2?0QZJal0ilX2qW}N^

literal 0
HcmV?d00001