Changeset 81040 in vbox

Timestamp:

Sep 27, 2019 9:45:46 AM (5 years ago)

Author:

vboxsync

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

133643

Message:

Additions/VBoxClient: Revamped and unified local logging infrastructure; cleaned up a lot of different logging styles / ways. Fixed logging memory leaks.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• VBoxClient.h (modified) (1 diff)
• clipboard.cpp (modified) (11 diffs)
• display-svga-x11.cpp (modified) (10 diffs)
• display-svga.cpp (modified) (7 diffs)
• display.cpp (modified) (3 diffs)
• draganddrop.cpp (modified) (49 diffs)
• hostversion.cpp (modified) (6 diffs)
• main.cpp (modified) (16 diffs)
• seamless-x11.cpp (modified) (25 diffs)
• seamless-x11.h (modified) (2 diffs)
• seamless.cpp (modified) (17 diffs)
• testcase/tstSeamlessX11-auto.cpp (modified) (1 diff)
• testcase/tstSeamlessX11.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -27 +27 @@
 #include <iprt/string.h>
 
-/** Exit with a fatal error. */
-#define VBClFatalError(format) \
-do { \
-    char *pszMessage = RTStrAPrintf2 format; \
-    LogRel(format); \
-    vbclFatalError(pszMessage); \
-} while(0)
-
-/** Exit with a fatal error. */
-extern DECLNORETURN(void) vbclFatalError(char *pszMessage);
+void VBClLogInfo(const char *pszFormat, ...);
+void VBClLogError(const char *pszFormat, ...);
+void VBClLogFatalError(const char *pszFormat, ...);
 
 /** Call clean-up for the current service and exit. */

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -70 +70 @@
     LogRelFlowFunc(("u32Format=%d, pv=%p, cb=%d\n", u32Format, pv, cb));
     rc = VbglR3ClipboardWriteData(g_ctx.client, u32Format, pv, cb);
