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

Timestamp:

Oct 17, 2024 7:44:43 AM (4 months ago)

Author:

vboxsync

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. bugref:10763

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxClipboard.cpp (modified) (31 diffs)
• VBoxDesktopTracking.cpp (modified) (1 diff)
• VBoxDisplay.cpp (modified) (6 diffs)
• VBoxDnD.cpp (modified) (59 diffs)
• VBoxDnD.h (modified) (1 diff)
• VBoxDnDDataObject.cpp (modified) (7 diffs)
• VBoxDnDDropTarget.cpp (modified) (8 diffs)
• VBoxHelpers.cpp (modified) (8 diffs)
• VBoxHelpers.h (modified) (1 diff)
• VBoxHostVersion.cpp (modified) (2 diffs)
• VBoxIPC.cpp (modified) (8 diffs)
• VBoxIPC.h (modified) (1 diff)
• VBoxLA.cpp (modified) (6 diffs)
• VBoxSeamless.cpp (modified) (6 diffs)
• VBoxSessionTracking.cpp (modified) (4 diffs)
• VBoxTray.cpp (modified) (45 diffs)
• VBoxTray.h (modified) (7 diffs)
• VBoxTrayInternal.h (modified) (1 diff)
• VBoxTrayLogging.cpp (added)
• VBoxVRDP.cpp (modified) (6 diffs)
• VBoxVRDP.h (modified) (1 diff)

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

@@ -49 +49 @@
 VBoxTray_SOURCES  = \
         VBoxTray.cpp \
+        VBoxTrayLogging.cpp \
         VBoxCaps.cpp \
         VBoxConsole.cpp \

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

@@ -34 +34 @@
 
 #include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 #include "VBoxHelpers.h"
 
@@ -62 +63 @@
 {
     /** Pointer to the VBoxClient service environment. */
-    const VBOXSERVICEENV *pEnv;
+    const VBOXTRAYSVCENV *pEnv;
     /** Command context. */
     VBGLR3SHCLCMDCTX      CmdCtx;
@@ -315 +316 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("Shared Clipboard: Starting transfer failed, rc=%Rrc\n", rc));
+        VBoxTrayError("Shared Clipboard: Starting transfer failed, rc=%Rrc\n", rc);
 }
 
@@ -326 +327 @@
     LogFlowFunc(("rcCompletion=%Rrc\n", rcCompletion));
 
-    LogRel2(("Shared Clipboard: Transfer %RU16 %s\n",
-             ShClTransferGetID(pCbCtx->pTransfer), rcCompletion == VERR_CANCELLED ? "canceled" : "complete"));
+    VBoxTrayVerbose(1, "Shared Clipboard: Transfer %RU16 %s\n",
+                    ShClTransferGetID(pCbCtx->pTransfer), rcCompletion == VERR_CANCELLED ? "canceled" : "complete");
 
     SHCLTRANSFERSTATUS enmSts;
@@ -356 +357 @@
     AssertPtr(pCtx);
 
-    LogRel(("Shared Clipboard: Transfer %RU16 failed with %Rrc\n", ShClTransferGetID(pCbCtx->pTransfer), rcError));
+    VBoxTrayError("Shared Clipboard: Transfer %RU16 failed with %Rrc\n", ShClTransferGetID(pCbCtx->pTransfer), rcError);
 
     if (g_cVerbosity) /* Only show this in verbose mode. */
@@ -368 +369 @@
                     "Transfer %RU16 failed with %Rrc", ShClTransferGetID(pCbCtx->pTransfer), rcError);
 
-        hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                          szMsg, szTitle,
-                          5000 /* Time to display in msec */, NIIF_INFO);
+        VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                                    szMsg, szTitle,
+                                    5000 /* Time to display in msec */, NIIF_INFO);
     }
 
@@ -426 +427 @@
 
             if (RT_FAILURE(rc))
-                LogRel(("Shared Clipboard: WM_CLIPBOARDUPDATE failed with %Rrc\n", rc));
+                VBoxTrayError("Shared Clipboard: WM_CLIPBOARDUPDATE failed with %Rrc\n", rc);
 
             break;
@@ -495 +496 @@
 
             LogFunc(("WM_RENDERFORMAT: uFmtWin=%u -> uFmtVBox=0x%x\n", uFmtWin, uFmtVBox));
-#ifdef LOG_ENABLED
+
             char *pszFmts = ShClFormatsToStrA(uFmtVBox);
             AssertPtrReturn(pszFmts, 0);
-            LogRel(("Shared Clipboard: Rendering Windows format %#x as VBox format '%s'\n", uFmtWin, pszFmts));
+            VBoxTrayVerbose(1, "Shared Clipboard: Rendering Windows format %#x as VBox format '%s'\n", uFmtWin, pszFmts);
             RTStrFree(pszFmts);
-#endif
+
             if (uFmtVBox == VBOX_SHCL_FMT_NONE)
             {
-                LogRel(("Shared Clipboard: Unsupported format (%#x) requested\n", uFmtWin));
+                VBoxTrayInfo("Shared Clipboard: Unsupported format (%#x) requested\n", uFmtWin);
                 ShClWinClear();
             }
@@ -523 +524 @@
                             cbData = (uint32_t)((cwcActual + 1 /* '\0' */) * sizeof(RTUTF16));
                         else
-                            LogRel(("Shared Clipboard: Invalid UTF16 string from host: cb=%RU32, cwcActual=%zu, rc=%Rrc\n",
-                                    cbData, cwcActual, rc));
+                            VBoxTrayError("Shared Clipboard: Invalid UTF16 string from host: cb=%RU32, cwcActual=%zu, rc=%Rrc\n",
+                                          cbData, cwcActual, rc);
                     }
                     else if (uFmtVBox == VBOX_SHCL_FMT_HTML)
@@ -549 +550 @@
 
                             if (RT_FAILURE(rc))
-                                LogRel(("Shared Clipboard: Cannot convert HTML clipboard data into CF_HTML clipboard format, rc=%Rrc\n", rc));
+                                VBoxTrayError("Shared Clipboard: Cannot convert HTML clipboard data into CF_HTML clipboard format, rc=%Rrc\n", rc);
                         }
                     }
@@ -569 +570 @@
                             }
                             else
-                                LogRel(("Shared Clipboard: Setting host data buffer to clipboard failed with %Rrc\n",
-                                        RTErrConvertFromWin32(GetLastError())));
+                                VBoxTrayError("Shared Clipboard: Setting host data buffer to clipboard failed with %Rrc\n",
+                                              RTErrConvertFromWin32(GetLastError()));
                         }
                         else
-                            LogRel(("Shared Clipboard: Failed to lock memory (%Rrc)\n", RTErrConvertFromWin32(GetLastError())));
+                            VBoxTrayError("Shared Clipboard: Failed to lock memory (%Rrc)\n", RTErrConvertFromWin32(GetLastError()));
                         GlobalFree(hMem);
                     }
                     else
-                        LogRel(("Shared Clipboard: No memory for allocating host data buffer\n"));
+                        VBoxTrayError("Shared Clipboard: No memory for allocating host data buffer\n");
                 }
             }
@@ -605 +606 @@
             const SHCLFORMATS fFormats = pEvent->u.fReportedFormats;
 
-#ifdef LOG_ENABLED
             char *pszFmts = ShClFormatsToStrA(fFormats);
             AssertPtrReturn(pszFmts, 0);
-            LogRel(("Shared Clipboard: Host reported formats '%s'\n", pszFmts));
+            VBoxTrayVerbose(1, "Shared Clipboard: Host reported formats '%s'\n", pszFmts);
             RTStrFree(pszFmts);
-#endif
+
             if (fFormats != VBOX_SHCL_FMT_NONE) /* Could arrive with some older GA versions. */
             {
@@ -647 +647 @@
 
             LogFlowFunc(("SHCL_WIN_WM_READ_DATA: fFormat=%#x\n", fFormat));
-#ifdef LOG_ENABLED
+
             char *pszFmts = ShClFormatsToStrA(fFormat);
             AssertPtrReturn(pszFmts, 0);
-            LogRel(("Shared Clipboard: Sending data to host as '%s'\n", pszFmts));
+            VBoxTrayVerbose(1, "Shared Clipboard: Sending data to host as '%s'\n", pszFmts);
             RTStrFree(pszFmts);
-#endif
+
             int rc = ShClWinOpen(hwnd);
             HANDLE hClip = NULL;
@@ -838 +838 @@
     if (FAILED(hr))
     {
-        LogRel(("Shared Clipboard: Initializing OLE in window thread failed (%Rhrc) -- file transfers unavailable\n", hr));
+        VBoxTrayError("Shared Clipboard: Initializing OLE in window thread failed (%Rhrc) -- file transfers unavailable\n", hr);
         /* Not critical, the rest of the clipboard might work. */
     }
     else
-        LogRel(("Shared Clipboard: Initialized OLE in window thread\n"));
+        VBoxTrayInfo("Shared Clipboard: Initialized OLE in window thread\n");
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 
@@ -848 +848 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("Shared Clipboard: Unable to create window, rc=%Rrc\n", rc));
+        VBoxTrayError("Shared Clipboard: Unable to create window, rc=%Rrc\n", rc);
         return rc;
     }
@@ -857 +857 @@
     bool fSignalled = RT_SUCCESS(rc2);
 
-    LogRel2(("Shared Clipboard: Window thread running\n"));
+    VBoxTrayInfo("Shared Clipboard: Window thread running\n");
 
     if (RT_SUCCESS(rc))
@@ -890 +890 @@
 #endif
 
-    LogRel(("Shared Clipboard: Window thread ended\n"));
+    VBoxTrayInfo("Shared Clipboard: Window thread ended\n");
 
     LogFlowFuncLeaveRC(rc);
@@ -905 +905 @@
 }
 
