HACK: win32u: Move AdjustWindowRect hack to only apply to syscall.

Similar to how it was done in Proton 9, we only hacked the version that
was in user32.

CW-Bug-Id: #25938

Author: rbernon

dlls/win32u/defwnd.c

@@ -258,20 +258,6 @@ BOOL adjust_window_rect( RECT *rect, DWORD style, BOOL menu, DWORD ex_style, UIN
     NONCLIENTMETRICSW ncm = {.cbSize = sizeof(ncm)};
     int adjust = 0;
 
-    if (user_driver->pHasWindowManager( "steamcompmgr" ))
-    {
-        /* Disable gamescope undecorated windows hack for following games. They don't expect client
-         * rect equals to window rect when in windowed mode. */
-        const char *sgi = getenv( "SteamGameId" );
-        if (
-             !((style & WS_POPUP) && (ex_style & WS_EX_TOOLWINDOW)) /* Bug 20038: game splash screens */
-             && !(sgi && !strcmp( sgi, "2563800" )) /* Bug 23342: The Last Game */
-             && !(sgi && !strcmp( sgi, "1240440" )) /* Bug 23802: Halo Infinite */
-             && !(sgi && !strcmp( sgi, "613830" ))  /* Bug 25747: CHRONO TRIGGER */
-            )
-            return TRUE;
-    }
-
     NtUserSystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi );
 
     if ((ex_style & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE)

dlls/win32u/sysparams.c

@@ -7362,6 +7362,21 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code
     case NtUserCallTwoParam_AdjustWindowRect:
     {
         struct adjust_window_rect_params *params = (void *)arg2;
+
+        if (user_driver->pHasWindowManager( "steamcompmgr" ))
+        {
+            /* Disable gamescope undecorated windows hack for following games. They don't expect client
+             * rect equals to window rect when in windowed mode. */
+            const char *sgi = getenv( "SteamGameId" );
+            if (
+                 !((params->style & WS_POPUP) && (params->ex_style & WS_EX_TOOLWINDOW)) /* Bug 20038: game splash screens */
+                 && !(sgi && !strcmp( sgi, "2563800" )) /* Bug 23342: The Last Game */
+                 && !(sgi && !strcmp( sgi, "1240440" )) /* Bug 23802: Halo Infinite */
+                 && !(sgi && !strcmp( sgi, "613830" ))  /* Bug 25747: CHRONO TRIGGER */
+                )
+                return TRUE;
+        }
+
         return adjust_window_rect( (RECT *)arg1, params->style, params->menu, params->ex_style, params->dpi );
     }
 

dlls/win32u/window.c

@@ -1907,7 +1907,7 @@ static RECT get_visible_rect( HWND hwnd, BOOL shaped, UINT style, UINT ex_style,
 
     if (IsRectEmpty( &rects->window ) || EqualRect( &rects->window, &rects->client ) || shaped || !decorated_mode) return rects->window;
     if (!user_driver->pGetWindowStyleMasks( hwnd, style, ex_style, &style_mask, &ex_style_mask )) return rects->window;
-    if (!NtUserAdjustWindowRect( &rect, style & style_mask, FALSE, ex_style & ex_style_mask, dpi )) return rects->window;
+    if (!adjust_window_rect( &rect, style & style_mask, FALSE, ex_style & ex_style_mask, dpi )) return rects->window;
 
     visible_rect = rects->window;
     visible_rect.left   -= rect.left;