-    LogRelFlowFunc(("rc=%Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -88 +88 @@
 int ClipRequestDataForX11(SHCLCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
 {
-    RT_NOREF1(pCtx);
+    RT_NOREF(pCtx);
     int rc = VINF_SUCCESS;
     uint32_t cb = 1024;
@@ -127 +127 @@
             RTMemFree(pv);
     }
-    LogRelFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     if (RT_SUCCESS(rc))
         LogRelFlow(("    *pcb=%d\n", *pcb));
@@ -150 +150 @@
 void ClipReportX11Formats(SHCLCONTEXT *pCtx, uint32_t u32Formats)
 {
-    RT_NOREF1(pCtx);
+    RT_NOREF(pCtx);
     LogRelFlowFunc(("u32Formats=%d\n", u32Formats));
     int rc = VbglR3ClipboardFormatsReport(g_ctx.client, u32Formats);
-    LogRelFlowFunc(("rc=%Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
 }
 
@@ -168 +168 @@
 void ClipRequestFromX11CompleteCallback(SHCLCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
 {
-    RT_NOREF1(pCtx);
+    RT_NOREF(pCtx);
     if (RT_SUCCESS(rc))
         vboxClipboardSendData(pReq->u32Format, pv, cb);
@@ -197 +197 @@
         rc = VbglR3ClipboardConnect(&g_ctx.client);
         if (RT_FAILURE(rc))
-            LogRel(("Error connecting to host. rc=%Rrc\n", rc));
+            VBClLogError("Error connecting to host, rc=%Rrc\n", rc);
         else if (!g_ctx.client)
         {
-            LogRel(("Invalid client ID of 0\n"));
+            VBClLogError("Invalid client ID of 0\n");
             rc = VERR_NOT_SUPPORTED;
         }
@@ -207 +207 @@
     if (rc != VINF_SUCCESS && g_ctx.pBackend)
         ClipDestructX11(g_ctx.pBackend);
-    LogRelFlowFunc(("g_ctx.client=%u rc=%Rrc\n", g_ctx.client, rc));
+
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -271 +272 @@
 
                 default:
-                    LogRel2(("Unsupported message from host!!!\n"));
+                {
+                    VBClLogInfo("Unsupported message from host (%RU32)\n", Msg);
+                    break;
+                }
             }
         }
@@ -277 +281 @@
         LogRelFlow(("processed host event rc = %d\n", rc));
     }
-    LogRelFlowFunc(("rc=%d\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -288 +292 @@
 static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
 {
-    RT_NOREF2(ppInterface, fDaemonised);
+    RT_NOREF(ppInterface, fDaemonised);
 
     /* Initialise the guest library. */
@@ -327 +331 @@
 
     if (!pService)
-        VBClFatalError(("Out of memory\n"));
+        VBClLogFatalError("Out of memory\n");
     pService->pInterface = &vbclClipboardInterface;
     return &pService->pInterface;

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -63 +63 @@
 
     if (uname(&name) == -1)
-        VBClFatalError(("Failed to get kernel name.\n"));
+        VBClLogFatalError("Failed to get kernel name\n");
     if (strcmp(name.sysname, "Linux"))
         return false;
@@ -81 +81 @@
 
     if (pContext->pDisplay != NULL)
-        VBClFatalError(("%s called with bad argument\n", __func__));
+        VBClLogFatalError("%s called with bad argument\n", __func__);
     pContext->pDisplay = XOpenDisplay(NULL);
     if (pContext->pDisplay == NULL)
@@ -156 +156 @@
         _XFlush(pContext->pDisplay);
     if (pContext->pDisplay->bufptr + cb > pContext->pDisplay->bufmax)
-        VBClFatalError(("%s display buffer overflow.\n", __func__));
+        VBClLogFatalError("%s display buffer overflow\n", __func__);
     if (cb % 4 != 0)
-        VBClFatalError(("%s bad parameter.\n", __func__));
+        VBClLogFatalError("%s bad parameter\n", __func__);
     pContext->pDisplay->last_req = pContext->pDisplay->bufptr;
     *ppReq = (struct X11REQHEADER *)pContext->pDisplay->bufptr;
@@ -178 +178 @@
 
     if (!VALID_PTR(pContext->pDisplay))
-        VBClFatalError(("%s bad display argument.\n", __func__));
+        VBClLogFatalError("%s bad display argument\n", __func__);
     if (cRects == 0)
         return;
@@ -205 +205 @@
         return;
     /* What now? */
-    VBClFatalError(("%s failed to set resolution\n", __func__));
+    VBClLogFatalError("%s failed to set resolution\n", __func__);
 }
 
@@ -215 +215 @@
 
     if (!VALID_PTR(pContext->pDisplay))
-        VBClFatalError(("%s bad display argument.\n", __func__));
+        VBClLogFatalError("%s bad display argument\n", __func__);
     x11GetRequest(pContext, pContext->hRandRMajor, X11_RANDR_GET_SCREEN_REQUEST,
                     sizeof(struct X11RANDRGETSCREENREQ),
@@ -222 +222 @@
     _XSend(pContext->pDisplay, NULL, 0);
     if (!_XReply(pContext->pDisplay, (xReply *)&repGetScreen, 0, xTrue))
-        VBClFatalError(("%s failed to set resolution\n", __func__));
+        VBClLogFatalError("%s failed to set resolution\n", __func__);
 }
 
@@ -247 +247 @@
     rc = VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
     if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to request display change events, rc=%Rrc\n", rc));
+        VBClLogFatalError("Failed to request display change events, rc=%Rrc\n", rc);
     rc = VbglR3AcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, false);
     if (rc == VERR_RESOURCE_BUSY)  /* Someone else has already acquired it. */
         return VINF_SUCCESS;
     if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to register resizing support, rc=%Rrc\n", rc));
+        VBClLogFatalError("Failed to register resizing support, rc=%Rrc\n", rc);
     for (;;)
     {
@@ -263 +263 @@
         rc = VbglR3GetDisplayChangeRequestMulti(VMW_MAX_HEADS, &cDisplaysOut, aDisplays, true);
         if (RT_FAILURE(rc))
-            VBClFatalError(("Failed to get display change request, rc=%Rrc\n", rc));
+            VBClLogFatalError("Failed to get display change request, rc=%Rrc\n", rc);
         if (cDisplaysOut > VMW_MAX_HEADS)
-            VBClFatalError(("Display change request contained, rc=%Rrc\n", rc));
+            VBClLogFatalError("Display change request contained, rc=%Rrc\n", rc);
         for (i = 0, cHeads = 0; i < cDisplaysOut && i < VMW_MAX_HEADS; ++i)
         {
@@ -289 +289 @@
         rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, RT_INDEFINITE_WAIT, &events);
         if (RT_FAILURE(rc))
-            VBClFatalError(("Failure waiting for event, rc=%Rrc\n", rc));
+            VBClLogFatalError("Failure waiting for event, rc=%Rrc\n", rc);
     }
 }

trunk/src/VBox/Additions/x11/VBoxClient/display-svga.cpp

@@ -102 +102 @@
 
     if (pContext->hDevice != NIL_RTFILE)
-        VBClFatalError(("%s called with bad argument\n", __func__));
+        VBClLogFatalError("%s called with bad argument\n", __func__);
     /* Try to open the SVGA DRM device. */
     for (i = 0; i < 128; ++i)
@@ -121 +121 @@
             rc = RTStrPrintf(szPath, sizeof(szPath), "/dev/dri/controlD%u", i / 2 + 64);
         if (RT_FAILURE(rc))
-            VBClFatalError(("RTStrPrintf of device path failed, rc=%Rrc\n", rc));
+            VBClLogFatalError("RTStrPrintf of device path failed, rc=%Rrc\n", rc);
         rc = RTFileOpen(&hDevice, szPath, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
         if (RT_FAILURE(rc))
@@ -158 +158 @@
 
     if (pContext->hDevice == NIL_RTFILE)
-        VBClFatalError(("%s bad device argument.\n", __func__));
+        VBClLogFatalError("%s bad device argument\n", __func__);
     ioctlLayout.cOutputs = cHeads;
     ioctlLayout.ptrRects = (uint64_t)paRects;
@@ -164 +164 @@
                      &ioctlLayout, sizeof(ioctlLayout), NULL);
     if (RT_FAILURE(rc) && rc != VERR_INVALID_PARAMETER)
-        VBClFatalError(("Failure updating layout, rc=%Rrc\n", rc));
+        VBClLogFatalError("Failure updating layout, rc=%Rrc\n", rc);
 }
 
@@ -190 +190 @@
     rc = VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
     if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to request display change events, rc=%Rrc\n", rc));
+        VBClLogFatalError("Failed to request display change events, rc=%Rrc\n", rc);
     rc = VbglR3AcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, false);
     if (rc == VERR_RESOURCE_BUSY)  /* Someone else has already acquired it. */
         return VINF_SUCCESS;
     if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to register resizing support, rc=%Rrc\n", rc));
+        VBClLogFatalError("Failed to register resizing support, rc=%Rrc\n", rc);
     for (;;)
     {
@@ -207 +207 @@
         fAck = true;
         if (RT_FAILURE(rc))
-            VBClFatalError(("Failed to get display change request, rc=%Rrc\n", rc));
+            VBClLogFatalError("Failed to get display change request, rc=%Rrc\n", rc);
         if (cDisplaysOut > VMW_MAX_HEADS)
-            VBClFatalError(("Display change request contained, rc=%Rrc\n", rc));
+            VBClLogFatalError("Display change request contained, rc=%Rrc\n", rc);
         for (i = 0, cHeads = 0; i < cDisplaysOut && i < VMW_MAX_HEADS; ++i)
         {
@@ -233 +233 @@
         rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, RT_INDEFINITE_WAIT, &events);
         if (RT_FAILURE(rc))
-            VBClFatalError(("Failure waiting for event, rc=%Rrc\n", rc));
+            VBClLogFatalError("Failure waiting for event, rc=%Rrc\n", rc);
     }
 }

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -214 +214 @@
     status = system(pState->pcszXrandr);
     if (WEXITSTATUS(status) != 0)  /* Utility or extension not available. */
-        VBClFatalError(("Failed to execute the xrandr utility.\n"));
+        VBClLogFatalError("Failed to execute the xrandr utility\n");
     RTStrPrintf(szCommand, sizeof(szCommand), "%s --q12", pState->pcszXrandr);
     status = system(szCommand);
@@ -231 +231 @@
     struct DISPLAYSTATE *pSelf = (struct DISPLAYSTATE *)ppInterface;
     if (pSelf->magic != DISPLAYSTATE_MAGIC)
-        VBClFatalError(("Bad display service object!\n"));
+        VBClLogFatalError("Bad display service object!\n");
     return pSelf;
 }
@@ -274 +274 @@
 
     if (!pService)
-        VBClFatalError(("Out of memory\n"));
+        VBClLogFatalError("Out of memory\n");
     pService->pInterface = &vbclDisplayInterface;
     pService->magic = DISPLAYSTATE_MAGIC;

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -523 +523 @@
     void uninit(void);
     void reset(void);
-
-    /* Logging. */
-    VBOX_DND_FN_DECL_LOG(void) logInfo(const char *pszFormat, ...);
-    VBOX_DND_FN_DECL_LOG(void) logError(const char *pszFormat, ...);
 
     /* X11 message processing. */
@@ -860 +856 @@
         if (!m_wndProxy.hWnd)
         {
-            LogRel(("DnD: Error creating proxy window\n"));
+            VBClLogError("Error creating proxy window\n");
             rc = VERR_GENERAL_FAILURE;
             break;
@@ -868 +864 @@
         if (RT_FAILURE(rc))
         {
-            LogRel(("DnD: Error initializing proxy window, rc=%Rrc\n", rc));
+            VBClLogError("Error initializing proxy window, rc=%Rrc\n", rc);
             break;
         }
@@ -878 +874 @@
         XFlush(m_pDisplay);
 #endif
-        logInfo("Proxy window=%RU32, root window=%RU32 ...\n", m_wndProxy.hWnd, m_wndRoot);
+        VBClLogInfo("Proxy window=%RU32, root window=%RU32 ...\n", m_wndProxy.hWnd, m_wndRoot);
 
         /* Set the window's name for easier lookup. */
@@ -894 +890 @@
     }
     else
