1 files changed, 71 insertions, 4 deletions

diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index ef609026ad..f3214e2a20 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -31,7 +31,9 @@
 #endif
 #include "llwin32headers.h"
 
+#if !LL_SDL
 #include "llwindowwin32.h" // *FIX: for setting gIconResource.
+#endif
 
 #include "llappviewerwin32.h"
 
@@ -47,8 +49,10 @@
 #include "llviewercontrol.h"
 #include "lldxhardware.h"
 
+#if !_M_ARM64
 #include "nvapi/nvapi.h"
 #include "nvapi/NvApiDriverSettings.h"
+#endif
 
 #include <stdlib.h>
 
@@ -206,6 +210,7 @@ LONG WINAPI catchallCrashHandler(EXCEPTION_POINTERS * /*ExceptionInfo*/)
 
 const std::string LLAppViewerWin32::sWindowClass = "Second Life";
 
+#if !_M_ARM64
 /*
     This function is used to print to the command line a text message
     describing the nvapi error and quits
@@ -219,6 +224,7 @@ void nvapi_error(NvAPI_Status status)
     //should always trigger when asserts are enabled
     //llassert(status == NVAPI_OK);
 }
+#endif
 
 // Create app mutex creates a unique global windows object.
 // If the object can be created it returns true, otherwise
@@ -241,6 +247,7 @@ bool create_app_mutex()
     return result;
 }
 
+#if !_M_ARM64
 void ll_nvapi_init(NvDRSSessionHandle hSession)
 {
     // (2) load all the system settings into the session
@@ -395,11 +402,19 @@ void ll_nvapi_init(NvDRSSessionHandle hSession)
         return;
     }
 }
+#endif
 
-int APIENTRY wWinMain(HINSTANCE hInstance,
-                      HINSTANCE hPrevInstance,
-                      PWSTR     pCmdLine,
-                      int       nCmdShow)
+//#define DEBUGGING_SEH_FILTER 1
+#if DEBUGGING_SEH_FILTER
+#   define WINMAIN DebuggingWinMain
+#else
+#   define WINMAIN wWinMain
+#endif
+
+int APIENTRY WINMAIN(HINSTANCE hInstance,
+                     HINSTANCE hPrevInstance,
+                     PWSTR     pCmdLine,
+                     int       nCmdShow)
 {
     // Call Tracy first thing to have it allocate memory
     // https://github.com/wolfpld/tracy/issues/196
@@ -410,7 +425,9 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
     DWORD heap_enable_lfh_error[MAX_HEAPS];
     S32 num_heaps = 0;
 
+#if !LL_SDL
     LLWindowWin32::setDPIAwareness();
+#endif
 
 #if WINDOWS_CRT_MEM_CHECKS && !INCLUDE_VLD
     _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); // dump memory leaks on exit
@@ -439,8 +456,10 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
 #endif
 #endif
 
+#if !LL_SDL
     // *FIX: global
     gIconResource = MAKEINTRESOURCE(IDI_LL_ICON);
+#endif
 
     LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(ll_convert_wide_to_string(pCmdLine).c_str());
 
@@ -457,6 +476,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
         return -1;
     }
 
+#if !_M_ARM64
     NvDRSSessionHandle hSession = 0;
     static LLCachedControl<bool> use_nv_api(gSavedSettings, "NvAPICreateApplicationProfile", true);
     if (use_nv_api)
@@ -481,6 +501,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
             }
         }
     }
+#endif
 
     // Have to wait until after logging is initialized to display LFH info
     if (num_heaps > 0)
@@ -538,16 +559,39 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
     delete viewer_app_ptr;
     viewer_app_ptr = NULL;
 
+#if !_M_ARM64
     // (NVAPI) (6) We clean up. This is analogous to doing a free()
     if (hSession)
     {
         NvAPI_DRS_DestroySession(hSession);
         hSession = 0;
     }
+#endif
 
     return 0;
 }
 
+#if DEBUGGING_SEH_FILTER
+// The compiler doesn't like it when you use __try/__except blocks
+// in a method that uses object destructors. Go figure.
+// This winmain just calls the real winmain inside __try.
+// The __except calls our exception filter function. For debugging purposes.
+int APIENTRY wWinMain(HINSTANCE hInstance,
+                     HINSTANCE hPrevInstance,
+                     PWSTR     lpCmdLine,
+                     int       nCmdShow)
+{
+    __try
+    {
+        WINMAIN(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
+    }
+    __except( viewer_windows_exception_handler( GetExceptionInformation() ) )
+    {
+        _tprintf( _T("Exception handled.\n") );
+    }
+}
+#endif
+
 void LLAppViewerWin32::disableWinErrorReporting()
 {
     std::string executable_name = gDirUtilp->getExecutableFilename();
@@ -788,6 +832,29 @@ bool LLAppViewerWin32::reportCrashToBugsplat(void* pExcepInfo)
     return false;
 }
 
+bool LLAppViewerWin32::initWindow()
+{
+    // This is a workaround/hotfix for a change in Windows 11 24H2 (and possibly later)
+    // Where the window width and height need to correctly reflect an available FullScreen size
+    if (gSavedSettings.getBOOL("FullScreen"))
+    {
+        DEVMODE dev_mode;
+        ::ZeroMemory(&dev_mode, sizeof(DEVMODE));
+        dev_mode.dmSize = sizeof(DEVMODE);
+        if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dev_mode))
+        {
+            gSavedSettings.setU32("WindowWidth", dev_mode.dmPelsWidth);
+            gSavedSettings.setU32("WindowHeight", dev_mode.dmPelsHeight);
+        }
+        else
+        {
+            LL_WARNS("AppInit") << "Unable to set WindowWidth and WindowHeight for FullScreen mode" << LL_ENDL;
+        }
+    }
+
+    return LLAppViewer::initWindow();
+}
+
 void LLAppViewerWin32::initLoggingAndGetLastDuration()
 {
     LLAppViewer::initLoggingAndGetLastDuration();