Changeset 95959 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Aug 1, 2022 1:26:39 PM (2 years ago)

Author:

vboxsync

Message:

Additions/VBoxTray: Enable (optional) release logging, handle log groups a bit more elegant. bugref:10267

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxDnD.cpp (modified) (2 diffs)
• VBoxTray.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -31 +31 @@
  VBoxTray_DEFS   := VBOX_WITH_HGCM VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
 endif
+VBoxTray_DEFS    += LOG_ENABLED
 VBoxTray_LDFLAGS  = -SubSystem:Windows
 VBoxTray_INCS     = \

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

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GUEST_DND
+#include <VBox/log.h>
+
 #include <iprt/win/windows.h>
 #include "VBoxTray.h"
@@ -43 +45 @@
 
 #include <VBox/err.h>
-#include <VBox/log.h>
 
 

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

@@ -589 +589 @@
         RTLogSetDefaultInstance(g_pLoggerRelease);
 
-        switch (g_cVerbosity) /* Not very elegant, but has to do it for now. */
-        {
-            case 1:
-                rc = RTLogGroupSettings(g_pLoggerRelease, "all.e.l");
+        const char *apszGroups[] = { "all", "guest_dnd" }; /* All groups we want to enable logging for VBoxTray. */
+        char        szGroupSettings[_1K];
+
+        szGroupSettings[0] = '\0';
+
+        for (size_t i = 0; i < RT_ELEMENTS(apszGroups); i++)
+        {
+            if (i > 0)
+                rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), "+");
+            if (RT_SUCCESS(rc))
+                rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), apszGroups[i]);
+            if (RT_FAILURE(rc))
                 break;
 
-            case 2:
-                rc = RTLogGroupSettings(g_pLoggerRelease, "all.e.l.l2");
+            switch (g_cVerbosity)
+            {
+                case 1:
+                    rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), ".e.l");
+                    break;
+
+                case 2:
+                    rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), ".e.l.l2");
+                    break;
+
+                case 3:
+                    rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), ".e.l.l2.l3");
+                    break;
+
+                case 4:
+                    RT_FALL_THROUGH();
+                default:
+                    rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), ".e.l.l2.l3.f");
+                    break;
+            }
+
+            if (RT_FAILURE(rc))
                 break;
-
-            case 3:
-                rc = RTLogGroupSettings(g_pLoggerRelease, "all.e.l.l2.l3");
-                break;
-
-            case 4:
-                RT_FALL_THROUGH();
-            default:
-                rc = RTLogGroupSettings(g_pLoggerRelease, "all.e.l.l2.l3.f");
-                break;
-        }
+        }
+
+        LogRel(("Verbose log settings are: %s\n", szGroupSettings));
+
+        if (RT_SUCCESS(rc))
+            rc = RTLogGroupSettings(g_pLoggerRelease, szGroupSettings);
         if (RT_FAILURE(rc))
-            RTMsgError("Setting debug logging failed, rc=%Rrc\n", rc);
+            RTMsgError("Setting log group settings failed, rc=%Rrc\n", rc);
 
         /* Explicitly flush the log in case of VBOXTRAY_RELEASE_LOG=buffered. */