-        logError("Initializing drag instance for screen %RU32 failed with rc=%Rrc\n", uScreenID, rc);
+        VBClLogError("Initializing drag instance for screen %RU32 failed with rc=%Rrc\n", uScreenID, rc);
 
     LogFlowFuncLeaveRC(rc);
     return rc;
-}
-
-/**
- * Logs an error message to the (release) logging instance.
- *
- * @param   pszFormat               Format string to log.
- */
-VBOX_DND_FN_DECL_LOG(void) DragInstance::logError(const char *pszFormat, ...)
-{
-    va_list args;
-    va_start(args, pszFormat);
-    char *psz = NULL;
-    RTStrAPrintfV(&psz, pszFormat, args);
-    va_end(args);
-
-    AssertPtr(psz);
-    LogFlowFunc(("%s", psz));
-    LogRel(("DnD: %s", psz));
-
-    RTStrFree(psz);
-}
-
-/**
- * Logs an info message to the (release) logging instance.
- *
- * @param   pszFormat               Format string to log.
- */
-VBOX_DND_FN_DECL_LOG(void) DragInstance::logInfo(const char *pszFormat, ...)
-{
-    va_list args;
-    va_start(args, pszFormat);
-    char *psz = NULL;
-    RTStrAPrintfV(&psz, pszFormat, args);
-    va_end(args);
-
-    AssertPtr(psz);
-    LogFlowFunc(("%s", psz));
-    LogRel2(("DnD: %s", psz));
-
-    RTStrFree(psz);
 }
 
@@ -1154 +1110 @@
                                      False /* Propagate */, NoEventMask, reinterpret_cast<XEvent *>(&m));
                 if (xRc == 0)
