Changeset 106246 in vbox

Timestamp:

Oct 8, 2024 5:50:15 PM (4 months ago)

Author:

vboxsync

Message:

GA/Windows: Reverted r165034: Temporary commit to redirect GA verbose logs from VBoxService.exe and VBoxTray.exe into the backdoor. bugref:10714

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxTray.cpp (modified) (2 diffs)
• common/VBoxService/VBoxService.cpp (modified) (2 diffs)
• common/VBoxService/VBoxServiceDisplayConfig.cpp (modified) (2 diffs)
• common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -80 +80 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-int                   g_cVerbosity             = 1;
+int                   g_cVerbosity             = 0;
 HANDLE                g_hStopSem;
 HANDLE                g_hSeamlessWtNotifyEvent = 0;
@@ -524 +524 @@
     RTERRINFOSTATIC ErrInfo;
     int rc = RTLogCreateEx(&g_pLoggerRelease, s_szEnvVarPfx,
-                           RTLOGFLAGS_PREFIX_THREAD /*| RTLOGFLAGS_PREFIX_TIME_PROG*/ | RTLOGFLAGS_USECRLF,
+                           RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG | RTLOGFLAGS_USECRLF,
                            s_szGroupSettings, RT_ELEMENTS(s_apszGroups), s_apszGroups, UINT32_MAX,
-                           0 /*cBufDescs*/, NULL /*paBufDescs*/, RTLOGDEST_STDOUT | RTLOGDEST_USER,
+                           0 /*cBufDescs*/, NULL /*paBufDescs*/, RTLOGDEST_STDOUT,
                            vboxTrayLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
                            NULL /*pOutputIf*/, NULL /*pvOutputIfUser*/,

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -117 +117 @@
 char                *g_pszProgName =  (char *)"";
 /** The current verbosity level. */
-unsigned             g_cVerbosity = 2;
+unsigned             g_cVerbosity = 0;
 char                 g_szLogFile[RTPATH_MAX + 128] = "";
 char                 g_szPidFile[RTPATH_MAX] = "";
@@ -323 +323 @@
     /* Create release logger (stdout + file). */
     static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
-    RTUINT fFlags = RTLOGFLAGS_PREFIX_THREAD /*| RTLOGFLAGS_PREFIX_TIME*/;
+    RTUINT fFlags = RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME;
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
     fFlags |= RTLOGFLAGS_USECRLF;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceDisplayConfig.cpp

@@ -133 +133 @@
     }
 
-    VGSvcVerbose(2, "ReconnectDisplays u32ConnectMask 0x%RX32, u32DisconnectMask 0x%RX32\n", u32ConnectMask, u32DisconnectMask);
+    VGSvcVerbose(3, "ReconnectDisplays u32ConnectMask 0x%RX32, u32DisconnectMask 0x%RX32\n", u32ConnectMask, u32DisconnectMask);
 
     EnumAdapters.NumAdapters = RT_ELEMENTS(EnumAdapters.Adapters);
@@ -280 +280 @@
                     for(uint32_t i = 0; i < cDisplays; i++)
                     {
-                        VGSvcVerbose(3, "%u) Display[%u] flags=%#x (%dx%d)\n", i, aDisplays[i].idDisplay,
+                        VGSvcVerbose(2, "%u) Display[%u] flags=%#x (%dx%d)\n", i, aDisplays[i].idDisplay,
                             aDisplays[i].fDisplayFlags,
                             aDisplays[i].cx, aDisplays[i].cy);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -580 +580 @@
 
                 int rc2 = vgsvcVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenUser);
-                if (RT_FAILURE(rc2) && g_cVerbosity > 2)
+                if (RT_FAILURE(rc2) && g_cVerbosity)
                     VGSvcError("Get token class 'user' for process %u failed, rc=%Rrc\n", paProcs[i].id, rc2);
 
                 rc2 = vgsvcVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenGroups);
-                if (RT_FAILURE(rc2) && g_cVerbosity > 2)
+                if (RT_FAILURE(rc2) && g_cVerbosity)
                     VGSvcError("Get token class 'groups' for process %u failed, rc=%Rrc\n", paProcs[i].id, rc2);
 
                 rc2 = vgsvcVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenStatistics);
-                if (RT_FAILURE(rc2) && g_cVerbosity > 2)
+                if (RT_FAILURE(rc2) && g_cVerbosity)
                     VGSvcError("Get token class 'statistics' for process %u failed, rc=%Rrc\n", paProcs[i].id, rc2);
             }