Merge pull request #3581 from Flow-Launcher/get_window_long

Fix crash on ×32 devices

Author: Jack251970

Flow.Launcher.Infrastructure/NativeMethods.txt

@@ -22,7 +22,7 @@ SystemParametersInfo
 
 SetForegroundWindow
 
-GetWindowLong
+WINDOW_LONG_PTR_INDEX
 GetForegroundWindow
 GetDesktopWindow
 GetShellWindow

Flow.Launcher.Infrastructure/PInvokeExtensions.cs

@@ -4,14 +4,16 @@
 
 namespace Windows.Win32;
 
-// Edited from: https://github.com/files-community/Files
 internal static partial class PInvoke
 {
+    // SetWindowLong
+    // Edited from: https://github.com/files-community/Files
+
     [DllImport("User32", EntryPoint = "SetWindowLongW", ExactSpelling = true)]
-    static extern int _SetWindowLong(HWND hWnd, int nIndex, int dwNewLong);
+    private static extern int _SetWindowLong(HWND hWnd, int nIndex, int dwNewLong);
 
     [DllImport("User32", EntryPoint = "SetWindowLongPtrW", ExactSpelling = true)]
-    static extern nint _SetWindowLongPtr(HWND hWnd, int nIndex, nint dwNewLong);
+    private static extern nint _SetWindowLongPtr(HWND hWnd, int nIndex, nint dwNewLong);
 
     // NOTE:
     //  CsWin32 doesn't generate SetWindowLong on other than x86 and vice versa.
@@ -22,4 +24,22 @@ public static unsafe nint SetWindowLongPtr(HWND hWnd, WINDOW_LONG_PTR_INDEX nInd
           ? _SetWindowLong(hWnd, (int)nIndex, (int)dwNewLong)
           : _SetWindowLongPtr(hWnd, (int)nIndex, dwNewLong);
     }
+
+    // GetWindowLong
+
+    [DllImport("User32", EntryPoint = "GetWindowLongW", ExactSpelling = true)]
+    private static extern int _GetWindowLong(HWND hWnd, int nIndex);
+
+    [DllImport("User32", EntryPoint = "GetWindowLongPtrW", ExactSpelling = true)]
+    private static extern nint _GetWindowLongPtr(HWND hWnd, int nIndex);
+
+    // NOTE:
+    //  CsWin32 doesn't generate GetWindowLong on other than x86 and vice versa.
+    //  For more info, visit https://github.com/microsoft/CsWin32/issues/882
+    public static unsafe nint GetWindowLongPtr(HWND hWnd, WINDOW_LONG_PTR_INDEX nIndex)
+    {
+        return sizeof(nint) is 4
+          ? _GetWindowLong(hWnd, (int)nIndex)
+          : _GetWindowLongPtr(hWnd, (int)nIndex);
+    }
 }

Flow.Launcher.Infrastructure/Win32Helper.cs

@@ -194,17 +194,17 @@ public static void DisableControlBox(Window window)
             SetWindowStyle(hwnd, WINDOW_LONG_PTR_INDEX.GWL_STYLE, style);
         }
 
-        private static int GetWindowStyle(HWND hWnd, WINDOW_LONG_PTR_INDEX nIndex)
+        private static nint GetWindowStyle(HWND hWnd, WINDOW_LONG_PTR_INDEX nIndex)
         {
-            var style = PInvoke.GetWindowLong(hWnd, nIndex);
+            var style = PInvoke.GetWindowLongPtr(hWnd, nIndex);
             if (style == 0 && Marshal.GetLastPInvokeError() != 0)
             {
                 throw new Win32Exception(Marshal.GetLastPInvokeError());
             }
             return style;
         }
 
-        private static nint SetWindowStyle(HWND hWnd, WINDOW_LONG_PTR_INDEX nIndex, int dwNewLong)
+        private static nint SetWindowStyle(HWND hWnd, WINDOW_LONG_PTR_INDEX nIndex, nint dwNewLong)
         {
             PInvoke.SetLastError(WIN32_ERROR.NO_ERROR); // Clear any existing error