-                    logError("Error sending position XA_XdndStatus event to current window=%#x: %s\n",
-                              m_wndCur, gX11->xErrorToString(xRc).c_str());
+                    VBClLogError("Error sending position XA_XdndStatus event to current window=%#x: %s\n",
+                                 m_wndCur, gX11->xErrorToString(xRc).c_str());
             }
             else if (   e.xclient.message_type == xAtom(XA_XdndLeave)
@@ -1161 +1117 @@
             {
                 LogFlowThisFunc(("XA_XdndLeave\n"));
-                logInfo("Guest to host transfer canceled by the guest source window\n");
+                VBClLogInfo("Guest to host transfer canceled by the guest source window\n");
 
                 /* Start over. */
@@ -1174 +1130 @@
                 {
                     /* Can occur when dragging from guest->host, but then back in to the guest again. */
-                    logInfo("Could not drop on own proxy window\n"); /* Not fatal. */
+                    VBClLogInfo("Could not drop on own proxy window\n"); /* Not fatal. */
 
                     /* Let the source know. */
@@ -1189 +1145 @@
             else /* Unhandled event, abort. */
             {
-                logInfo("Unhandled event from wnd=%#x, msg=%s\n", e.xclient.window, xAtomToString(e.xclient.message_type).c_str());
+                VBClLogInfo("Unhandled event from wnd=%#x, msg=%s\n", e.xclient.window, xAtomToString(e.xclient.message_type).c_str());
 
                 /* Let the source know. */
@@ -1335 +1291 @@
             if (pReq->target == xAtom(XA_TARGETS))
             {
-                logInfo("Target window %#x ('%s') asking for target list\n", e.xselectionrequest.requestor, pszWndName);
+                VBClLogInfo("Target window %#x ('%s') asking for target list\n", e.xselectionrequest.requestor, pszWndName);
 
                 /* If so, set the window property with the formats on the requestor
@@ -1346 +1302 @@
             else if (m_lstFormats.contains(pReq->target))
             {
-                logInfo("Target window %#x ('%s') is asking for data as '%s'\n",
-                         pReq->requestor, pszWndName, xAtomToString(pReq->target).c_str());
+                VBClLogInfo("Target window %#x ('%s') is asking for data as '%s'\n",
+                            pReq->requestor, pszWndName, xAtomToString(pReq->target).c_str());
 
                 /* Did we not drop our stuff to the guest yet? Bail out. */
@@ -1360 +1316 @@
                     RTCString strFormat = xAtomToString(pReq->target);
                     Assert(strFormat.isNotEmpty());
-                    logInfo("Target window=%#x requested data from host as '%s', rc=%Rrc\n",
-                            pReq->requestor, strFormat.c_str(), rc);
+                    VBClLogInfo("Target window=%#x requested data from host as '%s', rc=%Rrc\n",
+                                pReq->requestor, strFormat.c_str(), rc);
 
                     /* Make a copy of the MIME data to be passed back. The X server will be become
@@ -1388 +1344 @@
             else
             {
-                logError("Refusing unknown command/format '%s' of wnd=%#x ('%s')\n",
-                         xAtomToString(e.xselectionrequest.target).c_str(), pReq->requestor, pszWndName);
+                VBClLogError("Refusing unknown command/format '%s' of wnd=%#x ('%s')\n",
+                             xAtomToString(e.xselectionrequest.target).c_str(), pReq->requestor, pszWndName);
                 rc = VERR_NOT_SUPPORTED;
             }
@@ -1399 +1355 @@
             int xRc = XSendEvent(pReq->display, pReq->requestor, True /* Propagate */, 0, &s);
             if (xRc == 0)
-                logError("Error sending SelectionNotify(1) event to wnd=%#x: %s\n", pReq->requestor,
-                         gX11->xErrorToString(xRc).c_str());
+                VBClLogError("Error sending SelectionNotify(1) event to wnd=%#x: %s\n", pReq->requestor,
+                             gX11->xErrorToString(xRc).c_str());
             XFlush(pReq->display);
 
@@ -1749 +1705 @@
         if (xRc != Success)
         {
-            logError("Error getting properties of cursor window=%#x: %s\n", wndCursor, gX11->xErrorToString(xRc).c_str());
+            VBClLogError("Error getting properties of cursor window=%#x: %s\n", wndCursor, gX11->xErrorToString(xRc).c_str());
         }
         else
@@ -1756 +1712 @@
             {
                 /** @todo Do we need to deal with this? */
-                logError("Wrong window properties for window %#x: pcData=%#x, iFmt=%d, cItems=%ul\n",
-                         wndCursor, pcData, fmt, cItems);
+                VBClLogError("Wrong window properties for window %#x: pcData=%#x, iFmt=%d, cItems=%ul\n",
+                             wndCursor, pcData, fmt, cItems);
             }
             else
@@ -1789 +1745 @@
         char *pszWndName = wndX11GetNameA(m_wndCur);
         AssertPtr(pszWndName);
-        logInfo("Left old window %#x ('%s'), Xdnd version=%ld\n", m_wndCur, pszWndName, newVer);
+        VBClLogInfo("Left old window %#x ('%s'), Xdnd version=%ld\n", m_wndCur, pszWndName, newVer);
         RTStrFree(pszWndName);
 
@@ -1804 +1760 @@
         xRc = XSendEvent(m_pDisplay, m_wndCur, False, NoEventMask, reinterpret_cast<XEvent*>(&m));
         if (xRc == 0)
-            logError("Error sending XA_XdndLeave event to old window=%#x: %s\n", m_wndCur, gX11->xErrorToString(xRc).c_str());
+            VBClLogError("Error sending XA_XdndLeave event to old window=%#x: %s\n", m_wndCur, gX11->xErrorToString(xRc).c_str());
 
         /* Reset our current window. */
@@ -1821 +1777 @@
         char *pszWndName = wndX11GetNameA(wndCursor);
         AssertPtr(pszWndName);
-        logInfo("Entered new window %#x ('%s'), supports Xdnd version=%ld\n", wndCursor, pszWndName, newVer);
+        VBClLogInfo("Entered new window %#x ('%s'), supports Xdnd version=%ld\n", wndCursor, pszWndName, newVer);
         RTStrFree(pszWndName);
 
@@ -1851 +1807 @@
         xRc = XSendEvent(m_pDisplay, wndCursor, False, NoEventMask, reinterpret_cast<XEvent*>(&m));
         if (xRc == 0)
-            logError("Error sending XA_XdndEnter event to window=%#x: %s\n", wndCursor, gX11->xErrorToString(xRc).c_str());
+            VBClLogError("Error sending XA_XdndEnter event to window=%#x: %s\n", wndCursor, gX11->xErrorToString(xRc).c_str());
     }
 
@@ -1880 +1836 @@
         xRc = XSendEvent(m_pDisplay, wndCursor, False, NoEventMask, reinterpret_cast<XEvent*>(&m));
         if (xRc == 0)
-            logError("Error sending XA_XdndPosition event to current window=%#x: %s\n", wndCursor, gX11->xErrorToString(xRc).c_str());
+            VBClLogError("Error sending XA_XdndPosition event to current window=%#x: %s\n", wndCursor, gX11->xErrorToString(xRc).c_str());
     }
 
@@ -1933 +1889 @@
 
     int rc = VbglR3DnDHGSendReqData(&m_dndCtx, szFormat);
-    logInfo("Drop event from host resulted in: %Rrc\n", rc);
+    VBClLogInfo("Drop event from host resulted in: %Rrc\n", rc);
 
     LogFlowFuncLeaveRC(rc);
@@ -1972 +1928 @@
      * be on the guest, so proceed working on communicating with the target window.
      */
-    logInfo("Received %RU32 bytes of URI list meta data from host\n", cbData);
+    VBClLogInfo("Received %RU32 bytes of URI list meta data from host\n", cbData);
 
     /* Destroy any old data. */
@@ -2017 +1973 @@
     int xRc = XSendEvent(m_pDisplay, m_wndCur, False /* Propagate */, NoEventMask, reinterpret_cast<XEvent*>(&m));
     if (xRc == 0)
-        logError("Error sending XA_XdndDrop event to window=%#x: %s\n", m_wndCur, gX11->xErrorToString(xRc).c_str());
+        VBClLogError("Error sending XA_XdndDrop event to window=%#x: %s\n", m_wndCur, gX11->xErrorToString(xRc).c_str());
     XFlush(m_pDisplay);
 
@@ -2097 +2053 @@
             char *pszWndName = wndX11GetNameA(wndSelection);
             AssertPtr(pszWndName);
-            logInfo("New guest source window %#x ('%s')\n", wndSelection, pszWndName);
+            VBClLogInfo("New guest source window %#x ('%s')\n", wndSelection, pszWndName);
 
             /* Start over. */
@@ -2141 +2097 @@
                     if (fWaitFailed)
                     {
-                        logError("Error mapping proxy window to guest source window %#x ('%s'), rc=%Rrc\n",
-                                 wndSelection, pszWndName, rc);
+                        VBClLogError("Error mapping proxy window to guest source window %#x ('%s'), rc=%Rrc\n",
+                                     wndSelection, pszWndName, rc);
 
                         /* Reset the counter in any case. */
@@ -2153 +2109 @@
         }
         else
-            logInfo("No guest source window\n");
+            VBClLogInfo("No guest source window\n");
     }
 
@@ -2182 +2138 @@
     if (RT_FAILURE(rc2))
     {
-        logError("Error reporting pending drag and drop operation status to host: %Rrc\n", rc2);
+        VBClLogError("Error reporting pending drag and drop operation status to host: %Rrc\n", rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -2294 +2250 @@
                                              &aPropType, &iPropFormat, &cItems, &cbRemaining, &pcData);
                 if (xRc != Success)
-                    logError("Error getting XA_XdndSelection property of proxy window=%#x: %s\n",
-                             m_wndProxy.hWnd, gX11->xErrorToString(xRc).c_str());
+                    VBClLogError("Error getting XA_XdndSelection property of proxy window=%#x: %s\n",
+                                 m_wndProxy.hWnd, gX11->xErrorToString(xRc).c_str());
 
                 LogFlowThisFunc(("strType=%s, iPropFormat=%d, cItems=%RU32, cbRemaining=%RU32\n",
@@ -2348 +2304 @@
                         AssertMsgFailed(("Incremental transfers are not supported yet\n"));
 
-                        logError("Incremental transfers are not supported yet\n");
+                        VBClLogError("Incremental transfers are not supported yet\n");
                         rc = VERR_NOT_IMPLEMENTED;
                     }
                     else
                     {
-                        logError("Not supported data type: %s\n", gX11->xAtomToString(aPropType).c_str());
+                        VBClLogError("Not supported data type: %s\n", gX11->xAtomToString(aPropType).c_str());
                         rc = VERR_NOT_SUPPORTED;
                     }
@@ -2362 +2318 @@
                 if (fCancel)
                 {
-                    logInfo("Cancelling dropping to host\n");
+                    VBClLogInfo("Cancelling dropping to host\n");
 
                     /* Cancel the operation -- inform the source window by
@@ -2504 +2460 @@
         int xRc = XTestFakeButtonEvent(m_pDisplay, 1, fPress ? True : False, CurrentTime);
         if (Rc == 0)
-            logError("Error sending XTestFakeButtonEvent event: %s\n", gX11->xErrorToString(xRc).c_str());
+            VBClLogError("Error sending XTestFakeButtonEvent event: %s\n", gX11->xErrorToString(xRc).c_str());
         XFlush(m_pDisplay);
     }
@@ -2550 +2506 @@
                              reinterpret_cast<XEvent*>(&eBtn));
         if (xRc == 0)
-            logError("Error sending XButtonEvent event to window=%#x: %s\n", wndDest, gX11->xErrorToString(xRc).c_str());
+            VBClLogError("Error sending XButtonEvent event to window=%#x: %s\n", wndDest, gX11->xErrorToString(xRc).c_str());
 
         XFlush(m_pDisplay);
@@ -3022 +2978 @@
     if (xRc == 0)
     {
-        LogRel(("DnD: Error sending XA_XdndFinished event to source window=%#x: %s\n",
-                hWndSource, gX11->xErrorToString(xRc).c_str()));
+        VBClLogError("Error sending XA_XdndFinished event to source window=%#x: %s\n",
+                      hWndSource, gX11->xErrorToString(xRc).c_str());
 
         return VERR_GENERAL_FAILURE; /** @todo Fudge. */
@@ -3048 +3004 @@
     if (!m_pDisplay)
     {
-        VBClFatalError(("DnD: Unable to connect to X server -- running in a terminal session?\n"));
+        VBClLogFatalError("Unable to connect to X server -- running in a terminal session?\n");
         return VERR_NOT_FOUND;
     }
@@ -3100 +3056 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("DnD: Failed to initialize, rc=%Rrc\n", rc));
+        VBClLogError("Failed to initialize, rc=%Rrc\n", rc);
 
     LogFlowFuncLeaveRC(rc);
@@ -3137 +3093 @@
         {
             if (RT_FAILURE(rc))
-                LogRel(("DnD: Unable to connect to drag and drop service, rc=%Rrc\n", rc));
+                VBClLogError("Unable to connect to drag and drop service, rc=%Rrc\n", rc);
             else if (rc == VINF_PERMISSION_DENIED)
-                LogRel(("DnD: Not available on host, terminating\n"));
+                VBClLogError("Not available on host, terminating\n");
             break;
         }
 
-        LogRel(("DnD: Started\n"));
-        LogRel2(("DnD: %sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr()));
+        VBClLogInfo("Started\n");
+        VBClLogInfo("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
 
         /* Enter the main event processing loop. */
@@ -3255 +3211 @@
                     default:
                     {
-                        m_pCurDnD->logError("Received unsupported message '%RU32'\n", pVbglR3Event->enmType);
+                       VBClLogError("Received unsupported message '%RU32'\n", pVbglR3Event->enmType);
                         rc = VERR_NOT_SUPPORTED;
                         break;
@@ -3265 +3221 @@
                 {
                     /* Tell the user. */
-                    m_pCurDnD->logError("Processing message %RU32 failed with %Rrc\n", pVbglR3Event->enmType, rc);
+                   VBClLogError("Processing message %RU32 failed with %Rrc\n", pVbglR3Event->enmType, rc);
 
                     /* If anything went wrong, do a reset and start over. */
@@ -3290 +3246 @@
         } while (!ASMAtomicReadBool(&m_fSrvStopping));
 
-        LogRel(("DnD: Stopped with rc=%Rrc\n", rc));
+        VBClLogInfo("Stopped with rc=%Rrc\n", rc);
 
     } while (0);
@@ -3308 +3264 @@
     LogFlowFuncEnter();
 
-    LogRel2(("DnD: Terminating threads ...\n"));
+    VBClLogInfo("Terminating threads ...\n");
 
     ASMAtomicXchgBool(&m_fSrvStopping, true);
@@ -3327 +3283 @@
 
         if (RT_FAILURE(rc2))
-            LogRel(("DnD: Error waiting for HGCM thread to terminate: %Rrc\n", rc2));
+            VBClLogInfo("Error waiting for HGCM thread to terminate: %Rrc\n", rc2);
     }
 
@@ -3341 +3297 @@
 
         if (RT_FAILURE(rc2))
-            LogRel(("DnD: Error waiting for X11 thread to terminate: %Rrc\n", rc2));
-    }
-
-    LogRel2(("DnD: Terminating threads done\n"));
+            VBClLogError("Error waiting for X11 thread to terminate: %Rrc\n", rc2);
+    }
+
+    VBClLogInfo("Terminating threads done\n");
 
     xHelpers::destroyInstance();
@@ -3408 +3364 @@
         else
         {
-            LogRel(("DnD: Processing next message failed with rc=%Rrc\n", rc));
+            VBClLogError("Processing next message failed with rc=%Rrc\n", rc);
 
             /* Old(er) hosts either are broken regarding DnD support or otherwise
@@ -3415 +3371 @@
             if (cMsgSkippedInvalid++ > 32)
             {
-                LogRel(("DnD: Too many invalid/skipped messages from host, exiting ...\n"));
+                VBClLogError("Too many invalid/skipped messages from host, exiting ...\n");
                 break;
             }
@@ -3533 +3489 @@
 
     if (pSelf->uMagic != DRAGANDDROPSERVICE_MAGIC)
-        VBClFatalError(("Bad DnD service object!\n"));
+        VBClLogFatalError("Bad DnD service object!\n");
     return pSelf->mDragAndDrop.init();
 }
@@ -3542 +3498 @@
 
     if (pSelf->uMagic != DRAGANDDROPSERVICE_MAGIC)
-        VBClFatalError(("Bad DnD service object!\n"));
+        VBClLogFatalError("Bad DnD service object!\n");
     return pSelf->mDragAndDrop.run(fDaemonised);
 }
@@ -3551 +3507 @@
 
     if (pSelf->uMagic != DRAGANDDROPSERVICE_MAGIC)
-        VBClFatalError(("Bad DnD service object!\n"));
+        VBClLogFatalError("Bad DnD service object!\n");
     return pSelf->mDragAndDrop.cleanup();
 }
@@ -3570 +3526 @@
 
     if (!pService)
-        VBClFatalError(("Out of memory\n"));
+        VBClLogFatalError("Out of memory\n");
     pService->pInterface = &vbclDragAndDropInterface;
     pService->uMagic = DRAGANDDROPSERVICE_MAGIC;

trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp

@@ -59 +59 @@
         if (msg == NULL)
         {
-            LogRel(("Could not create D-BUS message!\n"));
+            VBClLogError("Could not create D-BUS message!\n");
             rc = VERR_INVALID_HANDLE;
         }
@@ -103 +103 @@
         reply = dbus_connection_send_with_reply_and_block(conn, msg, 30 * 1000 /* 30 seconds timeout */, &err);
         if (dbus_error_is_set(&err))
-            LogRel(("D-BUS returned an error while sending the notification: %s", err.message));
+            VBClLogError("D-BUS returned an error while sending the notification: %s", err.message);
         else if (reply)
         {
@@ -139 +139 @@
     rc = RTDBusLoadLib();
     if (RT_FAILURE(rc))
-        LogRel(("VBoxClient: D-Bus seems not to be installed; no host version check/notification done.\n"));
+        VBClLogError("D-Bus seems not to be installed; no host version check/notification done\n");
 # else
     rc = VERR_NOT_IMPLEMENTED;
@@ -150 +150 @@
         rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
         if (RT_FAILURE(rc))
-            LogRel(("VBoxClient: Cannot connect to guest property service while chcking for host version! rc = %Rrc\n", rc));
+            VBClLogError("Cannot connect to guest property service while chcking for host version! rc = %Rrc\n", rc);
     }
 
@@ -179 +179 @@
 #endif
                 rc = showNotify(szTitle, szMsg);
-                LogRel(("VBoxClient: VirtualBox Guest Additions update available!"));
+                VBClLogInfo("VirtualBox Guest Additions update available!\n");
                 if (RT_FAILURE(rc))
-                    LogRel(("VBoxClient: Could not show version notifier tooltip! rc = %d\n", rc));
+                    VBClLogError("Could not show version notifier tooltip! rc = %d\n", rc);
             }
 
@@ -218 +218 @@
 
     if (!pService)
-        VBClFatalError(("Out of memory\n"));
+        VBClLogFatalError("Out of memory\n");
     pService->pInterface = &vbclHostVersionInterface;
     return &pService->pInterface;

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -70 +70 @@
  */
 RTCRITSECT g_critSect;
-/** Counter of how often our deamon has been respawned. */
-unsigned cRespawn = 0;
-
-
-
-/**
- * Exit with a fatal error.
- *
- * This is used by the VBClFatalError macro and thus needs to be external.
- */
-void vbclFatalError(char *pszMessage)
-{
-    char *pszCommand;
-    int status;
-    if (pszMessage && cRespawn == 0)
-    {
-        pszCommand = RTStrAPrintf2("notify-send \"VBoxClient: %s\"", pszMessage);
+/** Counter of how often our daemon has been respawned. */
+unsigned g_cRespawn = 0;
+/** Logging verbosity level. */
+unsigned g_cVerbosity = 0;
+
+/**
+ * Notifies the desktop environment with a message.
+ *
+ * @param   pszMessage          Message to notify desktop environment with.
+ */
+int vbclLogNotify(const char *pszMessage)
+{
+    AssertPtrReturn(pszMessage, VERR_INVALID_POINTER);
+
+    int rc = VINF_SUCCESS;
+
+    if (g_cRespawn == 0)
+    {
+        char *pszCommand = RTStrAPrintf2("notify-send \"VBoxClient: %s\"", pszMessage);
         if (pszCommand)
         {
-            status = system(pszCommand);
+            int status = system(pszCommand);
+
+            RTStrFree(pszCommand);
+
             if (WEXITSTATUS(status) != 0)  /* Utility or extension not available. */
             {
@@ -101 +106 @@
                         RTPrintf("VBoxClient: %s", pszMessage);
                     }
+
+                    RTStrFree(pszCommand);
                 }
+                else
+                    rc = VERR_NO_MEMORY;
             }
         }
-    }
-    _exit(RTEXITCODE_FAILURE);
+        else
+            rc = VERR_NO_MEMORY;
+    }
+
+    return rc;
+}
+
+/**
+ * Logs a fatal error, notifies the desktop environment via a message and
+ * exits the application immediately.
+ *
+ * @param   pszFormat           Format string to log.
+ * @param   ...                 Variable arguments for format string. Optional.
+ */
+void VBClLogFatalError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    LogFlowFunc(("%s", psz));
+    LogRel(("%s", psz));
+
+    vbclLogNotify(psz);
+
+    RTStrFree(psz);
+}
+
+/**
+ * Logs an error message to the (release) logging instance.
+ *
+ * @param   pszFormat               Format string to log.
+ */
+void VBClLogError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    LogFlowFunc(("%s", psz));
+    LogRel(("%s", psz));
+
+    RTStrFree(psz);
+}
+
+/**
+ * Logs an info message to the (release) logging instance.
+ *
+ * @param   pszFormat               Format string to log.
+ */
+void  VBClLogInfo(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    LogFlowFunc(("%s", psz));
+    LogRel2(("%s", psz));
+
+    RTStrFree(psz);
 }
 
