diff --git a/Generals/Code/Main/WinMain.cpp b/Generals/Code/Main/WinMain.cpp index 77323a00c7..72eb16248b 100644 --- a/Generals/Code/Main/WinMain.cpp +++ b/Generals/Code/Main/WinMain.cpp @@ -75,6 +75,7 @@ HINSTANCE ApplicationHInstance = NULL; ///< our application instance HWND ApplicationHWnd = NULL; ///< our application window handle Bool ApplicationIsWindowed = false; +Bool ApplicationIsBorderless = false; // TheSuperHackers @feature @ShizCalev 04/04/2025 - Borderless Windowed support Win32Mouse *TheWin32Mouse= NULL; ///< for the WndProc() only DWORD TheMessageTime = 0; ///< For getting the time that a message was posted from Windows. @@ -674,7 +675,8 @@ static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWin // Create our main window windowStyle = WS_POPUP|WS_VISIBLE; if (runWindowed) - windowStyle |= WS_DLGFRAME | WS_CAPTION | WS_SYSMENU; + if(!ApplicationIsBorderless) + windowStyle |= WS_DLGFRAME | WS_CAPTION | WS_SYSMENU; else windowStyle |= WS_EX_TOPMOST | WS_SYSMENU; @@ -901,6 +903,8 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, //added a preparse step for this flag because it affects window creation style if (stricmp(token,"-win")==0) ApplicationIsWindowed=true; + if(stricmp(token,"-noborder")==0) + ApplicationIsBorderless=true; token = nextParam(NULL, "\" "); } diff --git a/GeneralsMD/Code/Main/WinMain.cpp b/GeneralsMD/Code/Main/WinMain.cpp index c07319742b..a97da50a70 100644 --- a/GeneralsMD/Code/Main/WinMain.cpp +++ b/GeneralsMD/Code/Main/WinMain.cpp @@ -78,6 +78,7 @@ HINSTANCE ApplicationHInstance = NULL; ///< our application instance HWND ApplicationHWnd = NULL; ///< our application window handle Bool ApplicationIsWindowed = false; +Bool ApplicationIsBorderless = false; // TheSuperHackers @feature @ShizCalev 04/04/2025 - Borderless Windowed support Win32Mouse *TheWin32Mouse= NULL; ///< for the WndProc() only DWORD TheMessageTime = 0; ///< For getting the time that a message was posted from Windows. @@ -696,7 +697,8 @@ static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWin // Create our main window windowStyle = WS_POPUP|WS_VISIBLE; if (runWindowed) - windowStyle |= WS_DLGFRAME | WS_CAPTION | WS_SYSMENU; + if(!ApplicationIsBorderless) + windowStyle |= WS_DLGFRAME | WS_CAPTION | WS_SYSMENU; else windowStyle |= WS_EX_TOPMOST | WS_SYSMENU; @@ -926,6 +928,8 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, //added a preparse step for this flag because it affects window creation style if (stricmp(token,"-win")==0) ApplicationIsWindowed=true; + if(stricmp(token,"-noborder")==0) + ApplicationIsBorderless=true; token = nextParam(NULL, "\" "); }