-DECLCALLBACK(int) vbtrShClInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbtrShClPreInit(void)
+{
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnOption}
+ */
+static DECLCALLBACK(int) vbtrShClOption(const char **ppszShort, int argc, char **argv, int *pi)
+{
+    RT_NOREF(ppszShort, argc, argv, pi);
+
+    return -1;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+DECLCALLBACK(int) vbtrShClInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
 {
     LogFlowFuncEnter();
@@ -921 +942 @@
     {
         /* Do not use clipboard for remote sessions. */
-        LogRel(("Shared Clipboard: Clipboard has been disabled for a remote session\n"));
+        VBoxTrayInfo("Shared Clipboard: Clipboard has been disabled for a remote session\n");
         return VERR_NOT_SUPPORTED;
     }
@@ -966 +987 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("Shared Clipboard: Unable to initialize, rc=%Rrc\n", rc));
+        VBoxTrayError("Shared Clipboard: Unable to initialize, rc=%Rrc\n", rc);
 
     LogFlowFuncLeaveRC(rc);
@@ -972 +993 @@
 }
 
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnWorker}
+ */
 DECLCALLBACK(int) vbtrShClWorker(void *pInstance, bool volatile *pfShutdown)
 {
@@ -988 +1012 @@
     const PSHCLWINCTX pWinCtx = &pCtx->Win;
 
-    LogRel2(("Shared Clipboard: Worker loop running\n"));
+    VBoxTrayVerbose(1, "Shared Clipboard: Worker loop running\n");
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
@@ -994 +1018 @@
     if (FAILED(hr))
     {
-        LogRel(("Shared Clipboard: Initializing OLE in worker thread failed (%Rhrc) -- file transfers unavailable\n", hr));
+        VBoxTrayError("Shared Clipboard: Initializing OLE in worker thread failed (%Rhrc) -- file transfers unavailable\n", hr);
         /* Not critical, the rest of the clipboard might work. */
     }
     else
-        LogRel(("Shared Clipboard: Initialized OLE in worker thread\n"));
+        VBoxTrayInfo("Shared Clipboard: Initialized OLE in worker thread\n");
 
     /*
@@ -1093 +1117 @@
                 case VBGLR3CLIPBOARDEVENTTYPE_QUIT:
                 {
-                    LogRel2(("Shared Clipboard: Host requested termination\n"));
+                    VBoxTrayVerbose(1, "Shared Clipboard: Host requested termination\n");
                     ASMAtomicXchgBool(pfShutdown, true);
                     break;
@@ -1130 +1154 @@
     }
 
-    LogRel2(("Shared Clipboard: Worker loop ended\n"));
+    VBoxTrayVerbose(1, "Shared Clipboard: Worker loop ended\n");
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
@@ -1141 +1165 @@
 }
 
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnStop}
+ */
 DECLCALLBACK(int) vbtrShClStop(void *pInstance)
 {
@@ -1165 +1192 @@
 }
 
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnDestroy}
+ */
 DECLCALLBACK(void) vbtrShClDestroy(void *pInstance)
 {
@@ -1177 +1207 @@
     LogFlowFunc(("pCtx=%p\n", pCtx));
 
-    LogRel2(("Shared Clipboard: Destroying ...\n"));
+    VBoxTrayVerbose(1, "Shared Clipboard: Destroying ...\n");
 
     const PSHCLWINCTX pWinCtx = &pCtx->Win;
@@ -1206 +1236 @@
     RTReqQueueDestroy(pCtx->Win.hReqQ);
 
-    LogRel2(("Shared Clipboard: Destroyed\n"));
+    VBoxTrayVerbose(1, "Shared Clipboard: Destroyed\n");
 
     return;
@@ -1214 +1244 @@
  * The service description.
  */
-VBOXSERVICEDESC g_SvcDescClipboard =
+VBOXTRAYSVCDESC g_SvcDescClipboard =
 {
     /* pszName. */
@@ -1220 +1250 @@
     /* pszDescription. */
     "Shared Clipboard",
+    /* pszUsage. */
+    NULL,
+    /* pszOptions. */
+    NULL,
     /* methods */
+    vbtrShClPreInit,
+    vbtrShClOption,
     vbtrShClInit,
     vbtrShClWorker,

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

@@ -216 +216 @@
     gVBoxDt.fIsInputDesktop = TRUE;
 
+    if (RT_FAILURE(rc))
+        VBoxTrayError("Initializing desktop tracking failed with %Rrc\n", rc);
+
     return rc;
 }

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

@@ -51 +51 @@
 typedef struct _VBOXDISPLAYCONTEXT
 {
-    const VBOXSERVICEENV *pEnv;
+    const VBOXTRAYSVCENV *pEnv;
     BOOL fAnyX;
     /** ChangeDisplaySettingsEx does not exist in NT. ResizeDisplayDevice uses the function. */
@@ -83 +83 @@
 
 
-static DECLCALLBACK(int) VBoxDisplayInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbtrDispPreInit(void)
+{
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnOption}
+ */
+static DECLCALLBACK(int) vbtrDispOption(const char **ppszShort, int argc, char **argv, int *pi)
+{
+    RT_NOREF(ppszShort, argc, argv, pi);
+
+    return -1;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+static DECLCALLBACK(int) vbtrDisplayInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
 {
     LogFlowFuncEnter();
@@ -172 +193 @@
 }
 
-static DECLCALLBACK(void) VBoxDisplayDestroy(void *pInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnDestroy}
+ */
+static DECLCALLBACK(void) vbtrDisplayDestroy(void *pInstance)
 {
     RT_NOREF(pInstance);
@@ -898 +922 @@
 
 /**
- * Thread function to wait for and process display change requests.
+ * @interface_method_impl{VBOXSERVICEDESC,pfnWorker}
  */
-static DECLCALLBACK(int) VBoxDisplayWorker(void *pvInstance, bool volatile *pfShutdown)
+static DECLCALLBACK(int) vbtrDisplayWorker(void *pvInstance, bool volatile *pfShutdown)
 {
     AssertPtr(pvInstance);
@@ -989 +1013 @@
  * The service description.
  */
-VBOXSERVICEDESC g_SvcDescDisplay =
+VBOXTRAYSVCDESC g_SvcDescDisplay =
 {
     /* pszName. */
@@ -995 +1019 @@
     /* pszDescription. */
     "Display Notifications",
+    /* pszUsage. */
+    NULL,
+    /* pszOptions. */
+    NULL,
     /* methods */
-    VBoxDisplayInit,
-    VBoxDisplayWorker,
+    vbtrDispPreInit,
+    vbtrDispOption,
+    vbtrDisplayInit,
+    vbtrDisplayWorker,
     NULL /* pfnStop */,
-    VBoxDisplayDestroy
+    vbtrDisplayDestroy
 };
 

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

@@ -35 +35 @@
 #include <iprt/win/windows.h>
 #include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 #include "VBoxHelpers.h"
 #include "VBoxDnD.h"
@@ -130 +131 @@
  * Initializes the proxy window with a given DnD context.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   a_pCtx  Pointer to context to use.
  */
@@ -161 +162 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("DnD: Failed to initialize proxy window, rc=%Rrc\n", rc));
+        VBoxTrayError("DnD: Failed to initialize proxy window, rc=%Rrc\n", rc);
 
     LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
@@ -203 +204 @@
  * Thread for handling the window's message pump.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   hThread                 Handle to this thread.
  * @param   pvUser                  Pointer to VBoxDnDWnd instance which
@@ -312 +313 @@
     else
     {
-        LogRel(("DnD: Unable to initialize OLE, hr=%Rhrc\n", hr));
+        VBoxTrayError("DnD: Unable to initialize OLE, hr=%Rhrc\n", hr);
         rc = VERR_COM_UNEXPECTED;
     }
@@ -415 +416 @@
             if (RT_FAILURE(rc))
             {
-                LogRel(("DnD: Failed to create proxy window, rc=%Rrc\n", rc));
+                VBoxTrayError("DnD: Failed to create proxy window, rc=%Rrc\n", rc);
                 return -1;
             }
@@ -626 +627 @@
                 case VBGLR3DNDEVENTTYPE_QUIT:
                 {
-                    LogRel(("DnD: Received quit message, shutting down ...\n"));
+                    VBoxTrayInfo("DnD: Received quit message, shutting down ...\n");
                     PostQuitMessage(0);
                 }
@@ -652 +653 @@
                 default:
                 {
-                    LogRel(("DnD: Received unsupported message '%RU32'\n", pVbglR3Event->enmType));
+                    VBoxTrayVerbose(1, "DnD: Received unsupported message '%RU32'\n", pVbglR3Event->enmType);
                     rc = VERR_NOT_SUPPORTED;
                     break;
@@ -662 +663 @@
             {
                 /* Tell the user. */
-                LogRel(("DnD: Processing message %RU32 failed with %Rrc\n", pVbglR3Event->enmType, rc));
+                VBoxTrayError("DnD: Processing message %RU32 failed with %Rrc\n", pVbglR3Event->enmType, rc);
 
                 /* If anything went wrong, do a reset and start over. */
@@ -691 +692 @@
  * Registers this proxy window as a local drop target.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::RegisterAsDropTarget(void)
@@ -721 +722 @@
     }
     if (hrc != DRAGDROP_E_INVALIDHWND) /* Could be because the DnD host service is not available. */
-        LogRel(("DnD: Creating drop target failed with hr=%Rhrc\n", hrc));
+        VBoxTrayError("DnD: Creating drop target failed with hr=%Rhrc\n", hrc);
+
     LogFlowFuncLeaveRC(VERR_NOT_SUPPORTED);
     return VERR_NOT_SUPPORTED; /* Report back DnD as not being supported. */
@@ -729 +731 @@
  * Unregisters this proxy as a drop target.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::UnregisterAsDropTarget(void)
@@ -761 +763 @@
  * Handles the creation of a proxy window.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::OnCreate(void)
@@ -769 +771 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("DnD: Connection to host service failed, rc=%Rrc\n", rc));
+        VBoxTrayError("DnD: Connection to host service failed, rc=%Rrc\n", rc);
         return rc;
     }
@@ -796 +798 @@
 {
     LogFlowThisFunc(("mMode=%ld, mState=%RU32\n", m_enmMode, m_enmState));
-    LogRel(("DnD: Drag and drop operation aborted\n"));
+    VBoxTrayInfo("DnD: Drag and drop operation aborted\n");
 
     int rc = RTCritSectEnter(&m_CritSect);
@@ -820 +822 @@
  * the guest's screen to initiate a host -> guest DnD operation.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   a_lstFormats            Supported formats offered by the host.
  * @param   a_fDndLstActionsAllowed Supported actions offered by the host.
@@ -859 +861 @@
     AssertReturnStmt(paFormatEtc, RTMemTmpFree(paFormatEtc), VERR_NO_TMP_MEMORY);
 
-    LogRel2(("DnD: Reported formats:\n"));
+    VBoxTrayVerbose(1, "DnD: Reported formats:\n");
     for (size_t i = 0; i < a_lstFormats.size(); i++)
     {
@@ -908 +910 @@
         }
 
-        LogRel2(("DnD: \t%s: %RTbool\n", a_lstFormats.at(i).c_str(), fSupported));
+        VBoxTrayVerbose(1, "DnD: \t%s: %RTbool\n", a_lstFormats.at(i).c_str(), fSupported);
     }
 
@@ -927 +929 @@
         }
 
-        hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                          strMsg.c_str(), VBOX_DND_SHOWBALLOON_HEADER,
-                          15 * 1000 /* Time to display in msec */, NIIF_INFO);
+        VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                                    strMsg.c_str(), VBOX_DND_SHOWBALLOON_HEADER,
+                                    15 * 1000 /* Time to display in msec */, NIIF_INFO);
     }
 
@@ -938 +940 @@
     if (cFormatsActive)
     {
-        LogRel2(("DnD: %RU32 supported formats found:\n", cFormatsActive));
+        VBoxTrayVerbose(1, "DnD: %RU32 supported formats found:\n", cFormatsActive);
         for (size_t i = 0; i < cFormatsActive; i++)
-            LogRel2(("DnD: \t%s\n", this->m_lstFmtActive.at(i).c_str()));
+            VBoxTrayVerbose(1, "DnD: \t%s\n", this->m_lstFmtActive.at(i).c_str());
     }
     else
-        LogRel(("DnD: Warning: No supported drag and drop formats on the guest found!\n"));
+        VBoxTrayInfo("DnD: Warning: No supported drag and drop formats on the guest found!\n");
 
     /*
@@ -961 +963 @@
     }
 
-    LogRel2(("DnD: Supported drop actions: 0x%x\n", m_startupInfo.dwOKEffects));
+    VBoxTrayVerbose(1, "DnD: Supported drop actions: 0x%x\n", m_startupInfo.dwOKEffects);
 
 #ifdef RT_EXCEPTIONS_ENABLED
@@ -994 +996 @@
  * the guest's screen.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   u32xPos                 Absolute X position (in pixels) of the host cursor
  *                                  inside the guest.
@@ -1044 +1046 @@
  * the guest's screen again.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::OnHgLeave(void)
@@ -1052 +1054 @@
 
     if (g_cVerbosity)
-        hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                          "Leave: Host -> Guest", VBOX_DND_SHOWBALLOON_HEADER,
-                          15 * 1000 /* Time to display in msec */, NIIF_INFO);
+        VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                                    "Leave: Host -> Guest", VBOX_DND_SHOWBALLOON_HEADER,
+                                    15 * 1000 /* Time to display in msec */, NIIF_INFO);
 
     int rc = Abort();
@@ -1066 +1068 @@
  * and therefore start a "drop" action in the guest.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::OnHgDrop(void)
@@ -1079 +1081 @@
     {
         if (g_cVerbosity)
-            hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                              "Drop: Host -> Guest", VBOX_DND_SHOWBALLOON_HEADER,
-                              15 * 1000 /* Time to display in msec */, NIIF_INFO);
+            VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                                        "Drop: Host -> Guest", VBOX_DND_SHOWBALLOON_HEADER,
+                                        15 * 1000 /* Time to display in msec */, NIIF_INFO);
 
         if (m_lstFmtActive.size() >= 1)
@@ -1101 +1103 @@
             if (RT_SUCCESS(rc))
             {
-                LogRel(("DnD: Requesting data as '%s' ...\n", m_strFmtReq.c_str()));
+                VBoxTrayInfo("DnD: Requesting data as '%s' ...\n", m_strFmtReq.c_str());
                 rc = VbglR3DnDHGSendReqData(&m_cmdCtx, m_strFmtReq.c_str());
                 if (RT_FAILURE(rc))
@@ -1109 +1111 @@
         }
         else /* Should never happen. */
-            LogRel(("DnD: Error: Host did not specify a data format for drop data\n"));
+            VBoxTrayError("DnD: Host did not specify a data format for drop data\n");
     }
 
@@ -1120 +1122 @@
  * to the guest after a "drop" event.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pMeta                   Pointer to meta data received.
  */
@@ -1147 +1149 @@
                 case VBGLR3GUESTDNDMETADATATYPE_URI_LIST:
                 {
-                    LogRel2(("DnD: URI transfer root directory is '%s'\n", DnDTransferListGetRootPathAbs(&pMeta->u.URI.Transfer)));
+                    VBoxTrayVerbose(1, "DnD: URI transfer root directory is '%s'\n",
+                                    DnDTransferListGetRootPathAbs(&pMeta->u.URI.Transfer));
 
                     char  *pszBuf;
@@ -1186 +1189 @@
  * host -> guest operation.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::OnHgCancel(void)
@@ -1213 +1216 @@
  * this class again.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::OnGhIsDnDPending(void)
@@ -1335 +1338 @@
                 case VERR_ACCESS_DENIED:
                 {
-                    rc = hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                                           szMsg, szTitle,
-                                           15 * 1000 /* Time to display in msec */, NIIF_INFO);
+                    rc = VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                                                     szMsg, szTitle,
+                                                     15 * 1000 /* Time to display in msec */, NIIF_INFO);
                     AssertRC(rc);
                     break;
@@ -1346 +1349 @@
             }
 
-            LogRel2(("DnD: Host refuses drag and drop operation from guest: %Rrc\n", rc2));
+            VBoxTrayVerbose(1, "DnD: Host refuses drag and drop operation from guest: %Rrc\n", rc2);
             Reset();
         }
@@ -1363 +1366 @@
  * to send data in a specific format the host requested.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pszFormat               Format the host requests the data in.
  * @param   cbFormat                Size (in bytes) of format string.
@@ -1381 +1384 @@
             strMsg += RTCStringFmt("Format: %s\n", strFormat.c_str());
 
-            hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                              strMsg.c_str(), VBOX_DND_SHOWBALLOON_HEADER,
-                              15 * 1000 /* Time to display in msec */, NIIF_INFO);
+            VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                                        strMsg.c_str(), VBOX_DND_SHOWBALLOON_HEADER,
+                                        15 * 1000 /* Time to display in msec */, NIIF_INFO);
         }
 
@@ -1448 +1451 @@
  * this class after processing.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pEvent                  Event to inject.
  */
@@ -1464 +1467 @@
         if (s_iBitchedAboutFailedDnDMessages++ < 32)
         {
-            LogRel(("DnD: Processing event %p failed with %ld (%Rrc), skipping\n",
-                    pEvent, dwErr, RTErrConvertFromWin32(dwErr)));
+            VBoxTrayError("DnD: Processing event %p failed with %ld (%Rrc), skipping\n",
+                          pEvent, dwErr, RTErrConvertFromWin32(dwErr));
         }
 
@@ -1483 +1486 @@
  * and do a reconnect to the DnD HGCM service.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  */
 int VBoxDnDWnd::checkForSessionChange(void)
@@ -1508 +1511 @@
  * Hides the proxy window again.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::Hide(void)
@@ -1524 +1527 @@
  * spawned across all active guest monitors.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::makeFullscreen(void)
@@ -1588 +1591 @@
         {
             DWORD dwErr = GetLastError();
-            LogRel(("DnD: Failed to set proxy window position, rc=%Rrc\n",
-                    RTErrConvertFromWin32(dwErr)));
+            VBoxTrayError("DnD: Failed to set proxy window position, rc=%Rrc\n",
+                          RTErrConvertFromWin32(dwErr));
         }
     }
     else
-        LogRel(("DnD: Failed to determine virtual screen size, rc=%Rrc\n", rc));
+        VBoxTrayError("DnD: Failed to determine virtual screen size, rc=%Rrc\n", rc);
 
     LogFlowFuncLeaveRC(rc);
