Added autofix for black screen on startup

Author: ccw808

MTA10/core/CConnectManager.cpp

@@ -60,6 +60,9 @@ bool CConnectManager::Connect ( const char* szHost, unsigned short usPort, const
 
     m_bNotifyServerBrowser = bNotifyServerBrowser;
 
+    // For detecting startup problems
+    WatchDogUserDidInteractWithMenu();
+
     // Hide certain questions
     CCore::GetSingleton ().GetLocalGUI ()->GetMainMenu ()->GetQuestionWindow ()->OnConnect ();
 

MTA10/core/CMainMenu.cpp

@@ -769,6 +769,9 @@ bool CMainMenu::OnMenuClick ( CGUIElement* pElement )
     // Handle all our clicks to the menu from here
     if ( m_pHoveredItem )
     {
+        // For detecting startup problems
+        WatchDogUserDidInteractWithMenu();
+
         // Possible disconnect question for user
         if ( g_pCore->IsConnected() )
         {

MTA10/core/CQuestionBox.cpp

@@ -211,6 +211,9 @@ bool CQuestionBox::IsVisible ( void )
 
 bool CQuestionBox::OnButtonClick ( CGUIElement* pElement )
 {
+    // For detecting startup problems
+    WatchDogUserDidInteractWithMenu();
+
     m_uiLastButton = reinterpret_cast < unsigned int > ( pElement->GetUserData () );
     if ( m_Callback)
         m_Callback ( m_CallbackParameter, m_uiLastButton );

MTA10/loader/MainFunctions.cpp

@@ -141,6 +141,8 @@ void HandleSpecialLaunchOptions( void )
     if ( CommandLineContains( "/kdinstall" ) )
     {
         UpdateMTAVersionApplicationSetting( true );
+        WatchDogReset();
+        WatchDogBeginSection( WD_SECTION_POST_INSTALL );
         if ( CheckService( CHECK_SERVICE_POST_INSTALL ) )
             return ExitProcess( EXIT_OK );
         return ExitProcess( EXIT_ERROR );
@@ -320,6 +322,53 @@ void HandleResetSettings ( void )
 }
 
 
+//////////////////////////////////////////////////////////
+//
+// HandleNotUsedMainMenu
+//
+// Called when a problem occured before the main menu was used by user
+// If Win10 and fullscreen, then maybe change fullscreen mode
+//
+//////////////////////////////////////////////////////////
+void HandleNotUsedMainMenu ( void )
+{
+    AddReportLog( 9310, "Loader - HandleNotUsedMainMenu" );
+    if ( IsWindows10OrGreater() )
+    {
+        // Slighty hacky way of checking in-game settings
+        SString strCoreConfigFilename = CalcMTASAPath( PathJoin( "mta", "config", "coreconfig.xml" ) );
+        SString strCoreConfig;
+        FileLoad( strCoreConfigFilename, strCoreConfig );
+        SString strWindowed        = strCoreConfig.SplitRight( "<display_windowed>" ).Left( 1 );
+        SString strFullscreenStyle = strCoreConfig.SplitRight( "<display_fullscreen_style>" ).Left( 1 );
+        if ( !strWindowed.empty() && !strFullscreenStyle.empty())
+        {
+            if ( strWindowed == "0" && strFullscreenStyle == "0" )   // 0=FULLSCREEN_STANDARD
+            {
+                // Inform user
+                SString strMessage = _("Are you having problems running MTA:SA?.\n\nDo you want to change the following setting?");
+                strMessage += "\n" + _("Fullscreen mode:") + " -> " + _("Borderless window");
+                int iResponse = MessageBoxUTF8 ( NULL, strMessage, "MTA: San Andreas", MB_YESNO | MB_ICONQUESTION | MB_TOPMOST );
+                if ( iResponse == IDYES )
+                {
+                    // Very hacky way of changing in-game settings
+                    strCoreConfig = strCoreConfig.Replace( "<display_fullscreen_style>0", "<display_fullscreen_style>1" );
+                    FileSave( strCoreConfigFilename, strCoreConfig );
+                    AddReportLog( 9311, "Loader - HandleNotUsedMainMenu - User change to Borderless window" );
+                }
+            }   
+        }
+        else
+        {
+            // If no valid settings file yet, do the change without asking
+            strCoreConfig = "<mainconfig><settings><display_fullscreen_style>1</display_fullscreen_style></settings></mainconfig>";
+            FileSave( strCoreConfigFilename, strCoreConfig );
+            AddReportLog( 9312, "Loader - HandleNotUsedMainMenu - Set Borderless window" );
+        }
+    }
+}
+
+
 //////////////////////////////////////////////////////////
 //
 // HandleCustomStartMessage
@@ -417,6 +466,13 @@ void PreLaunchWatchDogs ( void )
         HandleResetSettings ();
     }
 
+    // Check for possible fullscreen problems after install
+    if ( WatchDogIsSectionOpen( WD_SECTION_NOT_USED_MAIN_MENU ) && WatchDogIsSectionOpen( WD_SECTION_POST_INSTALL ) )
+    {
+        WatchDogCompletedSection( WD_SECTION_NOT_USED_MAIN_MENU );
+        HandleNotUsedMainMenu();
+    }
+
     // Clear down freeze on quit detection
     WatchDogCompletedSection( "Q0" );
 
@@ -874,6 +930,7 @@ int LaunchGame ( SString strCmdLine )
 
     WatchDogBeginSection ( "L2" );      // Gets closed when loading screen is shown
     WatchDogBeginSection ( "L3" );      // Gets closed when loading screen is shown, or a startup problem is handled elsewhere
+    WatchDogBeginSection ( WD_SECTION_NOT_USED_MAIN_MENU );      // Gets closed when the main menu is used
 
     // Extract 'done-admin' flag from command line
     bool bDoneAdmin = strCmdLine.Contains ( "/done-admin" );

Shared/sdk/SharedUtil.Game.h

@@ -110,7 +110,6 @@ namespace SharedUtil
 
 
     // Common strings for SetApplicationSetting
-    #define WD_SECTION_PRELOAD_UPGRADES         "preload-upgrades"
     #define DIAG_PRELOAD_UPGRADES_SLOW          "diagnostics", "preloading-upgrades-slow"
     #define DIAG_PRELOAD_UPGRADE_ATTEMPT_ID     "diagnostics", "preloading-upgrade-attempt-id"
     #define DIAG_PRELOAD_UPGRADES_LOWEST_UNSAFE "diagnostics", "preloading-upgrades-lowest-unsafe"
@@ -121,4 +120,15 @@ namespace SharedUtil
     #define DIAG_BSOD_DETECT_SKIP               "diagnostics", "bsod-detect-skip"
     #define GENERAL_PROGRESS_ANIMATION_DISABLE  "progress-animation-disable"
 
+    // Common strings for watchdog detections
+    #define WD_SECTION_PRELOAD_UPGRADES                     "preload-upgrades"
+    #define WD_SECTION_NOT_CLEAN_GTA_EXIT                   "L0"                // Opened in loader, closed if GTA exits with no error
+    #define WD_SECTION_NOT_STARTED_ONLINE_GAME              "L1"                // Opened in loader, closed when online game has started
+    #define WD_SECTION_NOT_SHOWN_LOADING_SCREEN             "L2"                // Opened in loader, closed when loading screen is shown
+    #define WD_SECTION_STARTUP_FREEZE                       "L3"                // Opened in loader, closed when loading screen is shown, or a startup problem is handled elsewhere
+    #define WD_SECTION_NOT_USED_MAIN_MENU                   "L4"                // Opened in loader, closed when main menu is used
+    #define WD_SECTION_POST_INSTALL                         "L5"                // Opened in when installer runs, closed when main menu is used
+    #define WD_SECTION_IS_QUITTING                          "Q0"                // Open during quit 
+    #define WD_COUNTER_CRASH_CHAIN_BEFORE_ONLINE_GAME       "CR1"               // Counts consecutive crashes before the online game starts
+    #define WD_COUNTER_CRASH_CHAIN_BEFORE_LOADING_SCREEN    "CR2"               // Counts consecutive crashes before the loading screen is shown
 }

Shared/sdk/SharedUtil.Misc.h

@@ -121,6 +121,7 @@ namespace SharedUtil
     void            WatchDogSetUncleanStop          ( bool bOn );
     bool            WatchDogWasLastRunCrash         ( void );
     void            WatchDogSetLastRunCrash         ( bool bOn );
+    void            WatchDogUserDidInteractWithMenu ( void );
 
     // BrowseToSolution flags
     enum

Shared/sdk/SharedUtil.Misc.hpp

@@ -523,6 +523,14 @@ void SharedUtil::WatchDogSetLastRunCrash( bool bOn )
     bWatchDogWasLastRunCrashValue = bOn;
 }
 
+//
+// Special things
+//
+void SharedUtil::WatchDogUserDidInteractWithMenu( void )
+{
+    WatchDogCompletedSection( WD_SECTION_NOT_USED_MAIN_MENU );
+    WatchDogCompletedSection( WD_SECTION_POST_INSTALL );
+}
 
 
 void SharedUtil::SetClipboardText ( const SString& strText )