@@ -120 +196 @@
     int rc = RTCritSectEnter(&g_critSect);
     if (RT_FAILURE(rc))
-        VBClFatalError(("VBoxClient: Failure while acquiring the global critical section, rc=%Rrc\n", rc));
+        VBClLogFatalError("Failure while acquiring the global critical section, rc=%Rrc\n", rc);
     if (g_pService)
         (*g_pService)->cleanup(g_pService);
@@ -134 +210 @@
 static void vboxClientSignalHandler(int cSignal)
 {
-    LogRel(("VBoxClient: terminated with signal %d\n", cSignal));
+    VBClLogInfo("Terminated with signal %d\n", cSignal);
     /** Disable seamless mode */
-    RTPrintf(("VBoxClient: terminating...\n"));
+    VBClLogInfo("Terminating ...\n");
     VBClCleanUp();
 }
@@ -148 +224 @@
 
     XGetErrorText(pDisplay, pError->error_code, errorText, sizeof(errorText));
-    LogRelFlow(("VBoxClient: an X Window protocol error occurred: %s (error code %d).  Request code: %d, minor code: %d, serial number: %d\n", errorText, pError->error_code, pError->request_code, pError->minor_code, pError->serial));
+    VBClLogError("An X Window protocol error occurred: %s (error code %d).  Request code: %d, minor code: %d, serial number: %d\n", errorText, pError->error_code, pError->request_code, pError->minor_code, pError->serial);
     return 0;
 }