@@ -1602 +1605 @@
  * Moves the guest mouse cursor to a specific position.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   x                       X position (in pixels) to move cursor to.
  * @param   y                       Y position (in pixels) to move cursor to.
@@ -1648 +1651 @@
  * Releases a previously pressed left guest mouse button.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  */
 int VBoxDnDWnd::mouseRelease(void)
@@ -1699 +1702 @@
  * Sets the current operation mode of this proxy window.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   enmMode                 New mode to set.
  */
@@ -1751 +1754 @@
 }
 
-/**
- * Initializes drag and drop.
- *
- * @return  IPRT status code.
- * @param   pEnv                        The DnD service's environment.
- * @param   ppInstance                  The instance pointer which refer to this object.
- */
-DECLCALLBACK(int) VBoxDnDInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbtrDnDPreInit(void)
+{
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnOption}
+ */
+static DECLCALLBACK(int) vbtrDnDOption(const char **ppszShort, int argc, char **argv, int *pi)
+{
+    RT_NOREF(ppszShort, argc, argv, pi);
+
+    return -1;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+DECLCALLBACK(int) vbtrDnDInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
 {
     AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
@@ -1774 +1793 @@
     {
         /* Do not do drag and drop for remote sessions. */
-        LogRel(("DnD: Drag and drop has been disabled for a remote session\n"));
+        VBoxTrayInfo("DnD: Drag and drop has been disabled for a remote session\n");
         rc = VERR_NOT_SUPPORTED;
     }
@@ -1791 +1810 @@
         if (!fSupportedOS)
         {
-            LogRel(("DnD: Not supported Windows version, disabling drag and drop support\n"));
+            VBoxTrayInfo("DnD: Not supported Windows version, disabling drag and drop support\n");
             rc = VERR_NOT_SUPPORTED;
         }
@@ -1842 +1861 @@
         *ppInstance = pCtx;
 
-        LogRel(("DnD: Drag and drop service successfully started\n"));
+        VBoxTrayInfo("DnD: Drag and drop service successfully started\n");
     }
     else
-        LogRel(("DnD: Initializing drag and drop service failed with rc=%Rrc\n", rc));
+        VBoxTrayError("DnD: Initializing drag and drop service failed with rc=%Rrc\n", rc);
 
     LogFlowFuncLeaveRC(rc);
@@ -1851 +1870 @@
 }
 
-DECLCALLBACK(int) VBoxDnDStop(void *pInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnStop}
+ */
+DECLCALLBACK(int) vbtrDnDStop(void *pInstance)
 {
     AssertPtrReturn(pInstance, VERR_INVALID_POINTER);
@@ -1870 +1892 @@
 }
 
-DECLCALLBACK(void) VBoxDnDDestroy(void *pInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+DECLCALLBACK(void) vbtrDnDDestroy(void *pInstance)
 {
     AssertPtrReturnVoid(pInstance);
@@ -1897 +1922 @@
 }
 
-DECLCALLBACK(int) VBoxDnDWorker(void *pInstance, bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnWorker}
+ */
+DECLCALLBACK(int) vbtrDnDWorker(void *pInstance, bool volatile *pfShutdown)
 {
     AssertPtr(pInstance);
@@ -1918 +1946 @@
 
     if (g_cVerbosity)
-        hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                          RTCStringFmt("Running (worker client ID %RU32)", pCtx->cmdCtx.uClientID).c_str(),
-                          VBOX_DND_SHOWBALLOON_HEADER,
-                          15 * 1000 /* Time to display in msec */, NIIF_INFO);
+        VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                                    RTCStringFmt("Running (worker client ID %RU32)", pCtx->cmdCtx.uClientID).c_str(),
+                                    VBOX_DND_SHOWBALLOON_HEADER,
+                                    15 * 1000 /* Time to display in msec */, NIIF_INFO);
 
     /** @todo At the moment we only have one DnD proxy window. */
@@ -1950 +1978 @@
             cMsgSkippedInvalid = 0; /* Reset skipped messages count. */
 
-            LogRel2(("DnD: Received new event, type=%RU32, rc=%Rrc\n", pVbglR3Event->enmType, rc));
+            VBoxTrayVerbose(2, "DnD: Received new event, type=%RU32, rc=%Rrc\n", pVbglR3Event->enmType, rc);
 
             /* pEvent now owns pVbglR3Event. */
@@ -1963 +1991 @@
             }
             else
-                LogRel(("DnD: Processing proxy window event %RU32 failed with %Rrc\n", pVbglR3Event->enmType, rc));
+                VBoxTrayInfo("DnD: Processing proxy window event %RU32 failed with %Rrc\n", pVbglR3Event->enmType, rc);
         }
 
@@ -1981 +2009 @@
             if (cMsgSkippedInvalid++ > 32)
             {
-                LogRel(("DnD: Too many invalid/skipped messages from host, exiting ...\n"));
+                VBoxTrayInfo("DnD: Too many invalid/skipped messages from host, exiting ...\n");
                 break;
             }
@@ -2011 +2039 @@
     VbglR3DnDDisconnect(&pCtx->cmdCtx);
 
-    LogRel(("DnD: Ended\n"));
+    VBoxTrayInfo("DnD: Ended\n");
 
     LogFlowFuncLeaveRC(rc);
@@ -2020 +2048 @@
  * The service description.
  */
-VBOXSERVICEDESC g_SvcDescDnD =
+VBOXTRAYSVCDESC g_SvcDescDnD =
 {
     /* pszName. */
@@ -2026 +2054 @@
     /* pszDescription. */
     "Drag and Drop",
+    /* pszUsage. */
+    NULL,
+    /* pszOptions. */
+    NULL,
     /* methods */
-    VBoxDnDInit,
-    VBoxDnDWorker,
-    VBoxDnDStop,
-    VBoxDnDDestroy
+    vbtrDnDPreInit,
+    vbtrDnDOption,
+    vbtrDnDInit,
+    vbtrDnDWorker,
+    vbtrDnDStop,
+    vbtrDnDDestroy
 };
 

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

