Changeset 106413 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Oct 17, 2024 8:16:26 AM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165232

Message:

Additions/VBoxTray: Implemented ability for easier user-controllable logging (also via verbose levels), support for running in foreground mode (with a console window attached to) and selective starting of sub services to easier pinpoint errors in release builds. Cleaned up initialization / termination code a little. See command line help for new options [build fix]. ​bugref:10763

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (6 diffs)

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

@@ -80 +80 @@
 
 /*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+typedef BOOL (WINAPI *PFNALLOCCONSOLE)(VOID);
+typedef BOOL (WINAPI *PFNATTACHCONSOLE)(DWORD);
+
+
+/*********************************************************************************************************************************
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
@@ -96 +103 @@
 
 uint32_t              g_fGuestDisplaysChanged = 0;
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+DECL_HIDDEN_DATA(PFNALLOCCONSOLE)  g_pfnAllocConsole = NULL;  /* For W2K+. */
+DECL_HIDDEN_DATA(PFNATTACHCONSOLE) g_pfnAttachConsole = NULL; /* For W2K+. */
 
 
@@ -859 +873 @@
 static int vboxTrayAttachConsole(void)
 {
-    if (g_fHasConsole) /* Console already attached? Bail out. */
+    if (    g_fHasConsole       /* Console already attached? Bail out. */
+        || !g_pfnAttachConsole) /* AttachConsole() not available (NT <= 4.0)? */
         return VINF_SUCCESS;
 
@@ -865 +880 @@
      * to get any stdout / stderr output. */
     bool fAllocConsole = false;
-    if (!AttachConsole(ATTACH_PARENT_PROCESS))
+    if (!g_pfnAttachConsole(ATTACH_PARENT_PROCESS))
         fAllocConsole = true;
 
     if (fAllocConsole)
     {
-        if (!AllocConsole())
+        AssertPtrReturn(g_pfnAllocConsole, VERR_NOT_AVAILABLE);
+        if (!g_pfnAllocConsole())
             VBoxTrayShowError("Unable to attach to or allocate a console!");
         /* Continue running. */
@@ -903 +919 @@
 {
     g_fHasConsole = false;
+}
+
+/**
+ * Early initialization code, required for resolving dynamic symbols and such.
+ *
+ * @returns VBox status code.
+ */
+static int vboxTrayPreInit()
+{
+    RTLDRMOD hMod;
+    int rc = RTLdrLoadSystem("kernel32.dll", true /*fNoUnload*/, &hMod);
+    if (RT_SUCCESS(rc))
+    {
+        /* only W2K+, ignore rc */ RTLdrGetSymbol(hMod, "AllocConsole", (void **)&g_pfnAllocConsole);
+        /* only W2K+, ignore rc */ RTLdrGetSymbol(hMod, "AttachConsole", (void **)&g_pfnAttachConsole);
+
+        RTLdrClose(hMod);
+    }
+
+    return rc;
 }
 
@@ -999 +1035 @@
         return RTMsgInitFailure(rc);
 
+    rc = vboxTrayPreInit();
+    if (RT_FAILURE(rc))
+        return VBoxTrayShowError(VBOX_VBOXTRAY_TITLE " Pre-init failed: %Rrc\n", rc);
+
     /* If a debugger is present, we always want to attach a console. */
     if (IsDebuggerPresent())