@@ -159 +235 @@
 {
     RT_NOREF1(pDisplay);
-    LogRel(("VBoxClient: a fatal guest X Window error occurred.  This may just mean that the Window system was shut down while the client was still running.\n"));
+    VBClLogError("A fatal guest X Window error occurred.  This may just mean that the Window system was shut down while the client was still running\n");
     VBClCleanUp();
     return 0;  /* We should never reach this. */
@@ -172 +248 @@
     struct sigaction sigAction;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     sigAction.sa_handler = vboxClientSignalHandler;
     sigemptyset(&sigAction.sa_mask);
@@ -184 +260 @@
     sigaction(SIGUSR1, &sigAction, NULL);
     sigaction(SIGUSR2, &sigAction, NULL);
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -224 +300 @@
     RTPrintf("  -d, --nodaemon     continues running as a system service\n");
     RTPrintf("  -h, --help         shows this help text\n");
+    RTPrintf("  -v, --verbose      increases logging verbosity level\n");
     RTPrintf("  -V, --version      shows version information\n");
     RTPrintf("\n");
@@ -253 +330 @@
      * object should probably never be used from multiple threads anyway. */
     if (!XInitThreads())
-        VBClFatalError(("Failed to initialize X11 threads\n"));
+        VBClLogFatalError("Failed to initialize X11 threads\n");
 
     /* Get our file name for usage info and hints. */
@@ -336 +413 @@
             return RTEXITCODE_SUCCESS;
         }
+        else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--verbose"))
+        {
+            g_cVerbosity++;
+        }
         else
         {
@@ -352 +433 @@
     rc = VbglR3InitUser();
     if (RT_FAILURE(rc))
-        VBClFatalError(("VbglR3InitUser failed: %Rrc", rc));
+        VBClLogFatalError("VbglR3InitUser failed: %Rrc", rc);
 
     if (!fDaemonise)
@@ -368 +449 @@
     rc = RTCritSectInit(&g_critSect);
     if (RT_FAILURE(rc))
-        VBClFatalError(("Initialising critical section failed: %Rrc\n", rc));
+        VBClLogFatalError("Initialising critical section failed: %Rrc\n", rc);
     if ((*g_pService)->getPidFilePath)
     {
         rc = RTPathUserHome(g_szPidFile, sizeof(g_szPidFile));
         if (RT_FAILURE(rc))
-            VBClFatalError(("Getting home directory for PID file failed: %Rrc\n", rc));
+            VBClLogFatalError("Getting home directory for PID file failed: %Rrc\n", rc);
         rc = RTPathAppend(g_szPidFile, sizeof(g_szPidFile),
                           (*g_pService)->getPidFilePath());
         if (RT_FAILURE(rc))
-            VBClFatalError(("Creating PID file path failed: %Rrc\n", rc));
+            VBClLogFatalError("Creating PID file path failed: %Rrc\n", rc);
         if (fDaemonise)
-            rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */, fRespawn, &cRespawn);
+            rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */, fRespawn, &g_cRespawn);
         if (RT_FAILURE(rc))