@@ -276 +276 @@
 {
     /** Pointer to the service environment. */
-    const VBOXSERVICEENV      *pEnv;
+    const VBOXTRAYSVCENV      *pEnv;
     /** Started indicator. */
     bool                       fStarted;

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

@@ -40 +40 @@
 
 #include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 #include "VBoxHelpers.h"
 #include "VBoxDnD.h"
@@ -129 +130 @@
     if (m_enmStatus == Status_Dropping)
     {
-        LogRel2(("DnD: Waiting for drop event ...\n"));
+        VBoxTrayVerbose(2, "DnD: Waiting for drop event ...\n");
         int rc2 = RTSemEventWait(m_EvtDropped, RT_INDEFINITE_WAIT);
         LogFlowFunc(("rc2=%Rrc, mStatus=%ld\n", rc2, m_enmStatus)); RT_NOREF(rc2);
@@ -136 +137 @@
     if (m_enmStatus == Status_Dropped)
     {
-        LogRel2(("DnD: Drop event received\n"));
-        LogRel3(("DnD: cfFormat=%RI16, sFormat=%s, tyMed=%RU32, dwAspect=%RU32\n",
-                 pThisFormat->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(pFormatEtc->cfFormat),
-                 pThisFormat->tymed, pThisFormat->dwAspect));
-        LogRel3(("DnD: Got strFormat=%s, pvData=%p, cbData=%RU32\n",
-                  m_strFormat.c_str(), m_pvData, m_cbData));
+        VBoxTrayVerbose(2, "DnD: Drop event received\n");
+        VBoxTrayVerbose(3, "DnD: cfFormat=%RI16, sFormat=%s, tyMed=%RU32, dwAspect=%RU32\n",
+                        pThisFormat->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(pFormatEtc->cfFormat),
+                        pThisFormat->tymed, pThisFormat->dwAspect);
+        VBoxTrayVerbose(3, "DnD: Got strFormat=%s, pvData=%p, cbData=%RU32\n",
+                        m_strFormat.c_str(), m_pvData, m_cbData);
 
         /*
@@ -160 +161 @@
                 && cFiles)
             {
-                LogRel2(("DnD: Files (%zu)\n", cFiles));
+                VBoxTrayVerbose(1, "DnD: Files (%zu)\n", cFiles);
                 for (size_t i = 0; i < cFiles; i++)
-                    LogRel2(("\tDnD: File '%s'\n", papszFiles[i]));
+                    VBoxTrayVerbose(1, "\tDnD: File '%s'\n", papszFiles[i]);
 
 #if 0
@@ -636 +637 @@
             && pFormatEtc->dwAspect == m_paFormatEtc[i].dwAspect)
         {
-            LogRel3(("DnD: Format found: tyMed=%RI32, cfFormat=%RI16, sFormats=%s, dwAspect=%RI32, ulIndex=%RU32\n",
-                      pFormatEtc->tymed, pFormatEtc->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(m_paFormatEtc[i].cfFormat),
-                      pFormatEtc->dwAspect, i));
+            VBoxTrayVerbose(3, "DnD: Format found: tyMed=%RI32, cfFormat=%RI16, sFormats=%s, dwAspect=%RI32, ulIndex=%RU32\n",
+                            pFormatEtc->tymed, pFormatEtc->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(m_paFormatEtc[i].cfFormat),
+                            pFormatEtc->dwAspect, i);
             if (puIndex)
                 *puIndex = i;
@@ -645 +646 @@
     }
 
-    LogRel3(("DnD: Format NOT found: tyMed=%RI32, cfFormat=%RI16, sFormats=%s, dwAspect=%RI32\n",
-             pFormatEtc->tymed, pFormatEtc->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(pFormatEtc->cfFormat),
-             pFormatEtc->dwAspect));
+    VBoxTrayVerbose(3, "DnD: Format NOT found: tyMed=%RI32, cfFormat=%RI16, sFormats=%s, dwAspect=%RI32\n",
+                    pFormatEtc->tymed, pFormatEtc->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(pFormatEtc->cfFormat),
+                    pFormatEtc->dwAspect);
 
     return false;
@@ -728 +729 @@
 
     /* Signal in any case. */
-    LogRel2(("DnD: Signalling drop event\n"));
+    VBoxTrayVerbose(2, "DnD: Signalling drop event\n");
 
     int rc2 = RTSemEventSignal(m_EvtDropped);

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

@@ -34 +34 @@
 
 #include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 #include "VBoxHelpers.h"
 #include "VBoxDnD.h"
@@ -120 +121 @@
     if (SUCCEEDED(hr2))
     {
-        LogRel(("DnD: The following formats were offered to us:\n"));
+        VBoxTrayVerbose(1, "DnD: The following formats were offered to us:\n");
 
         FORMATETC curFormatEtc;
@@ -129 +130 @@
             hr2 = GetClipboardFormatNameW(curFormatEtc.cfFormat, wszCfName,
                                           sizeof(wszCfName) / sizeof(WCHAR));
-            LogRel(("\tcfFormat=%RI16 (%s), tyMed=%RI32, dwAspect=%RI32, strCustomName=%ls, hr=%Rhrc\n",
-                    curFormatEtc.cfFormat,
-                    VBoxDnDDataObject::ClipboardFormatToString(curFormatEtc.cfFormat),
-                    curFormatEtc.tymed,
-                    curFormatEtc.dwAspect,
-                    wszCfName, hr2));
+            VBoxTrayVerbose(1, "\tcfFormat=%RI16 (%s), tyMed=%RI32, dwAspect=%RI32, strCustomName=%ls, hr=%Rhrc\n",
+                            curFormatEtc.cfFormat,
+                            VBoxDnDDataObject::ClipboardFormatToString(curFormatEtc.cfFormat),
+                            curFormatEtc.tymed,
+                            curFormatEtc.dwAspect,
+                            wszCfName, hr2);
         }
 
@@ -228 +229 @@
             case ERROR_INVALID_FUNCTION:
             {
-                LogRel(("DnD: Drag and drop format is not supported by VBoxTray\n"));
+                VBoxTrayError("DnD: Drag and drop format is not supported by VBoxTray\n");
                 VBoxDnDDropTarget::DumpFormats(pDataObject);
                 break;
@@ -353 +354 @@
                         size_t cbSize = GlobalSize(pvData);
 
-                        LogRel(("DnD: Got %zu bytes of %s\n", cbSize,
-                                                                m_FormatEtc.cfFormat == CF_TEXT
-                                                              ? "ANSI text" : "Unicode text"));
+                        VBoxTrayVerbose(2, "DnD: Got %zu bytes of %s\n", cbSize,
+                                          m_FormatEtc.cfFormat == CF_TEXT
+                                        ? "ANSI text" : "Unicode text");
                         if (cbSize)
                         {
@@ -409 +410 @@
                         UINT cFiles = DragQueryFile(hDrop, UINT32_MAX /* iFile */, NULL /* lpszFile */, 0 /* cchFile */);
 
-                        LogRel(("DnD: Got %RU16 file(s), fUnicode=%RTbool\n", cFiles, fUnicode));
+                        VBoxTrayVerbose(1, "DnD: Got %RU16 file(s), fUnicode=%RTbool\n", cFiles, fUnicode);
 
                         for (UINT i = 0; i < cFiles; i++)
@@ -466 +467 @@
                                 LogFlowFunc(("\tFile: %s (cchFile=%RU16)\n", pszFileUtf8, cchFileUtf8));
 
-                                LogRel(("DnD: Adding guest file '%s'\n", pszFileUtf8));
+                                VBoxTrayVerbose(1, "DnD: Adding guest file '%s'\n", pszFileUtf8);
 
                                 if (RT_SUCCESS(rc))
@@ -486 +487 @@
 
                             if (RT_FAILURE(rc))
-                                LogRel(("DnD: Error handling file entry #%u, rc=%Rrc\n", i, rc));
+                                VBoxTrayError("DnD: Error handling file entry #%u, rc=%Rrc\n", i, rc);
 
                             RTStrFree(pszFileUtf8);

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

@@ -30 +30 @@
 #include <iprt/string.h>
 #include <iprt/alloca.h>
+#include <iprt/stream.h>
 #include <iprt/system.h>
 #include <iprt/utf16.h>
@@ -35 +36 @@
 #include <VBox/VBoxGuestLib.h>
 
+#include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 #include "VBoxHelpers.h"
 
 
-int hlpReportStatus(VBoxGuestFacilityStatus statusCurrent)
-{
+
+static const char *vboxTrayGstFacilityStsToStr(VBoxGuestFacilityStatus faStatus, bool fShort)
+{
+    switch (faStatus)
+    {
+        case VBoxGuestFacilityStatus_Inactive:
+            return fShort ? "inactive"    : "not active";
+        case VBoxGuestFacilityStatus_Paused:
+            return fShort ? "paused"      : "paused";
+        case VBoxGuestFacilityStatus_PreInit:
+            return fShort ? "preinit"     : "pre-initializing";
+        case VBoxGuestFacilityStatus_Init:
+            return fShort ? "init"        : "initializing";
+        case VBoxGuestFacilityStatus_Active:
+            return fShort ? "active"      : "active/running";
+        case VBoxGuestFacilityStatus_Terminating:
+            return fShort ? "terminating" : "terminating";
+        case VBoxGuestFacilityStatus_Terminated:
+            return fShort ? "terminated"  : "terminated";
+        case VBoxGuestFacilityStatus_Failed:
+            return fShort ? "failed"      : "failed";
+        case VBoxGuestFacilityStatus_Unknown:
+        default:
+            break;
+    }
+    return "unknown";
+}
+
+int VBoxTrayHlpReportStatus(VBoxGuestFacilityStatus statusCurrent)
+{
+    if (g_cVerbosity)
+        VBoxTrayHlpShowBalloonTip(vboxTrayGstFacilityStsToStr(statusCurrent, false /* fShort */),
+                                  "Reporting status to host", RT_MS_5SEC);
+
     int rc = VbglR3ReportAdditionsStatus(VBoxGuestFacilityType_VBoxTrayClient,
                                          statusCurrent,
                                          0 /* Flags */);
     if (RT_FAILURE(rc))
-        Log(("VBoxTray: Could not report VBoxTray status \"%ld\", rc=%Rrc\n", statusCurrent, rc));
+        VBoxTrayError("Could not report VBoxTray status '%s' to host, rc=%Rrc\n",
+                      vboxTrayGstFacilityStsToStr(statusCurrent, false /* fShort */), rc);
     return rc;
 }
@@ -279 +315 @@
 }
 
-int hlpShowBalloonTip(HINSTANCE hInst, HWND hWnd, UINT uID,
-                      const char *pszMsg, const char *pszTitle,
-                      UINT uTimeout, DWORD dwInfoFlags)
-{
+int VBoxTrayHlpShowBalloonTipEx(HINSTANCE hInst, HWND hWnd, UINT uID,
+                              const char *pszMsg, const char *pszTitle,
+                              UINT uTimeout, DWORD dwInfoFlags)
+{
+    VBoxTrayVerbose(2, "Showing balloon tip \"%s\": %s\n", pszMsg, pszTitle);
+
     NOTIFYICONDATA niData;
     ZeroMemory(&niData, sizeof(NOTIFYICONDATA));
@@ -299 +337 @@
     niData.dwInfoFlags = dwInfoFlags;
 
-    /* Do we want to have */
-
     /* Is the current OS supported (at least WinXP) for displaying
      * our own icon and do we actually *want* to display our own stuff? */
@@ -336 +372 @@
     if (!Shell_NotifyIcon(NIM_MODIFY, &niData))
     {
-        DWORD dwErr = GetLastError();
-        return RTErrConvertFromWin32(dwErr);
-    }
+        VBoxTrayError("Could not show balloon tip (%#x)\n", GetLastError());
+        return VERR_INVALID_HANDLE;
+    }
+
     return VINF_SUCCESS;
+}
+
+int VBoxTrayHlpShowBalloonTip(const char *pszMsg, const char *pszTitle,
+                              UINT uTimeout)
+{
+    return VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                                       pszMsg, pszTitle, uTimeout, NIIF_INFO);
 }
 
@@ -351 +395 @@
  * @param   ...                 Arguments for format string.
  */
-void hlpShowMessageBox(const char *pszTitle, UINT uStyle, const char *pszFmt, ...)
+void VBoxTrayShowMsgBox(const char *pszTitle, UINT uStyle, const char *pszFmt, ...)
 {
     if (!uStyle)
@@ -363 +407 @@
     if (rc >= 0)
     {
-        PRTUTF16 pwszTitle;
-        rc = RTStrToUtf16(pszTitle, &pwszTitle);
-        if (RT_SUCCESS(rc))
-        {
-            PRTUTF16 pwszMsg;
-            rc = RTStrToUtf16(pszMsg, &pwszMsg);
+        if (g_fHasConsole)
+        {
+            RTPrintf("%s", pszMsg);
+        }
+        else
+        {
+            PRTUTF16 pwszTitle;
+            rc = RTStrToUtf16(pszTitle, &pwszTitle);
             if (RT_SUCCESS(rc))
             {
-                MessageBoxW(GetDesktopWindow(), pwszMsg, pwszTitle, uStyle);
-                RTUtf16Free(pwszMsg);
+                PRTUTF16 pwszMsg;
+                rc = RTStrToUtf16(pszMsg, &pwszMsg);
+                if (RT_SUCCESS(rc))
+                {
+                    MessageBoxW(GetDesktopWindow(), pwszMsg, pwszTitle, uStyle);
+                    RTUtf16Free(pwszMsg);
+                }
+                else
+                    MessageBoxA(GetDesktopWindow(), pszMsg, pszTitle, uStyle);
+                RTUtf16Free(pwszTitle);
             }
-            else
-                MessageBoxA(GetDesktopWindow(), pszMsg, pszTitle, uStyle);
-            RTUtf16Free(pwszTitle);
         }
     }
@@ -384 +435 @@
 }
 
+/**
+ * Logs a verbose message.
+ *
+ * @param   pszFormat   The message text.
+ * @param   va          Format arguments.
+ */
+static void vboxTrayLogV(const char *pszFormat, va_list va)
+{
+#ifdef DEBUG0
+    int rc = RTCritSectEnter(&g_csLog);
+    if (RT_SUCCESS(rc))
+    {
+#endif
+        char *psz = NULL;
+        RTStrAPrintfV(&psz, pszFormat, va);
+
+        AssertPtr(psz);
+        LogRel(("%s", psz));
+
+        RTStrFree(psz);
+#ifdef DEBUG0
+        RTCritSectLeave(&g_csLog);
+    }
+#endif
+}
+
+/**
+ * Logs an information message.
+ *
+ * @param   pszFormat   The message text.
+ * @param   ...         Format arguments.
+ */
+void VBoxTrayInfo(const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    vboxTrayLogV(pszFormat, va);
+    va_end(va);
+}
+
+/**
+ * Logs an error message.
+ *
+ * @returns RTEXITCODE_FAILURE.
+ * @param   pszFormat   The message text.
+ * @param   ...         Format arguments.
+ */
+RTEXITCODE VBoxTrayError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    LogRel(("Error: %s", psz));
+
+    RTStrFree(psz);
+
+    return RTEXITCODE_FAILURE;
+}
+
+/**
+ * Logs a verbose message based on the currently
+ * set global verbosity level.
+ *
+ * @param   iLevel      Minimum log level required to display this message.
+ * @param   pszFormat   The message text.
+ * @param   ...         Format arguments.
+ */
+void VBoxTrayVerbose(unsigned iLevel, const char *pszFormat, ...)
+{
+    if (iLevel <= g_cVerbosity)
+    {
+        va_list va;
+        va_start(va, pszFormat);
+        vboxTrayLogV(pszFormat, va);
+        va_end(va);
+    }
+}
+
+/**
+ * Displays an error message.
+ *
+ * @returns RTEXITCODE_FAILURE.
+ * @param   pszFormat   The message text.
+ * @param   ...         Format arguments.
+ */
+RTEXITCODE VBoxTrayShowError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+
+    VBoxTrayError("%s", psz);
+    VBoxTrayShowMsgBox(VBOX_VBOXTRAY_TITLE " - Error", MB_OK | MB_ICONERROR, psz);
+
+    RTStrFree(psz);
+
+    return RTEXITCODE_FAILURE;
+}
+

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.h

@@ -32 +32 @@
 #endif
 
-extern int  hlpReportStatus(VBoxGuestFacilityStatus statusCurrent);
 extern void hlpReloadCursor(void);
 extern void hlpResizeRect(RECTL *paRects, unsigned nRects, unsigned uPrimary, unsigned uResized, int iNewWidth, int iNewHeight, int iNewPosX, int iNewPosY);
-extern int  hlpShowBalloonTip(HINSTANCE hInst, HWND hWnd, UINT uID, const char *pszMsg, const char *pszTitle, UINT uTimeout, DWORD dwInfoFlags);
-extern void hlpShowMessageBox(const char *pszTitle, UINT uStyle, const char *pszFmt, ...);
+
+extern int  VBoxTrayHlpReportStatus(VBoxGuestFacilityStatus statusCurrent);
+extern int  VBoxTrayHlpShowBalloonTip(const char *pszMsg, const char *pszTitle, UINT uTimeout);
+extern int  VBoxTrayHlpShowBalloonTipEx(HINSTANCE hInst, HWND hWnd, UINT uID, const char *pszMsg, const char *pszTitle, UINT uTimeout, DWORD dwInfoFlags);
+extern void VBoxTrayShowMsgBox(const char *pszTitle, UINT uStyle, const char *pszFmt, ...);
 
 #endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxHelpers_h */

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

@@ -32 +32 @@
 #include "VBoxHostVersion.h"
 #include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 #include "VBoxHelpers.h"
-
 
 
@@ -64 +64 @@
                             "install option from the Devices menu.", pszGuestVersion, pszHostVersion);
 
-                rc = hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                                       szMsg, szTitle,
-                                       5000 /* Time to display in msec */, NIIF_INFO);
-                if (RT_FAILURE(rc))
-                    LogFlowFunc(("Guest Additions update found; however: could not show version notifier balloon tooltip, rc=%Rrc\n", rc));
+                rc = VBoxTrayHlpShowBalloonTip(szMsg, szTitle, RT_MS_5SEC);
+
+                VBoxTrayInfo("Guest Additions update found: %s -> %s\n", pszGuestVersion, pszHostVersion);
             }
 

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

@@ -59 +59 @@
 {
     /** Pointer to the service environment. */
-    const VBOXSERVICEENV      *pEnv;
+    const VBOXTRAYSVCENV      *pEnv;
     /** Handle for the local IPC server. */
     RTLOCALIPCSERVER           hServer;
@@ -170 +170 @@
      * Showing the balloon tooltip is not critical.
      */
-    int rc2 = hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+    VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
                                 pszMsg, pszTitle, Payload.s.cMsTimeout, Payload.s.uType);
-    LogFlowFunc(("Showing \"%s\" - \"%s\" (type %RU32, %RU32ms), rc=%Rrc\n",
-                 pszTitle, pszMsg, Payload.s.cMsTimeout, Payload.s.uType, rc2));
-    RT_NOREF_PV(rc2);
 
     return VINF_SUCCESS;
