Changed fullscreen auto-fixer to work with all Windows versions.

Updated logging.

Author: ccw808

MTA10/core/CConnectManager.cpp

@@ -479,6 +479,6 @@ void CConnectManager::OpenServerFirewall( in_addr Address, ushort usHttpPort, bo
         uiTimeOut = 1000;
     }
 
-    SString strDummyUrl( "http://%s:%d/.dummy/", inet_ntoa( Address ), usHttpPort );
+    SString strDummyUrl( "http://%s:%d/mta_client_firewall_probe/", inet_ntoa( Address ), usHttpPort );
     g_pCore->GetNetwork()->GetHTTPDownloadManager( EDownloadMode::CONNECT_TCP_SEND )->QueueFile( strDummyUrl, NULL, 0, "", 0, true, NULL, NULL, false, 1, uiTimeOut );
 }

MTA10/loader/MainFunctions.cpp

@@ -327,13 +327,12 @@ 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
+// If 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" ) );

MTA10/loader/Utils.cpp

@@ -2041,41 +2041,68 @@ bool VerifyEmbeddedSignature( const SString& strFilename )
 //////////////////////////////////////////////////////////
 void LogSettings( void )
 {
-    const char* szSettings[] = {
-                                "general", "aero-enabled",
-                                "general", "aero-changeable",
-                                "general", "driver-overrides-disabled",
-                                "general", "device-selection-disabled",
-                                "general", "customized-sa-files-using",
-                                "general", "times-connected",
-                                "general", "times-connected-editor",
-                                "nvhacks", "optimus-force-detection",
-                                "nvhacks", "optimus-export-enablement",
-                                "nvhacks", "optimus",
-                                "nvhacks", "optimus-rename-exe",
-                                "nvhacks", "optimus-alt-startup",
-                                "nvhacks", "optimus-force-windowed",
-                                "nvhacks", "optimus-dialog-skip",
-                                "nvhacks", "optimus-startup-option",
-                                "diagnostics", "send-dumps",
-                                "diagnostics", "last-minidump-time",
-                                "diagnostics", "user-confirmed-bsod-time",
-                                DIAG_MINIDUMP_DETECTED_COUNT,
-                                DIAG_MINIDUMP_CONFIRMED_COUNT,
-                                DIAG_PRELOAD_UPGRADES_LOWEST_UNSAFE,
-                                "general", "noav-user-says-skip",
-                                "general", "noav-last-asked-time",
-                            };
-
-    for ( uint i = 0 ; i < NUMELMS( szSettings ) ; i += 2 )
-    {
-        WriteDebugEvent( SString( "%s: %s", szSettings[i+1], *GetApplicationSetting( szSettings[i], szSettings[i+1] ) ) );
+    struct {
+        int bSkipIfZero;
+        const char* szPath;
+        const char* szName;
+        const char* szDesc;
+    } const settings[] = {
+                            { false, "general", GENERAL_PROGRESS_ANIMATION_DISABLE, "", },
+                            { false, "general", "aero-enabled", "", },
+                            { false, "general", "aero-changeable", "", },
+                            { false, "general", "driver-overrides-disabled", "", },
+                            { false, "general", "device-selection-disabled", "", },
+                            { false, "general", "customized-sa-files-using", "", },
+                            { false, "general", "times-connected", "", },
+                            { false, "general", "times-connected-editor", "", },
+                            { false, "nvhacks", "nvidia", "", },
+                            { false, "nvhacks", "optimus-force-detection", "", },
+                            { false, "nvhacks", "optimus-export-enablement", "", },
+                            { false, "nvhacks", "optimus", "", },
+                            { false, "nvhacks", "optimus-rename-exe", "", },
+                            { false, "nvhacks", "optimus-alt-startup", "", },
+                            { false, "nvhacks", "optimus-force-windowed", "", },
+                            { false, "nvhacks", "optimus-dialog-skip", "", },
+                            { false, "nvhacks", "optimus-startup-option", "", },
+                            { true,  "watchdog", "CR1", "COUNTER_CRASH_CHAIN_BEFORE_ONLINE_GAME", },
+                            { true,  "watchdog", "CR2", "COUNTER_CRASH_CHAIN_BEFORE_LOADING_SCREEN", },
+                            { true,  "watchdog", "CR3", "COUNTER_CRASH_CHAIN_BEFORE_USED_MAIN_MENU", },
+                            { true,  "watchdog", "L0", "SECTION_NOT_CLEAN_GTA_EXIT", },
+                            { true,  "watchdog", "L1", "SECTION_NOT_STARTED_ONLINE_GAME", },
+                            { true,  "watchdog", "L2", "SECTION_NOT_SHOWN_LOADING_SCREEN", },
+                            { true,  "watchdog", "L3", "SECTION_STARTUP_FREEZE", },
+                            { true,  "watchdog", "L4", "SECTION_NOT_USED_MAIN_MENU", },
+                            { true,  "watchdog", "L5", "SECTION_POST_INSTALL", },
+                            { true,  "watchdog", "lastruncrash", "", },
+                            { true,  "watchdog", "preload-upgrades", "", },
+                            { true,  "watchdog", "Q0", "SECTION_IS_QUITTING", },
+                            { true,  "watchdog", "uncleanstop", "", },
+                            { false, "diagnostics", "send-dumps", "", },
+                            { true,  "diagnostics", "last-minidump-time", "", },
+                            { true,  "diagnostics", "user-confirmed-bsod-time", "", },
+                            { true,  DIAG_MINIDUMP_DETECTED_COUNT, "", },
+                            { true,  DIAG_MINIDUMP_CONFIRMED_COUNT, "", },
+                            { true,  DIAG_PRELOAD_UPGRADES_LOWEST_UNSAFE, "", },
+                            { false, "general", "noav-user-says-skip", "", },
+                            { false, "general", "noav-last-asked-time", "", },
+                        };
+
+    for ( uint i = 0 ; i < NUMELMS( settings ) ; i++ )
+    {
+        SString strValue = GetApplicationSetting( settings[i].szPath, settings[i].szName );
+        if ( !settings[i].bSkipIfZero || atoi( strValue ) != 0 )
+        {
+            WriteDebugEvent( SString( "%s.%s: %s %s", settings[i].szPath, settings[i].szName, *strValue, settings[i].szDesc ) );
+        }
     }
 
     uint uiTimeLastAsked = GetApplicationSettingInt( "noav-last-asked-time" );
-    uint uiTimeNow = static_cast < uint >( time( NULL ) / 3600LL );
-    uint uiHoursSinceLastAsked = uiTimeNow - uiTimeLastAsked;
-    WriteDebugEvent( SString( "noav-last-asked-time-hours-delta: %d", uiHoursSinceLastAsked ) );
+    if ( uiTimeLastAsked )
+    {
+        uint uiTimeNow = static_cast < uint >( time( NULL ) / 3600LL );
+        uint uiHoursSinceLastAsked = uiTimeNow - uiTimeLastAsked;
+        WriteDebugEvent( SString( "noav-last-asked-time-hours-delta: %d", uiHoursSinceLastAsked ) );
+    }
 }