-            VBClFatalError(("Daemonizing failed: %Rrc\n", rc));
+            VBClLogFatalError("Daemonizing failed: %Rrc\n", rc);
         if (g_szPidFile[0])
             rc = VbglR3PidFile(g_szPidFile, &g_hPidFile);
@@ -387 +468 @@
             return RTEXITCODE_SUCCESS;
         if (RT_FAILURE(rc))
-            VBClFatalError(("Creating PID file failed: %Rrc\n", rc));
+            VBClLogFatalError("Creating PID file failed: %Rrc\n", rc);
     }
     /* Set signal handlers to clean up on exit. */
@@ -404 +485 @@
         rc = (*g_pService)->run(g_pService, fDaemonise);
         if (RT_FAILURE(rc))
-            LogRel2(("Running service failed: %Rrc\n", rc));
+            VBClLogError("Running service failed: %Rrc\n", rc);
     }
     else
@@ -410 +491 @@
         /** @todo r=andy Should we return an appropriate exit code if the service failed to init?
          *               Must be tested carefully with our init scripts first. */
-        LogRel2(("Initializing service failed: %Rrc\n", rc));
+        VBClLogError("Initializing service failed: %Rrc\n", rc);
     }
     VBClCleanUp(false /*fExit*/);

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

@@ -46 +46 @@
                                     const char *aPropName, unsigned long *nItems)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     Atom propNameAtom = XInternAtom (aDpy, aPropName,
                                      True /* only_if_exists */);
@@ -65 +65 @@
         return NULL;
 
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
     return propVal;
 }
@@ -79 +79 @@
     int rc = VINF_SUCCESS;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (mHostCallback != NULL)  /* Assertion */
     {
-        LogRel(("VBoxClient: ERROR: attempt to initialise seamless guest object twice!\n"));
+        VBClLogError("Attempting to initialise seamless guest object twice!\n");
         return VERR_INTERNAL_ERROR;
     }
     if (!(mDisplay = XOpenDisplay(NULL)))
     {
-        LogRel(("VBoxClient: seamless guest object failed to acquire a connection to the display.\n"));
+        VBClLogError("Seamless guest object failed to acquire a connection to the display\n");
         return VERR_ACCESS_DENIED;
     }
@@ -93 +93 @@
     mEnabled = false;
     unmonitorClientList();
-    LogRelFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -111 +111 @@
     int error, event;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (mEnabled)
         return VINF_SUCCESS;
@@ -118 +118 @@
     monitorClientList();
     rebuildWindowTree();
-    LogRelFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -126 +126 @@
 void SeamlessX11::stop(void)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (!mEnabled)
         return;
@@ -132 +132 @@
     unmonitorClientList();
     freeWindowTree();
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
 void SeamlessX11::monitorClientList(void)
 {
-    LogRelFlowFunc(("called\n"));
+    LogRelFlowFuncEnter();
     XSelectInput(mDisplay, DefaultRootWindow(mDisplay), PropertyChangeMask | SubstructureNotifyMask);
 }
@@ -143 +143 @@
 void SeamlessX11::unmonitorClientList(void)
 {
-    LogRelFlowFunc(("called\n"));
+    LogRelFlowFuncEnter();
     XSelectInput(mDisplay, DefaultRootWindow(mDisplay), PropertyChangeMask);
 }
@@ -153 +153 @@
 void SeamlessX11::rebuildWindowTree(void)
 {
-    LogRelFlowFunc(("called\n"));
+    LogRelFlowFuncEnter();
     freeWindowTree();
     addClients(DefaultRootWindow(mDisplay));
@@ -177 +177 @@
     unsigned cChildren;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (!XQueryTree(mDisplay, hRoot, &hRealRoot, &hParent, &phChildrenRaw, &cChildren))
         return;
@@ -184 +184 @@
         addClientWindow(phChildren[i]);
     XFree(phChildrenRaw);
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -190 +190 @@
 void SeamlessX11::addClientWindow(const Window hWin)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     XWindowAttributes winAttrib;
     bool fAddWin = true;
@@ -199 +199 @@
     if (fAddWin && !XGetWindowAttributes(mDisplay, hWin, &winAttrib))
     {
-        LogRelFunc(("VBoxClient: Failed to get the window attributes for window %d\n", hWin));
+        VBClLogError("Failed to get the window attributes for window %d\n", hWin);
         fAddWin = false;
     }
@@ -211 +211 @@
                                        &dummyLong)))
     {
-        LogRelFlowFunc(("window %lu, client window %lu has no size hints\n",
-                     hWin, hClient));
+        LogRelFlowFunc(("window %lu, client window %lu has no size hints\n", hWin, hClient));
         fAddWin = false;
     }
@@ -244 +243 @@
                                 pRects);
     }
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -260 +259 @@
     bool rc = false;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     windowTypeRaw = XXGetProperty(mDisplay, hWin, XA_ATOM, WM_TYPE_PROP, &ulCount);
     if (windowTypeRaw != NULL)
@@ -290 +289 @@
 {
     /* We use post-increment in the operation to prevent the iterator from being invalidated. */
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     mGuestWindows.detachAll(VBoxGuestWinFree, mDisplay);
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -305 +304 @@
     XEvent event;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     /* Start by sending information about the current window setup to the host.  We do this
        here because we want to send all such information from a single thread. */
@@ -341 +340 @@
             || event.xproperty.window != DefaultRootWindow(mDisplay))
             break;
-        LogRelFlowFunc(("_NET_CLIENT_LIST property event on root window.\n"));
+        LogRelFlowFunc(("_NET_CLIENT_LIST property event on root window\n"));
         rebuildWindowTree();
         break;
@@ -392 +391 @@
 void SeamlessX11::doShapeEvent(Window hWin)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     VBoxGuestWinInfo *pInfo = mGuestWindows.find(hWin);
     if (pInfo)
@@ -410 +409 @@
         mChanged = true;
     }
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -477 +476 @@
 int SeamlessX11::updateRects(void)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     struct RectList rects = RTVEC_INITIALIZER;
 
@@ -492 +491 @@
     mcRects = RectListSize(&rects);
     mpRects = RectListDetach(&rects);
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
     return VINF_SUCCESS;
 }
@@ -506 +505 @@
     Display *pDisplay = XOpenDisplay(NULL);
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (pDisplay == NULL)
-        VBClFatalError(("Failed to open X11 display.\n"));
+        VBClLogFatalError("Failed to open X11 display\n");
     /* Message contents set to zero. */
     XClientMessageEvent clientMessage = { ClientMessage, 0, 0, 0, 0, 0, 8 };

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h

@@ -155 +155 @@
                                                        pRects);
         pInfo->Core.Key = hWin;