@@ -207 +204 @@
 
 /**
- * Initializes the IPC communication.
- *
- * @return  IPRT status code.
- * @param   pEnv                        The IPC service's environment.
- * @param   ppInstance                  The instance pointer which refers to this object.
- */
-DECLCALLBACK(int) VBoxIPCInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+ * @interface_method_impl{VBOXSERVICEDESC,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbtrIPCPreInit(void)
+{
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnOption}
+ */
+static DECLCALLBACK(int) vbtrIPCOption(const char **ppszShort, int argc, char **argv, int *pi)
+{
+    RT_NOREF(ppszShort, argc, argv, pi);
+
+    return -1;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+DECLCALLBACK(int) vbtrIPCInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
 {
     AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
@@ -260 +272 @@
 }
 
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnStop}
+ */
 DECLCALLBACK(void) VBoxIPCStop(void *pInstance)
 {
@@ -298 +313 @@
 }
 
-DECLCALLBACK(void) VBoxIPCDestroy(void *pInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnDestroy}
+ */
+DECLCALLBACK(void) vbtrIPCDestroy(void *pInstance)
 {
     AssertPtrReturnVoid(pInstance);
@@ -552 +570 @@
  * requests
  */
-DECLCALLBACK(int) VBoxIPCWorker(void *pInstance, bool volatile *pfShutdown)
+DECLCALLBACK(int) vbtrIPCWorker(void *pInstance, bool volatile *pfShutdown)
 {
     AssertPtr(pInstance);
@@ -606 +624 @@
  * The service description.
  */
-VBOXSERVICEDESC g_SvcDescIPC =
+VBOXTRAYSVCDESC g_SvcDescIPC =
 {
     /* pszName. */
@@ -612 +630 @@
     /* pszDescription. */
     "Inter-Process Communication",
+    /* pszUsage. */
+    NULL,
+    /* pszOptions. */
+    NULL,
     /* methods */
-    VBoxIPCInit,
-    VBoxIPCWorker,
+    vbtrIPCPreInit,
+    vbtrIPCOption,
+    vbtrIPCInit,
+    vbtrIPCWorker,
     NULL /* pfnStop */,
-    VBoxIPCDestroy
+    vbtrIPCDestroy
 };
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.h

@@ -34 +34 @@
 #endif
 
-int                VBoxIPCInit    (const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread);
-unsigned __stdcall VBoxIPCWorker  (void *pInstance);
-void               VBoxIPCStop    (const VBOXSERVICEENV *pEnv, void *pInstance);
-void               VBoxIPCDestroy (const VBOXSERVICEENV *pEnv, void *pInstance);
+int                vbtrIPCInit    (const VBOXTRAYSVCENV *pEnv, void **ppInstance, bool *pfStartThread);
+unsigned __stdcall vbtrIPCWorker  (void *pInstance);
+void               VBoxIPCStop    (const VBOXTRAYSVCENV *pEnv, void *pInstance);
+void               vbtrIPCDestroy (const VBOXTRAYSVCENV *pEnv, void *pInstance);
 
 #endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxIPC_h */

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

@@ -72 +72 @@
 typedef struct _VBOXLACONTEXT
 {
-    const VBOXSERVICEENV *pEnv;
+    const VBOXTRAYSVCENV *pEnv;
 
     bool fLogEnabled;
@@ -1209 +1209 @@
 }
 
-DECLCALLBACK(int) VBoxLAInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbtrLAPreInit(void)
+{
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnOption}
+ */
+static DECLCALLBACK(int) vbtrLAOption(const char **ppszShort, int argc, char **argv, int *pi)
+{
+    RT_NOREF(ppszShort, argc, argv, pi);
+
+    return -1;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+DECLCALLBACK(int) vbtrLAInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
 {
     AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
@@ -1262 +1284 @@
 }
 
-DECLCALLBACK(void) VBoxLADestroy(void *pInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnDestroy}
+ */
+DECLCALLBACK(void) vbtrLADestroy(void *pInstance)
 {
     AssertPtrReturnVoid(pInstance);
@@ -1282 +1307 @@
 }
 
-/*
- * Thread function to wait for and process property changes
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnWorker}
  */
-DECLCALLBACK(int) VBoxLAWorker(void *pInstance, bool volatile *pfShutdown)
+DECLCALLBACK(int) vbtrLAWorker(void *pInstance, bool volatile *pfShutdown)
 {
     AssertPtr(pInstance);
@@ -1426 +1451 @@
  * The service description.
  */
-VBOXSERVICEDESC g_SvcDescLA =
+VBOXTRAYSVCDESC g_SvcDescLA =
 {
     /* pszName. */
@@ -1432 +1457 @@
     /* pszDescription. */
     "Location Awareness",
+    /* pszUsage. */
+    NULL,
+    /* pszOptions. */
+    NULL,
     /* methods */
-    VBoxLAInit,
-    VBoxLAWorker,
+    vbtrLAPreInit,
+    vbtrLAOption,
+    vbtrLAInit,
+    vbtrLAWorker,
     NULL /* pfnStop */,
-    VBoxLADestroy
+    vbtrLADestroy
 };
 

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

@@ -52 +52 @@
 typedef struct _VBOXSEAMLESSCONTEXT
 {
-    const VBOXSERVICEENV *pEnv;
+    const VBOXTRAYSVCENV *pEnv;
 
     RTLDRMOD hModHook;
@@ -82 +82 @@
 
 
-static DECLCALLBACK(int) VBoxSeamlessInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbtrSeamlessPreInit(void)
+{
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnOption}
+ */
+static DECLCALLBACK(int) vbtrSeamlessOption(const char **ppszShort, int argc, char **argv, int *pi)
+{
+    RT_NOREF(ppszShort, argc, argv, pi);
+
+    return -1;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+static DECLCALLBACK(int) vbtrSeamlessInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
 {
     LogFlowFuncEnter();
@@ -135 +156 @@
 }
 
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnDestroy}
+ */
 static DECLCALLBACK(void) VBoxSeamlessDestroy(void *pInstance)
 {
@@ -394 +418 @@
 
 /**
- * Thread function to wait for and process seamless mode change
- * requests
- */
-static DECLCALLBACK(int) VBoxSeamlessWorker(void *pvInstance, bool volatile *pfShutdown)
+ * @interface_method_impl{VBOXSERVICEDESC,pfnWorker}
+ */
+static DECLCALLBACK(int) vbtrSeamlessWorker(void *pvInstance, bool volatile *pfShutdown)
 {
     AssertPtrReturn(pvInstance, VERR_INVALID_POINTER);
@@ -519 +542 @@
  * The service description.
  */
-VBOXSERVICEDESC g_SvcDescSeamless =
+VBOXTRAYSVCDESC g_SvcDescSeamless =
 {
     /* pszName. */
@@ -525 +548 @@
     /* pszDescription. */
     "Seamless Windows",
+    /* pszUsage. */
+    NULL,
+    /* pszOptions. */
+    NULL,
     /* methods */
-    VBoxSeamlessInit,
-    VBoxSeamlessWorker,
+    vbtrSeamlessPreInit,
+    vbtrSeamlessOption,
+    vbtrSeamlessInit,
+    vbtrSeamlessWorker,
     NULL /* pfnStop */,
     VBoxSeamlessDestroy

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

@@ -37 +37 @@
 
 #include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 
 
@@ -125 +126 @@
         else
         {
-            DWORD dwErr = GetLastError();
-            LogRel(("WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
+            DWORD const dwErr = GetLastError();
+            VBoxTrayInfo("WTSRegisterSessionNotification failed, error = %08X\n", dwErr);
             if (dwErr == RPC_S_INVALID_BINDING)
             {
@@ -144 +145 @@
     else
     {
-        LogRel(("WtsApi32.dll APIs are not available (%Rrc)\n", rc));
+        VBoxTrayInfo("WtsApi32.dll APIs are not available (%Rrc)\n", rc);
+
         gVBoxSt.pfnWTSRegisterSessionNotification = NULL;
         gVBoxSt.pfnWTSUnRegisterSessionNotification = NULL;
@@ -153 +155 @@
     gVBoxSt.fIsConsole = TRUE;
     gVBoxSt.enmConnectState = WTSActive;
+
+    if (RT_FAILURE(rc))
+        VBoxTrayError("Initializing sessiosn tracking failed with %Rrc\n", rc);
+
     return rc;
 }

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

@@ -53 +53 @@
 #include <iprt/asm.h>
 #include <iprt/buildconfig.h>
+#include <iprt/file.h>
 #include <iprt/getopt.h>
 #include <iprt/ldr.h>
@@ -58 +59 @@
 #include <iprt/path.h>
 #include <iprt/process.h>
+#include <iprt/stream.h>
 #include <iprt/system.h>
 #include <iprt/time.h>
@@ -80 +82 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-int                   g_cVerbosity             = 0;
+/** Mutex for checking if VBoxTray already is running. */
+HANDLE                g_hMutexAppRunning       = NULL;
+/** Whether VBoxTray is connected to a (parent) console. */
+bool                  g_fHasConsole            = false;
+/** The current verbosity level. */
+unsigned              g_cVerbosity             = 0;
 HANDLE                g_hStopSem;
 HANDLE                g_hSeamlessWtNotifyEvent = 0;
@@ -90 +97 @@
 uint32_t              g_fGuestDisplaysChanged = 0;
 
-static PRTLOGGER      g_pLoggerRelease = NULL;           /**< This is actually the debug logger in DEBUG builds! */
-static uint32_t       g_cHistory = 10;                   /**< Enable log rotation, 10 files. */
-static uint32_t       g_uHistoryFileTime = RT_SEC_1DAY;  /**< Max 1 day per file. */
-static uint64_t       g_uHistoryFileSize = 100 * _1M;    /**< Max 100MB per file. */
-
-#ifdef DEBUG_andy
-static VBOXSERVICEINFO g_aServices[] =
-{
-    { &g_SvcDescClipboard,      NIL_RTTHREAD, NULL, false, false, false, false, true }
-};
-#else
+
 /**
  * The details of the services that has been compiled in.
  */
-static VBOXSERVICEINFO g_aServices[] =
+static VBOXTRAYSVCINFO g_aServices[] =
 {
     { &g_SvcDescDisplay,        NIL_RTTHREAD, NULL, false, false, false, false, true },
@@ -118 +115 @@
 #endif
 };
-#endif
-
-/* The global message table. */
-static VBOXGLOBALMESSAGE g_vboxGlobalMessageTable[] =
+
+/**
+ * The global message table.
+ */
+static VBOXTRAYGLOBALMSG g_vboxGlobalMessageTable[] =
 {
     /* Windows specific stuff. */
@@ -131 +129 @@
     /* VBoxTray specific stuff. */
     /** @todo Add new messages here! */
-
     {
         NULL
@@ -141 +138 @@
  * get (re-)created. Nice to install our tray icon.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   wParam
  * @param   lParam
@@ -151 +148 @@
 }
 
+/**
+ * Creates VBoxTray's tray icon.
+ *
+ * @returns VBox status code.
+ */
 static int vboxTrayCreateTrayIcon(void)
 {
@@ -156 +158 @@
     if (hIcon == NULL)
     {
-        DWORD dwErr = GetLastError();
-        LogFunc(("Could not load tray icon, error %08X\n", dwErr));
+        DWORD const dwErr = GetLastError();
+        VBoxTrayError("Could not load tray icon (%#x)\n", dwErr);
         return RTErrConvertFromWin32(dwErr);
     }
@@ -176 +178 @@
     if (!Shell_NotifyIcon(NIM_ADD, &g_NotifyIconData))
     {
-        DWORD dwErr = GetLastError();
-        LogFunc(("Could not create tray icon, error=%ld\n", dwErr));
+        DWORD const dwErr = GetLastError();
+        VBoxTrayError("Could not create tray icon (%#x)\n", dwErr);
         rc = RTErrConvertFromWin32(dwErr);
         RT_ZERO(g_NotifyIconData);
@@ -187 +189 @@
 }
 
+/**
+ * Removes VBoxTray's tray icon.
+ *
+ * @returns VBox status code.
+ */
 static void vboxTrayRemoveTrayIcon(void)
 {
@@ -213 +220 @@
 static DECLCALLBACK(int) vboxTrayServiceThread(RTTHREAD ThreadSelf, void *pvUser)
 {
-    PVBOXSERVICEINFO pSvc = (PVBOXSERVICEINFO)pvUser;
+    PVBOXTRAYSVCINFO pSvc = (PVBOXTRAYSVCINFO)pvUser;
     AssertPtr(pSvc);
 
@@ -229 +236 @@
     RTThreadUserSignal(ThreadSelf);
 
-    LogFunc(("Worker for '%s' ended with %Rrc\n", pSvc->pDesc->pszName, rc));
+    VBoxTrayVerbose(1, "Thread for '%s' ended with %Rrc\n", pSvc->pDesc->pszName, rc);
     return rc;
 }
 
-static int vboxTrayServicesStart(PVBOXSERVICEENV pEnv)
+/**
+ * Lazily calls the pfnPreInit method on each service.
+ *
+ * @returns VBox status code, error message displayed.
+ */
+static int vboxTrayServicesLazyPreInit(void)
+{
+    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+        if (!g_aServices[j].fPreInited)
+        {
+            int rc = g_aServices[j].pDesc->pfnPreInit();
+            if (RT_FAILURE(rc))
+                return VBoxTrayError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName, rc);
+            g_aServices[j].fPreInited = true;
+        }
+    return VINF_SUCCESS;
+}
+
+/**
+ * Starts all services.
+ *
+ * @returns VBox status code.
+ * @param   pEnv                Service environment to use.
+ */
+static int vboxTrayServicesStart(PVBOXTRAYSVCENV pEnv)
 {
     AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
 
-    LogRel(("Starting services ...\n"));
+    VBoxTrayInfo("Starting services ...\n");
 
     int rc = VINF_SUCCESS;
 
+    size_t cServicesStarted = 0;
+
     for (unsigned i = 0; i < RT_ELEMENTS(g_aServices); i++)
     {
-        PVBOXSERVICEINFO pSvc = &g_aServices[i];
-        LogRel(("Starting service '%s' ...\n", pSvc->pDesc->pszName));
+        PVBOXTRAYSVCINFO pSvc = &g_aServices[i];
+
+        if (!pSvc->fEnabled)
+        {
+            VBoxTrayInfo("Skipping starting service '%s' (disabled)\n", pSvc->pDesc->pszName);
+            continue;
+        }
+
+        VBoxTrayInfo("Starting service '%s' ...\n", pSvc->pDesc->pszName);
 
         pSvc->hThread   = NIL_RTTHREAD;
@@ -261 +301 @@
             {
                 case VERR_NOT_SUPPORTED:
-                    LogRel(("Service '%s' is not supported on this system\n", pSvc->pDesc->pszName));
+                    VBoxTrayInfo("Service '%s' is not supported on this system\n", pSvc->pDesc->pszName);
                     rc2 = VINF_SUCCESS; /* Keep going. */
                     break;
 
                 case VERR_HGCM_SERVICE_NOT_FOUND:
-                    LogRel(("Service '%s' is not available on the host\n", pSvc->pDesc->pszName));
+                    VBoxTrayInfo("Service '%s' is not available on the host\n", pSvc->pDesc->pszName);
                     rc2 = VINF_SUCCESS; /* Keep going. */
                     break;
 
                 default:
-                    LogRel(("Failed to initialize service '%s', rc=%Rrc\n", pSvc->pDesc->pszName, rc2));
+                    VBoxTrayError("Failed to initialize service '%s', rc=%Rrc\n", pSvc->pDesc->pszName, rc2);
                     break;
             }
@@ -288 +328 @@
                     if (pSvc->fShutdown)
                     {
-                        LogRel(("Service '%s' failed to start!\n", pSvc->pDesc->pszName));
+                        VBoxTrayError("Service '%s' failed to start!\n", pSvc->pDesc->pszName);
                         rc = VERR_GENERAL_FAILURE;
                     }
                     else
-                        LogRel(("Service '%s' started\n", pSvc->pDesc->pszName));
+                    {
+                        cServicesStarted++;
+                        VBoxTrayInfo("Service '%s' started\n", pSvc->pDesc->pszName);
+                    }
                 }
                 else
                 {
-                    LogRel(("Failed to start thread for service '%s': %Rrc\n", rc2));
+                    VBoxTrayInfo("Failed to start thread for service '%s': %Rrc\n", rc2);
                     if (pSvc->pDesc->pfnDestroy)
                         pSvc->pDesc->pfnDestroy(pSvc->pInstance);
@@ -307 +350 @@
     }
 
-    if (RT_SUCCESS(rc))
-        LogRel(("All services started\n"));
-    else
-        LogRel(("Services started, but some with errors\n"));
+    VBoxTrayInfo("%zu/%zu service(s) started\n", cServicesStarted, RT_ELEMENTS(g_aServices));
+    if (RT_FAILURE(rc))
+        VBoxTrayInfo("Some service(s) reported errors when starting -- see log above\n");
 
     LogFlowFuncLeaveRC(rc);
@@ -316 +358 @@
 }
 
-static int vboxTrayServicesStop(VBOXSERVICEENV *pEnv)
+/**
+ * Stops all services.
+ *
+ * @returns VBox status code.
+ * @param   pEnv                Service environment to use.
+ */
+static int vboxTrayServicesStop(VBOXTRAYSVCENV *pEnv)
 {
     AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
 
-    LogRel2(("Stopping all services ...\n"));
+    VBoxTrayVerbose(1, "Stopping all services ...\n");
 
     /*
@@ -333 +381 @@
     for (unsigned i = 0; i < RT_ELEMENTS(g_aServices); i++)
     {
-        PVBOXSERVICEINFO pSvc = &g_aServices[i];
+        PVBOXTRAYSVCINFO pSvc = &g_aServices[i];
         if (   pSvc->fStarted
             && pSvc->pDesc->pfnStop)
         {
-            LogRel2(("Calling stop function for service '%s' ...\n", pSvc->pDesc->pszName));
+            VBoxTrayVerbose(1, "Calling stop function for service '%s' ...\n", pSvc->pDesc->pszName);
             int rc2 = pSvc->pDesc->pfnStop(pSvc->pInstance);
             if (RT_FAILURE(rc2))
-                LogRel(("Failed to stop service '%s': %Rrc\n", pSvc->pDesc->pszName, rc2));
-        }
-    }
-
-    LogRel2(("All stop functions for services called\n"));
+                VBoxTrayError("Failed to stop service '%s': %Rrc\n", pSvc->pDesc->pszName, rc2);
+        }
+    }
+
+    VBoxTrayVerbose(2, "All stop functions for services called\n");
 
     int rc = VINF_SUCCESS;
@@ -353 +401 @@
     for (unsigned i = 0; i < RT_ELEMENTS(g_aServices); i++)
     {
-        PVBOXSERVICEINFO pSvc = &g_aServices[i];
+        PVBOXTRAYSVCINFO pSvc = &g_aServices[i];
         if (!pSvc->fEnabled) /* Only stop services which were started before. */
             continue;
@@ -359 +407 @@
         if (pSvc->hThread != NIL_RTTHREAD)
         {
-            LogRel2(("Waiting for service '%s' to stop ...\n", pSvc->pDesc->pszName));
+            VBoxTrayVerbose(1, "Waiting for service '%s' to stop ...\n", pSvc->pDesc->pszName);
             int rc2 = VINF_SUCCESS;
             for (int j = 0; j < 30; j++) /* Wait 30 seconds in total */
@@ -369 +417 @@
             if (RT_FAILURE(rc2))
             {
-                LogRel(("Service '%s' failed to stop (%Rrc)\n", pSvc->pDesc->pszName, rc2));
+                VBoxTrayError("Service '%s' failed to stop (%Rrc)\n", pSvc->pDesc->pszName, rc2);
                 if (RT_SUCCESS(rc))
                     rc = rc2;
@@ -378 +426 @@
             && pSvc->pInstance) /* pInstance might be NULL if initialization of a service failed. */
         {
-            LogRel2(("Terminating service '%s' ...\n", pSvc->pDesc->pszName));
+            VBoxTrayVerbose(1, "Terminating service '%s' ...\n", pSvc->pDesc->pszName);
             pSvc->pDesc->pfnDestroy(pSvc->pInstance);
         }
@@ -384 +432 @@
 
     if (RT_SUCCESS(rc))
-        LogRel(("All services stopped\n"));
+        VBoxTrayVerbose(1, "All services stopped\n");
 
     LogFlowFuncLeaveRC(rc);
@@ -390 +438 @@
 }
 
-static int vboxTrayRegisterGlobalMessages(PVBOXGLOBALMESSAGE pTable)
+/**
+ * Registers all global window messages of a specific table.
+ *
+ * @returns VBox status code.
+ * @param   pTable              Table to register messages for.
+ */
+static int vboxTrayRegisterGlobalMessages(PVBOXTRAYGLOBALMSG pTable)
 {
     int rc = VINF_SUCCESS;
@@ -403 +457 @@
         {
             DWORD dwErr = GetLastError();
-            Log(("Registering global message \"%s\" failed, error = %08X\n", dwErr));
+            VBoxTrayError("Registering global message \"%s\" failed, error = %08X\n", pTable->pszName, dwErr);
             rc = RTErrConvertFromWin32(dwErr);
         }
@@ -413 +467 @@
 }
 
-static bool vboxTrayHandleGlobalMessages(PVBOXGLOBALMESSAGE pTable, UINT uMsg,
+/**
+ * Handler for global (registered) window messages.
+ *
+ * @returns \c true if message got handeled, \c false if not.
+ * @param   pTable              Message table to look message up in.
+ * @param   uMsg                Message ID to handle.
+ * @param   wParam              WPARAM of the message.
+ * @param   lParam              LPARAM of the message.
+ */
+static bool vboxTrayHandleGlobalMessages(PVBOXTRAYGLOBALMSG pTable, UINT uMsg,
                                          WPARAM wParam, LPARAM lParam)
 {
@@ -434 +497 @@
 
 /**
- * Header/footer callback for the release logger.
- *
- * @param   pLoggerRelease
- * @param   enmPhase
- * @param   pfnLog
- */
-static DECLCALLBACK(void) vboxTrayLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
-{
-    /* Some introductory information. */
-    static RTTIMESPEC s_TimeSpec;
-    char szTmp[256];
-    if (enmPhase == RTLOGPHASE_BEGIN)
-        RTTimeNow(&s_TimeSpec);
-    RTTimeSpecToString(&s_TimeSpec, szTmp, sizeof(szTmp));
-
-    switch (enmPhase)
-    {
-        case RTLOGPHASE_BEGIN:
-        {
-            pfnLog(pLoggerRelease,
-                   "VBoxTray %s r%s %s (%s %s) release log\n"
-                   "Log opened %s\n",
-                   RTBldCfgVersion(), RTBldCfgRevisionStr(), VBOX_BUILD_TARGET,
-                   __DATE__, __TIME__, szTmp);
-
-            int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
-            if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-                pfnLog(pLoggerRelease, "OS Product: %s\n", szTmp);
-            vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));
-            if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-                pfnLog(pLoggerRelease, "OS Release: %s\n", szTmp);
-            vrc = RTSystemQueryOSInfo(RTSYSOSINFO_VERSION, szTmp, sizeof(szTmp));
-            if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-                pfnLog(pLoggerRelease, "OS Version: %s\n", szTmp);
-            if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-                pfnLog(pLoggerRelease, "OS Service Pack: %s\n", szTmp);
-
-            /* the package type is interesting for Linux distributions */
-            char szExecName[RTPATH_MAX];
-            char *pszExecName = RTProcGetExecutablePath(szExecName, sizeof(szExecName));
-            pfnLog(pLoggerRelease,
-                   "Executable: %s\n"
-                   "Process ID: %u\n"
-                   "Package type: %s"
-#ifdef VBOX_OSE
-                   " (OSE)"
-#endif
-                   "\n",
-                   pszExecName ? pszExecName : "unknown",
-                   RTProcSelf(),
-                   VBOX_PACKAGE_STRING);
-            break;
-        }
-
-        case RTLOGPHASE_PREROTATE:
-            pfnLog(pLoggerRelease, "Log rotated - Log started %s\n", szTmp);
-            break;
-
-        case RTLOGPHASE_POSTROTATE:
-            pfnLog(pLoggerRelease, "Log continuation - Log started %s\n", szTmp);
-            break;
-
-        case RTLOGPHASE_END:
-            pfnLog(pLoggerRelease, "End of log file - Log started %s\n", szTmp);
-            break;
-
-        default:
-            /* nothing */;
-    }
-}
-
-/**
- * Creates the default release logger outputting to the specified file.
- *
- * @return  IPRT status code.
- * @param   pszLogFile          Path to log file to use. Can be NULL if not needed.
- */
-static int vboxTrayLogCreate(const char *pszLogFile)
-{
-    /* Create release (or debug) logger (stdout + file). */
-    static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
-#ifdef DEBUG
-    static const char s_szEnvVarPfx[] = "VBOXTRAY_LOG";
-    static const char s_szGroupSettings[] = "all.e.l.f";
-#else
-    static const char s_szEnvVarPfx[] = "VBOXTRAY_RELEASE_LOG";
-    static const char s_szGroupSettings[] = "all";
-#endif
-    RTERRINFOSTATIC ErrInfo;
-    int rc = RTLogCreateEx(&g_pLoggerRelease, s_szEnvVarPfx,
-                           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,
-                           vboxTrayLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
-                           NULL /*pOutputIf*/, NULL /*pvOutputIfUser*/,
-                           RTErrInfoInitStatic(&ErrInfo), "%s", pszLogFile ? pszLogFile : "");
-    if (RT_SUCCESS(rc))
-    {
-#ifdef DEBUG
-        /* Register this logger as the _debug_ logger. */
-        RTLogSetDefaultInstance(g_pLoggerRelease);
-#else
-        /* Register this logger as the release logger. */
-        RTLogRelSetDefaultInstance(g_pLoggerRelease);
-#endif
-        /* If verbosity is explicitly set, make sure to increase the logging levels for
-         * the logging groups we offer functionality for in VBoxTray. */
-        if (g_cVerbosity)
-        {
-            /* All groups we want to enable logging for VBoxTray. */
-#ifdef DEBUG
-            const char *apszGroups[] = { "guest_dnd", "shared_clipboard" };
-#else /* For release builds we always want all groups being logged in verbose mode. Don't change this! */
-            const char *apszGroups[] = { "all" };
-#endif
-            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;
-
-                switch (g_cVerbosity)
-                {
-                    case 1:
-                        rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), ".e.l.l2");
-                        break;
-
-                    case 2:
-                        rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), ".e.l.l2.l3");
-                        break;
-
-                    case 3:
-                        rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), ".e.l.l2.l3.l4");
-                        break;
-
-                    case 4:
-                        RT_FALL_THROUGH();
-                    default:
-                        rc = RTStrCat(szGroupSettings, sizeof(szGroupSettings), ".e.l.l2.l3.l4.f");
-                        break;
-                }
-
-                if (RT_FAILURE(rc))
-                    break;
-            }
-
-            LogRel(("Verbose log settings are: %s\n", szGroupSettings));
-
-            if (RT_SUCCESS(rc))
-                rc = RTLogGroupSettings(g_pLoggerRelease, szGroupSettings);
-            if (RT_FAILURE(rc))
-                RTMsgError("Setting log group settings failed, rc=%Rrc\n", rc);
-        }
-
-        /* Explicitly flush the log in case of VBOXTRAY_RELEASE_LOG=buffered. */
-        RTLogFlush(g_pLoggerRelease);
-    }
-    else
-        VBoxTrayShowError(ErrInfo.szMsg);
-
-    return rc;
-}
-
-static void vboxTrayLogDestroy(void)
-{
-    /* Only want to destroy the release logger before calling exit(). The debug
-       logger can be useful after that point... */
-    RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
-}
-
-/**
- * Displays an error message.
- *
- * @returns RTEXITCODE_FAILURE.
- * @param   pszFormat   The message text.
- * @param   ...         Format arguments.
- */
-RTEXITCODE VBoxTrayShowError(const char *pszFormat, ...)
-{
-    va_list args;
-    va_start(args, pszFormat);
-    char *psz = NULL;
-    RTStrAPrintfV(&psz, pszFormat, args);
-    va_end(args);
-
-    AssertPtr(psz);
-    LogRel(("Error: %s", psz));
-
-    MessageBox(GetDesktopWindow(), psz, "VBoxTray - Error", MB_OK | MB_ICONERROR);
-
-    RTStrFree(psz);
-
-    return RTEXITCODE_FAILURE;
-}
-
+ * Destroys the invisible tool window of VBoxTray.
+ */
 static void vboxTrayDestroyToolWindow(void)
 {
     if (g_hwndToolWindow)
     {
-        Log(("Destroying tool window ...\n"));
-
         /* Destroy the tool window. */
         DestroyWindow(g_hwndToolWindow);
@@ -650 +511 @@
 }
 
+/**
+ * Creates the invisible tool window of VBoxTray.
+ *
+ * @returns VBox status code.
+ */
 static int vboxTrayCreateToolWindow(void)
 {
@@ -666 +532 @@
     {
         dwErr = GetLastError();
-        Log(("Registering invisible tool window failed, error = %08X\n", dwErr));
+        VBoxTrayError("Registering invisible tool window failed, error = %08X\n", dwErr);
     }
     else
@@ -697 +563 @@
     if (dwErr != ERROR_SUCCESS)
          vboxTrayDestroyToolWindow();
-    return RTErrConvertFromWin32(dwErr);
+
+    int const rc = RTErrConvertFromWin32(dwErr);
+
+    if (RT_FAILURE(rc))
+        VBoxTrayError("Could not create tool window, rc=%Rrc\n", rc);
+
+    return rc;
 }
 
@@ -782 +654 @@
         }
     }
-    return RTErrConvertFromWin32(dwErr);
+
+    int const rc = RTErrConvertFromWin32(dwErr);
+
+    if (RT_FAILURE(rc))
+        VBoxTrayError("Could not setup seamless, rc=%Rrc\n", rc);
+
+    return rc;
 }
 
@@ -800 +678 @@
 }
 
+/**
+ * Main routine for starting / stopping all internal services.
+ *
+ * @returns VBox status code.
+ */
 static int vboxTrayServiceMain(void)
 {
     int rc = VINF_SUCCESS;
-    LogFunc(("Entering vboxTrayServiceMain\n"));
+    VBoxTrayVerbose(2, "Entering main loop\n");
 
     g_hStopSem = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -816 +699 @@
          * Start services listed in the vboxServiceTable.
          */
-        VBOXSERVICEENV svcEnv;
+        VBOXTRAYSVCENV svcEnv;
         svcEnv.hInstance = g_hInstance;
 
         /* Initializes disp-if to default (XPDM) mode. */
         VBoxDispIfInit(&svcEnv.dispIf); /* Cannot fail atm. */
-    #ifdef VBOX_WITH_WDDM
+#ifdef VBOX_WITH_WDDM
         /*
          * For now the display mode will be adjusted to WDDM mode if needed
          * on display service initialization when it detects the display driver type.
          */
-    #endif
+#endif
+        VBoxTrayHlpReportStatus(VBoxGuestFacilityStatus_Init);
 
         /* Finally start all the built-in services! */
         rc = vboxTrayServicesStart(&svcEnv);
-        if (RT_FAILURE(rc))
-        {
-            /* Terminate service if something went wrong. */
-            vboxTrayServicesStop(&svcEnv);
-        }
-        else
+        if (RT_SUCCESS(rc))
         {
             uint64_t const uNtVersion = RTSystemGetNtVersion();
-            rc = vboxTrayCreateTrayIcon();
             if (   RT_SUCCESS(rc)
                 && uNtVersion >= RTSYSTEM_MAKE_NT_VERSION(5, 0, 0)) /* Only for W2K and up ... */
@@ -853 +731 @@
             {
                 /* Report the host that we're up and running! */
-                hlpReportStatus(VBoxGuestFacilityStatus_Active);
+                VBoxTrayHlpReportStatus(VBoxGuestFacilityStatus_Active);
             }
 
@@ -957 +835 @@
                 LogFunc(("Returned from main loop, exiting ...\n"));
             }
-            LogFunc(("Waiting for services to stop ...\n"));
-            vboxTrayServicesStop(&svcEnv);
+
         } /* Services started */
+
+        LogFunc(("Waiting for services to stop ...\n"));
+
+        VBoxTrayHlpReportStatus(VBoxGuestFacilityStatus_Terminating);
+
+        vboxTrayServicesStop(&svcEnv);
+
         CloseHandle(g_hStopSem);
+
     } /* Stop event created */
 
-    vboxTrayRemoveTrayIcon();
-
-    LogFunc(("Leaving with rc=%Rrc\n", rc));
+    VBoxTrayVerbose(2, "Leaving main loop with %Rrc\n", rc);
     return rc;
+}
+
+/**
+ * Attaches to a parent console (if any) or creates an own (dedicated) console window.
+ *
+ * @returns VBox status code.
+ */
+static int vboxTrayAttachConsole(void)
+{
+    if (g_fHasConsole) /* Console already attached? Bail out. */
+        return VINF_SUCCESS;
+
+    /* As we run with the WINDOWS subsystem, we need to either attach to or create an own console
+     * to get any stdout / stderr output. */
+    bool fAllocConsole = false;
+    if (!AttachConsole(ATTACH_PARENT_PROCESS))
+        fAllocConsole = true;
+
+    if (fAllocConsole)
+    {
+        if (!AllocConsole())
+            VBoxTrayShowError("Unable to attach to or allocate a console!");
+        /* Continue running. */
+    }
+
+    RTFILE hStdIn;
+    RTFileFromNative(&hStdIn,  (RTHCINTPTR)GetStdHandle(STD_INPUT_HANDLE));
+    /** @todo Closing of standard handles not support via IPRT (yet). */
+    RTStrmOpenFileHandle(hStdIn, "r", 0, &g_pStdIn);
+
+    RTFILE hStdOut;
+    RTFileFromNative(&hStdOut,  (RTHCINTPTR)GetStdHandle(STD_OUTPUT_HANDLE));
+    /** @todo Closing of standard handles not support via IPRT (yet). */
+    RTStrmOpenFileHandle(hStdOut, "wt", 0, &g_pStdOut);
+
+    RTFILE hStdErr;
+    RTFileFromNative(&hStdErr,  (RTHCINTPTR)GetStdHandle(STD_ERROR_HANDLE));
+    RTStrmOpenFileHandle(hStdErr, "wt", 0, &g_pStdErr);
+
+    if (!fAllocConsole) /* When attaching to the parent console, make sure we start on a fresh line. */
+        RTPrintf("\n");
+
+    g_fHasConsole = true;
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Detaches from the (parent) console.
+ */
+static void vboxTrayDetachConsole()
+{
+    g_fHasConsole = false;
+}
+
+/**
+ * Destroys VBoxTray.
+ *
+ * @returns RTEXITCODE_SUCCESS.
+ */
+static RTEXITCODE vboxTrayDestroy()
+{
+    vboxTrayDetachConsole();
+
+    /* Release instance mutex. */
+    if (g_hMutexAppRunning != NULL)
+    {
+        CloseHandle(g_hMutexAppRunning);
+        g_hMutexAppRunning = NULL;
+    }
+
+    return RTEXITCODE_SUCCESS;
+}
+
+/**
+ * Prints the help to either a message box or a console (if attached).
+ *
+ * @returns RTEXITCODE_SYNTAX.
+ * @param   cArgs               Number of arguments given via argc.
+ * @param   papszArgs           Arguments given specified by \a cArgs.
+ */
+static RTEXITCODE vboxTrayPrintHelp(int cArgs, char **papszArgs)
+{
+    RT_NOREF(cArgs);
+
+    char szServices[64] = { 0 };
+    for (size_t i = 0; i < RT_ELEMENTS(g_aServices); i++)
+    {
+        char szName[RTTHREAD_NAME_LEN];
+        int rc2 = RTStrCopy(szName, sizeof(szName), g_aServices[i].pDesc->pszName);
+        RTStrToLower(szName); /* To make it easier for users to recognize the service name via command line. */
+        AssertRCBreak(rc2);
+        if (i > 0)
+        {
+            rc2 = RTStrCat(szServices, sizeof(szServices), ", ");
+            AssertRCBreak(rc2);
+        }
+        rc2 = RTStrCat(szServices, sizeof(szServices), szName);
+        AssertRCBreak(rc2);
+    }
+
+    VBoxTrayShowMsgBox(VBOX_PRODUCT " - " VBOX_VBOXTRAY_TITLE,
+                       MB_ICONINFORMATION,
+                       VBOX_PRODUCT " %s v%u.%u.%ur%u\n"
+                       "Copyright (C) 2009-" VBOX_C_YEAR " " VBOX_VENDOR "\n\n"
+                       "Command Line Parameters:\n\n"
+                       "-d, --debug\n"
+                       "    Enables debugging mode\n"
+                       "-f, --foreground\n"
+                       "    Enables running in foreground\n"
+                       "-l, --logfile <file>\n"
+                       "    Enables logging to a file\n"
+                       "-v, --verbose\n"
+                       "    Increases verbosity\n"
+                       "-V, --version\n"
+                       "   Displays version number and exit\n"
+                       "-?, -h, --help\n"
+                       "   Displays this help text and exit\n"
+                       "\n"
+                       "Service parameters:\n\n"
+                       "--enable-<service-name>\n"
+                       "   Enables the given service\n"
+                       "--disable-<service-name>\n"
+                       "   Disables the given service\n"
+                       "--only-<service-name>\n"
+                       "   Only starts the given service\n"
+                       "\n"
+                       "Examples:\n"
+                       "  %s -vvv --logfile C:\\Temp\\VBoxTray.log\n"
+                       "  %s --foreground -vvvv --only-draganddrop\n"
+                       "\n"
+                       "Available services: %s\n\n",
+                       VBOX_VBOXTRAY_TITLE, VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV,
+                       papszArgs[0], papszArgs[0], szServices);
+
+    vboxTrayDestroy();
+
+    return RTEXITCODE_SYNTAX;
 }
 
@@ -977 +998 @@
     if (RT_FAILURE(rc))
         return RTMsgInitFailure(rc);
+
+    /* If a debugger is present, we always want to attach a console. */
+    if (IsDebuggerPresent())
+        vboxTrayAttachConsole();
 
     /*
@@ -983 +1008 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
+        { "--debug",            'd',                         RTGETOPT_REQ_NOTHING },
+        { "/debug",             'd',                         RTGETOPT_REQ_NOTHING },
+        { "--foreground",       'f',                         RTGETOPT_REQ_NOTHING },
+        { "/foreground",        'f',                         RTGETOPT_REQ_NOTHING },
         { "--help",             'h',                         RTGETOPT_REQ_NOTHING },
         { "-help",              'h',                         RTGETOPT_REQ_NOTHING },
@@ -1006 +1035 @@
         {
             case 'h':
-                hlpShowMessageBox(VBOX_PRODUCT " - " VBOX_VBOXTRAY_TITLE,
-                                  MB_ICONINFORMATION,
-                     "-- " VBOX_PRODUCT " %s v%u.%u.%ur%u --\n\n"
-                     "Copyright (C) 2009-" VBOX_C_YEAR " " VBOX_VENDOR "\n\n"
-                     "Command Line Parameters:\n\n"
-                     "-l, --logfile <file>\n"
-                     "    Enables logging to a file\n"
-                     "-v, --verbose\n"
-                     "    Increases verbosity\n"
-                     "-V, --version\n"
-                     "   Displays version number and exit\n"
-                     "-?, -h, --help\n"
-                     "   Displays this help text and exit\n"
-                     "\n"
-                     "Examples:\n"
-                     "  %s -vvv\n",
-                     VBOX_VBOXTRAY_TITLE, VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV,
-                     papszArgs[0], papszArgs[0]);
-                return RTEXITCODE_SUCCESS;
+                return vboxTrayPrintHelp(cArgs, papszArgs);
+
+            case 'd':
+            {
+                /* ignore rc */ vboxTrayAttachConsole();
+                g_cVerbosity = 4; /* Set verbosity to level 4. */
+                break;
+            }
+
+            case 'f':
+            {
+                /* ignore rc */ vboxTrayAttachConsole();
+                /* Don't increase verbosity automatically here. */
+                break;
+            }
 
             case 'l':
+            {
                 if (*ValueUnion.psz == '\0')
                     szLogFile[0] = '\0';
@@ -1033 +1059 @@
                     rc = RTPathAbs(ValueUnion.psz, szLogFile, sizeof(szLogFile));
                     if (RT_FAILURE(rc))
-                        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs failed on log file path: %Rrc (%s)",
-                                              rc, ValueUnion.psz);
+                    {
+                        int rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs failed on log file path: %Rrc (%s)",
+                                                    rc, ValueUnion.psz);
+                        vboxTrayDestroy();
+                        return rcExit;
+                    }
                 }
                 break;
+            }
 
             case 'v':
@@ -1043 +1074 @@
 
             case 'V':
-                hlpShowMessageBox(VBOX_VBOXTRAY_TITLE, MB_ICONINFORMATION,
-                                  "Version: %u.%u.%ur%u",
-                                  VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV);
-                return RTEXITCODE_SUCCESS;
+                VBoxTrayShowMsgBox(VBOX_PRODUCT " - " VBOX_VBOXTRAY_TITLE,
+                                   MB_ICONINFORMATION,
+                                   "%u.%u.%ur%u", VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV);
+                return vboxTrayDestroy();
 
             default:
-                rc = RTGetOptPrintError(ch, &ValueUnion);
-                break;
-        }
-    }
-
-    /* Note: Do not use a global namespace ("Global\\") for mutex name here,
-     * will blow up NT4 compatibility! */
-    HANDLE hMutexAppRunning = CreateMutex(NULL, FALSE, VBOX_VBOXTRAY_TITLE);
-    if (   hMutexAppRunning != NULL
+            {
+                const  char *psz = ValueUnion.psz;
+                size_t const cch = strlen(ValueUnion.psz);
+                bool fFound = false;
+
+                if (cch > sizeof("--enable-") && !memcmp(psz, RT_STR_TUPLE("--enable-")))
+                    for (unsigned j = 0; !fFound && j < RT_ELEMENTS(g_aServices); j++)
+                        if ((fFound = !RTStrICmp(psz + sizeof("--enable-") - 1, g_aServices[j].pDesc->pszName)))
+                            g_aServices[j].fEnabled = true;
+
+                if (cch > sizeof("--disable-") && !memcmp(psz, RT_STR_TUPLE("--disable-")))
+                    for (unsigned j = 0; !fFound && j < RT_ELEMENTS(g_aServices); j++)
+                        if ((fFound = !RTStrICmp(psz + sizeof("--disable-") - 1, g_aServices[j].pDesc->pszName)))
+                            g_aServices[j].fEnabled = false;
+
+                if (cch > sizeof("--only-") && !memcmp(psz, RT_STR_TUPLE("--only-")))
+                    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+                    {
+                        g_aServices[j].fEnabled = !RTStrICmp(psz + sizeof("--only-") - 1, g_aServices[j].pDesc->pszName);
+                        if (g_aServices[j].fEnabled)
+                            fFound = true;
+                    }
+
+                if (!fFound)
+                {
+                    rc = vboxTrayServicesLazyPreInit();
+                    if (RT_FAILURE(rc))
+                        break;
+                    for (unsigned j = 0; !fFound && j < RT_ELEMENTS(g_aServices); j++)
+                    {
+                        rc = g_aServices[j].pDesc->pfnOption(NULL, cArgs, papszArgs, NULL);
+                        fFound = rc == VINF_SUCCESS;
+                        if (fFound)
+                            break;
+                        if (rc != -1) /* Means not parsed. */
+                            break;
+                    }
+                }
+                if (!fFound)
+                {
+                    RTGetOptPrintError(ch, &ValueUnion); /* Only shown on console. */
+                    return vboxTrayPrintHelp(cArgs, papszArgs);
+                }
+
+                continue;
+            }
+        }
+    }
+
+    if (RT_FAILURE(rc))
+    {
+        vboxTrayDestroy();
+        return RTEXITCODE_FAILURE;
+    }
+
+    /**
+     * VBoxTray already running? Bail out.
+     *
+     * Note: Do not use a global namespace ("Global\\") for mutex name here,
+     * will blow up NT4 compatibility!
+     */
+    g_hMutexAppRunning = CreateMutex(NULL, FALSE, VBOX_VBOXTRAY_TITLE);
+    if (   g_hMutexAppRunning != NULL
         && GetLastError() == ERROR_ALREADY_EXISTS)
     {
-        /* VBoxTray already running? Bail out. */
-        CloseHandle (hMutexAppRunning);
-        hMutexAppRunning = NULL;
-        return RTEXITCODE_SUCCESS;
-    }
+        VBoxTrayError(VBOX_VBOXTRAY_TITLE " already running!\n");
+        return vboxTrayDestroy();
+    }
+
+    /* Set the instance handle. */
+#ifdef IPRT_NO_CRT
+    Assert(g_hInstance == NULL); /* Make sure this isn't set before by WinMain(). */
+    g_hInstance = GetModuleHandleW(NULL);
+#endif
 
     rc = VbglR3Init();
     if (RT_SUCCESS(rc))
     {
-        rc = vboxTrayLogCreate(szLogFile[0] ? szLogFile : NULL);
+        rc = VBoxTrayLogCreate(szLogFile[0] ? szLogFile : NULL);
         if (RT_SUCCESS(rc))
         {
-            LogRel(("Verbosity level: %d\n", g_cVerbosity));
-
-            /* Log the major windows NT version: */
-            uint64_t const uNtVersion = RTSystemGetNtVersion();
-            LogRel(("Windows version %u.%u build %u (uNtVersion=%#RX64)\n", RTSYSTEM_NT_VERSION_GET_MAJOR(uNtVersion),
-                    RTSYSTEM_NT_VERSION_GET_MINOR(uNtVersion), RTSYSTEM_NT_VERSION_GET_BUILD(uNtVersion), uNtVersion ));
-
-            /* Set the instance handle. */
-#ifdef IPRT_NO_CRT
-            Assert(g_hInstance == NULL); /* Make sure this isn't set before by WinMain(). */
-            g_hInstance = GetModuleHandleW(NULL);
-#endif
-            hlpReportStatus(VBoxGuestFacilityStatus_Init);
+            VBoxTrayInfo("Verbosity level: %d\n", g_cVerbosity);
+
             rc = vboxTrayCreateToolWindow();
+            if (RT_SUCCESS(rc))
+                rc = vboxTrayCreateTrayIcon();
+
+            VBoxTrayHlpReportStatus(VBoxGuestFacilityStatus_PreInit);
+
             if (RT_SUCCESS(rc))
             {
@@ -1101 +1184 @@
 
                 rc = vboxDtInit();
-                if (!RT_SUCCESS(rc))
+                if (RT_FAILURE(rc))
                 {
-                    LogFlowFunc(("vboxDtInit failed, rc=%Rrc\n", rc));
                     /* ignore the Dt Init failure. this can happen for < XP win that do not support WTS API
                      * in that case the session is treated as active connected to the physical console
@@ -1110 +1192 @@
                 }
 
-                rc = VBoxAcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, true);
-                if (!RT_SUCCESS(rc))
-                    LogFlowFunc(("VBoxAcquireGuestCaps failed with rc=%Rrc, ignoring ...\n", rc));
-
-                rc = vboxTraySetupSeamless(); /** @todo r=andy Do we really want to be this critical for the whole application? */
-                if (RT_SUCCESS(rc))
-                {
-                    rc = vboxTrayServiceMain();
-                    if (RT_SUCCESS(rc))
-                        hlpReportStatus(VBoxGuestFacilityStatus_Terminating);
-                    vboxTrayShutdownSeamless();
-                }
+                VBoxAcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, true);
+
+                vboxTraySetupSeamless();
+
+                rc = vboxTrayServiceMain();
+                /* Note: Do *not* overwrite rc in the following code, as this acts as the exit code. */
+
+                vboxTrayShutdownSeamless();
 
                 /* it should be safe to call vboxDtTerm even if vboxStInit above failed */
@@ -1130 +1208 @@
 
                 VBoxCapsTerm();
-
-                vboxTrayDestroyToolWindow();
-            }
+            }
+
+            vboxTrayRemoveTrayIcon();
+            vboxTrayDestroyToolWindow();
+
             if (RT_SUCCESS(rc))
-                hlpReportStatus(VBoxGuestFacilityStatus_Terminated);
+
+                VBoxTrayHlpReportStatus(VBoxGuestFacilityStatus_Terminated);
             else
-            {
-                LogRel(("Error while starting, rc=%Rrc\n", rc));
-                hlpReportStatus(VBoxGuestFacilityStatus_Failed);
-            }
-
-            LogRel(("Ended\n"));
-
-            vboxTrayLogDestroy();
+                VBoxTrayHlpReportStatus(VBoxGuestFacilityStatus_Failed);
+
+            VBoxTrayInfo("VBoxTray terminated with %Rrc\n", rc);
+
+            VBoxTrayLogDestroy();
         }
 
