From e3e6993d35c6b92999e4ed80d850f72aac4e8be6 Mon Sep 17 00:00:00 2001
From: Elisha Riedlinger <elisha@novicemail.com>
Date: Fri, 16 Aug 2024 09:20:30 -0700
Subject: [PATCH] Revert: Better handling of sysmenu

#290  e7a37a6fee2c9dbfbb1cbaa8b43c6c43895fe887
---
 Dllmain/BuildNo.rc    | 2 +-
 d3d9/IDirect3D9Ex.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
index 8eda527c..91d4e490 100644
--- a/Dllmain/BuildNo.rc
+++ b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7094 
+#define BUILD_NUMBER 7095 
diff --git a/d3d9/IDirect3D9Ex.cpp b/d3d9/IDirect3D9Ex.cpp
index a93ebbfe..27acab55 100644
--- a/d3d9/IDirect3D9Ex.cpp
+++ b/d3d9/IDirect3D9Ex.cpp
@@ -627,7 +627,7 @@ void AdjustWindow(HWND MainhWnd, LONG displayWidth, LONG displayHeight)
 	}
 	else if (Config.FullscreenWindowMode)
 	{
-		lStyle &= ~WS_OVERLAPPEDWINDOW | WS_SYSMENU;	// Don't remove the menu
+		lStyle &= ~WS_OVERLAPPEDWINDOW;
 	}
 
 	// Set window style
@@ -641,6 +641,7 @@ void AdjustWindow(HWND MainhWnd, LONG displayWidth, LONG displayHeight)
 	// Get new window rect
 	Rect = { 0, 0, displayWidth, displayHeight };
 	AdjustWindowRectEx(&Rect, GetWindowLong(MainhWnd, GWL_STYLE), GetMenu(MainhWnd) != NULL, lExStyle);
+	Rect = { 0, 0, Rect.right - Rect.left, Rect.bottom - Rect.top };
 
 	// Get upper left window position
 	bool SetWindowPositionFlag = Config.FullscreenWindowMode;