-        LogRelFlowFunc(("returning\n"));
+        LogRelFlowFuncLeave();
         return RTAvlU32Insert(&mWindows, &pInfo->Core);
     }
@@ -161 +161 @@
     VBoxGuestWinInfo *removeWindow(Window hWin)
     {
-        LogRelFlowFunc(("called\n"));
+        LogRelFlowFuncEnter();
         return (VBoxGuestWinInfo *)RTAvlU32Remove(&mWindows, hWin);
     }

trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp

@@ -36 +36 @@
 SeamlessMain::SeamlessMain(void)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     mX11MonitorThread = NIL_RTTHREAD;
     mX11MonitorThreadStopping = false;
@@ -45 +45 @@
 SeamlessMain::~SeamlessMain()
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     stop();
 }
@@ -54 +54 @@
 static void sendRegionUpdate(RTRECT *pRects, size_t cRects)
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     if (cRects && !pRects)  /* Assertion */
     {
-        LogRelFunc(("ERROR: called with null pointer!\n"));
+        VBClLogError(("Region update called with NULL pointer!\n"));
         return;
     }
     VbglR3SeamlessSendRects(cRects, pRects);
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -72 +72 @@
     const char *pcszStage;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     do {
         pcszStage = "Connecting to the X server";
@@ -91 +91 @@
     } while(0);
     if (RT_FAILURE(rc))
-        VBClFatalError(("VBoxClient (seamless): failed to start.  Stage: \"%s\"  Error: %Rrc\n",
-                pcszStage, rc));
+        VBClLogError("Failed to start in stage '%s' -- error: %Rrc\n", pcszStage, rc);
     return rc;
 }
@@ -106 +105 @@
     int rc = VINF_SUCCESS;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     /* This will only exit if something goes wrong. */
     while (RT_SUCCESS(rc) || rc == VERR_INTERRUPTED)
@@ -118 +117 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("VBoxClient (seamless): event loop failed with error: %Rrc\n",
-                rc));
+        VBClLogError("Event loop failed with error: %Rrc\n", rc);
         stop();
     }
@@ -128 +126 @@
 void SeamlessMain::stop()
 {
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     VbglR3SeamlessSetCap(false);
     VbglR3CtlFilterMask(0, VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST);
     stopX11MonitorThread();
     mX11Monitor.uninit();
-    LogRelFlowFunc(("returning\n"));
+    LogRelFlowFuncLeave();
 }
 
@@ -145 +143 @@
     VMMDevSeamlessMode newMode = VMMDev_Seamless_Disabled;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     int rc = VbglR3SeamlessWaitEvent(&newMode);
     if (RT_SUCCESS(rc))
@@ -155 +153 @@
             /* A simplified seamless mode, obtained by making the host VM window
              * borderless and making the guest desktop transparent. */
-                LogRelFlowFunc(("\"Visible region\" mode requested (VBoxClient).\n"));
+                LogRelFlowFunc(("\"Visible region\" mode requested (VBoxClient)\n"));
                 break;
             case VMMDev_Seamless_Disabled:
-                LogRelFlowFunc(("\"Disabled\" mode requested (VBoxClient).\n"));
+                LogRelFlowFunc(("\"Disabled\" mode requested (VBoxClient)\n"));
                 break;
             case VMMDev_Seamless_Host_Window:
             /* One host window represents one guest window.  Not yet implemented. */
-                LogRelFunc(("Unsupported \"host window\" mode requested (VBoxClient).\n"));
+                LogRelFunc(("Unsupported \"host window\" mode requested (VBoxClient)\n"));
                 return VERR_NOT_SUPPORTED;
             default:
-                LogRelFunc(("Unsupported mode %d requested (VBoxClient).\n",
+                LogRelFunc(("Unsupported mode %d requested (VBoxClient)\n",
                             newMode));
                 return VERR_NOT_SUPPORTED;
@@ -182 +180 @@
         LogRelFunc(("VbglR3SeamlessWaitEvent returned %Rrc (VBoxClient)\n", rc));
     }
-    LogRelFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -195 +193 @@
     int rc = VINF_SUCCESS;
 
-    LogRelFlowFunc(("\n"));
+    LogRelFlowFuncEnter();
     while (!pHost->mX11MonitorThreadStopping)
     {
@@ -202 +200 @@
             rc = pHost->mX11Monitor.start();
             if (RT_FAILURE(rc))
-                VBClFatalError(("Failed to change the X11 seamless service state, mfPaused=%RTbool, rc=%Rrc\n",
-                                pHost->mfPaused, rc));
+                VBClLogFatalError("Failed to change the X11 seamless service state, mfPaused=%RTbool, rc=%Rrc\n",
+                                  pHost->mfPaused, rc);
         }
         pHost->mX11Monitor.nextConfigurationEvent();
@@ -209 +207 @@
             pHost->mX11Monitor.stop();
     }
-    LogRelFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -227 +225 @@
                         "X11 events");
     if (RT_FAILURE(rc))
-        LogRelFunc(("Warning: failed to start X11 monitor thread (VBoxClient).\n"));
+        LogRelFunc(("Warning: failed to start X11 monitor thread (VBoxClient)\n"));
     return rc;
 }
@@ -279 +277 @@
     struct SEAMLESSSERVICE *pSelf = (struct SEAMLESSSERVICE *)ppInterface;
     if (pSelf->magic != SEAMLESSSERVICE_MAGIC)
-        VBClFatalError(("Bad seamless service object!\n"));
+        VBClLogFatalError("Bad seamless service object!\n");
     return pSelf;
 }
@@ -332 +330 @@
 
     if (!pService)
-        VBClFatalError(("Out of memory\n"));
+        VBClLogFatalError("Out of memory\n");
     pService->pInterface = &vbclSeamlessInterface;
     pService->magic = SEAMLESSSERVICE_MAGIC;

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -46 +46 @@
 #define TEST_ROOT ((Window)1)
 
-extern void vbclFatalError(char *psz)
-{
-    RTPrintf("Fatal error: %s\n", psz);
+void VBClLogError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    RTPrintf("Error: %s", psz);
+
+    RTStrFree(psz);
+}
+
+/** Exit with a fatal error. */
+void VBClLogFatalError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    RTPrintf("Fatal error: %s", psz);
+
+    RTStrFree(psz);
+
     exit(1);
 }

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp

@@ -21 +21 @@
 #include <iprt/initterm.h>
 #include <iprt/semaphore.h>
+#include <iprt/string.h>
 #include <iprt/stream.h>
 #include <VBox/VBoxGuestLib.h>
@@ -28 +29 @@
 static RTSEMEVENT eventSem;
 
+void VBClLogError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    RTPrintf("Error: %s", psz);
+
+    RTStrFree(psz);
+}
+
 /** Exit with a fatal error. */
-void vbclFatalError(char *pszMessage)
+void VBClLogFatalError(const char *pszFormat, ...)
 {
-    RTPrintf("Fatal error: %s", pszMessage);
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    RTPrintf("Fatal error: %s", psz);
+
+    RTStrFree(psz);
+
     exit(1);
 }