@@ -1151 +1229 @@
         VBoxTrayShowError("VbglR3Init failed: %Rrc\n", rc);
 
-    /* Release instance mutex. */
-    if (hMutexAppRunning != NULL)
-    {
-        CloseHandle(hMutexAppRunning);
-        hMutexAppRunning = NULL;
-    }
+    vboxTrayDestroy();
 
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
@@ -1213 +1286 @@
             {
                 case TIMERID_VBOXTRAY_CHECK_HOSTVERSION:
+                {
                     if (RT_SUCCESS(VBoxCheckHostVersion()))
                     {
-                        /* After successful run we don't need to check again. */
+                        /* After a successful run we don't need to check again. */
                         KillTimer(g_hwndToolWindow, TIMERID_VBOXTRAY_CHECK_HOSTVERSION);
                     }
+
                     return 0;
+                }
 
                 default:

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

@@ -78 +78 @@
 
 /**
- * The environment information for services.
- */
-typedef struct VBOXSERVICEENV
+ * The environment information for a single VBoxTray service.
+ */
+typedef struct VBOXTRAYSVCENV
 {
     /** hInstance of VBoxTray. */
@@ -88 +88 @@
      *               by the VBoxCaps facility. See #8037. */
     VBOXDISPIF dispIf;
-} VBOXSERVICEENV;
+} VBOXTRAYSVCENV;
 /** Pointer to a VBoxTray service env info structure.  */
-typedef VBOXSERVICEENV *PVBOXSERVICEENV;
+typedef VBOXTRAYSVCENV *PVBOXTRAYSVCENV;
 /** Pointer to a const VBoxTray service env info structure.  */
-typedef VBOXSERVICEENV const *PCVBOXSERVICEENV;
-
-/**
- * A service descriptor.
- */
-typedef struct VBOXSERVICEDESC
+typedef VBOXTRAYSVCENV const *PCVBOXTRAYSVCENV;
+
+/**
+ * A VBoxTray service descriptor.
+ */
+typedef struct VBOXTRAYSVCDESC
 {
     /** The service's name. RTTHREAD_NAME_LEN maximum characters. */
@@ -103 +103 @@
     /** The service description. */
     const char *pszDesc;
+    /** The usage options stuff for the --help screen. */
+    const char *pszUsage;
+    /** The option descriptions for the --help screen. */
+    const char *pszOptions;
 
     /** Callbacks. */
+
+    /**
+     * Called before parsing arguments.
+     * @returns VBox status code.
+     */
+    DECLCALLBACKMEMBER(int, pfnPreInit,(void));
+
+    /**
+     * Tries to parse the given command line option.
+     *
+     * @returns 0 if we parsed, -1 if it didn't and anything else means exit.
+     * @param   ppszShort   If not NULL it points to the short option iterator. a short argument.
+     *                      If NULL examine argv[*pi].
+     * @param   argc        The argument count.
+     * @param   argv        The argument vector.
+     * @param   pi          The argument vector index. Update if any value(s) are eaten.
+     */
+    DECLCALLBACKMEMBER(int, pfnOption,(const char **ppszShort, int argc, char **argv, int *pi));
 
     /**
@@ -116 +138 @@
      * @todo r=bird: The pEnv type is WRONG!  Please check all your const pointers.
      */
-    DECLCALLBACKMEMBER(int, pfnInit,(const PVBOXSERVICEENV pEnv, void **ppInstance));
+    DECLCALLBACKMEMBER(int, pfnInit,(const PVBOXTRAYSVCENV pEnv, void **ppInstance));
 
     /** Called from the worker thread.
@@ -139 +161 @@
      */
     DECLCALLBACKMEMBER(void, pfnDestroy,(void *pInstance));
-} VBOXSERVICEDESC, *PVBOXSERVICEDESC;
-
-
-/**
- * The service initialization info and runtime variables.
- */
-typedef struct VBOXSERVICEINFO
+} VBOXTRAYSVCDESC;
+/** Pointer to a VBoxTray service descriptor. */
+typedef VBOXTRAYSVCDESC *PVBOXTRAYSVCDESC;
+
+/**
+ * VBoxTray service initialization info and runtime variables.
+ */
+typedef struct VBOXTRAYSVCINFO
 {
     /** Pointer to the service descriptor. */
-    PVBOXSERVICEDESC pDesc;
+    PVBOXTRAYSVCDESC pDesc;
     /** Thread handle. */
     RTTHREAD         hThread;
@@ -164 +187 @@
     /** Whether the service is enabled or not. */
     bool             fEnabled;
-} VBOXSERVICEINFO, *PVBOXSERVICEINFO;
-
-/**
- * Globally unique (system wide) message registration.
- */
-typedef struct VBOXGLOBALMESSAGE
+} VBOXTRAYSVCINFO;
+/** Pointer to a VBoxTray service' initialization and runtime variables. */
+typedef VBOXTRAYSVCINFO *PVBOXTRAYSVCINFO;
+
+/**
+ * Structure for keeping a globally registered Windows message.
+ */
+typedef struct VBOXTRAYGLOBALMSG
 {
     /** Message name. */
@@ -181 +206 @@
      *  to be filled in when registering the actual message. */
     UINT     uMsgID;
-} VBOXGLOBALMESSAGE, *PVBOXGLOBALMESSAGE;
-
+} VBOXTRAYGLOBALMSG;
+/** Pointer to a globally registered Windows message. */
+typedef VBOXTRAYGLOBALMSG *PVBOXTRAYGLOBALMSG;
 
 /*********************************************************************************************************************************
 *   Externals                                                                                                                    *
 *********************************************************************************************************************************/
-extern VBOXSERVICEDESC g_SvcDescDisplay;
+extern VBOXTRAYSVCDESC g_SvcDescDisplay;
 #ifdef VBOX_WITH_SHARED_CLIPBOARD
-extern VBOXSERVICEDESC g_SvcDescClipboard;
+extern VBOXTRAYSVCDESC g_SvcDescClipboard;
 #endif
-extern VBOXSERVICEDESC g_SvcDescSeamless;
-extern VBOXSERVICEDESC g_SvcDescVRDP;
-extern VBOXSERVICEDESC g_SvcDescIPC;
-extern VBOXSERVICEDESC g_SvcDescLA;
+extern VBOXTRAYSVCDESC g_SvcDescSeamless;
+extern VBOXTRAYSVCDESC g_SvcDescVRDP;
+extern VBOXTRAYSVCDESC g_SvcDescIPC;
+extern VBOXTRAYSVCDESC g_SvcDescLA;
 #ifdef VBOX_WITH_DRAG_AND_DROP
-extern VBOXSERVICEDESC g_SvcDescDnD;
+extern VBOXTRAYSVCDESC g_SvcDescDnD;
 #endif
 
-extern int          g_cVerbosity;
+extern bool         g_fHasConsole;
+extern unsigned     g_cVerbosity;
 extern HINSTANCE    g_hInstance;
 extern HWND         g_hwndToolWindow;
 extern uint32_t     g_fGuestDisplaysChanged;
 
-RTEXITCODE VBoxTrayShowError(const char *pszFormat, ...);
-
 #endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxTray_h */
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTrayInternal.h

@@ -104 +104 @@
                              DWORD aBitsPerPixel, LONG aPosX, LONG aPosY, BOOL fEnabled, BOOL fExtDispSup);
 
+int                      VBoxTrayLogCreate(const char *pszLogFile);
+void                     VBoxTrayLogDestroy(void);
+
+void                     VBoxTrayInfo(const char *pszFormat, ...);
+RTEXITCODE               VBoxTrayError(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
+void                     VBoxTrayVerbose(unsigned iLevel, const char *pszFormat, ...)  RT_IPRT_FORMAT_ATTR(2, 3);
+RTEXITCODE               VBoxTrayShowError(const char *pszFormat, ...);
+
 #endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxTrayInternal_h */

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

@@ -79 +79 @@
 typedef struct VBOXVRDPCONTEXT
 {
-    const VBOXSERVICEENV *pEnv;
+    const VBOXTRAYSVCENV *pEnv;
 
     uint32_t level;
@@ -279 +279 @@
 }
 
-static DECLCALLBACK(int) VBoxVRDPInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbtrVRDPPreInit(void)
+{
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnOption}
+ */
+static DECLCALLBACK(int) vbtrVRDPOption(const char **ppszShort, int argc, char **argv, int *pi)
+{
+    RT_NOREF(ppszShort, argc, argv, pi);
+
+    return -1;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+static DECLCALLBACK(int) vbtrVRDPInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
 {
     AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
@@ -316 +337 @@
 }
 
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnDestroy}
+ */
 static DECLCALLBACK(void) VBoxVRDPDestroy(void *pInstance)
 {
@@ -335 +359 @@
 
 /**
- * Thread function to wait for and process mode change requests
- */
-static DECLCALLBACK(int) VBoxVRDPWorker(void *pvInstance, bool volatile *pfShutdown)
+ * @interface_method_impl{VBOXSERVICEDESC,pfnWorker}
+ */
+static DECLCALLBACK(int) vbtrVRDPWorker(void *pvInstance, bool volatile *pfShutdown)
 {
     AssertPtrReturn(pvInstance, VERR_INVALID_POINTER);
@@ -450 +474 @@
  * The service description.
  */
-VBOXSERVICEDESC g_SvcDescVRDP =
+VBOXTRAYSVCDESC g_SvcDescVRDP =
 {
     /* pszName. */
@@ -456 +480 @@
     /* pszDescription. */
     "VRDP Connection Notification",
+    /* pszUsage. */
+    NULL,
+    /* pszOptions. */
+    NULL,
     /* methods */
-    VBoxVRDPInit,
-    VBoxVRDPWorker,
+    vbtrVRDPPreInit,
+    vbtrVRDPOption,
+    vbtrVRDPInit,
+    vbtrVRDPWorker,
     NULL /* pfnStop */,
     VBoxVRDPDestroy

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.h

@@ -33 +33 @@
 
 /* The restore service prototypes. */
-int                VBoxVRDPInit    (const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread);
+int                VBoxVRDPInit    (const VBOXTRAYSVCENV *pEnv, void **ppInstance, bool *pfStartThread);
 unsigned __stdcall VBoxVRDPThread  (void *pInstance);
-void               VBoxVRDPDestroy (const VBOXSERVICEENV *pEnv, void *pInstance);
+void               VBoxVRDPDestroy (const VBOXTRAYSVCENV *pEnv, void *pInstance);
 
 #endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxVRDP_h */