Changeset 78440 in vbox for trunk/src/VBox

Timestamp:

May 7, 2019 5:44:31 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/Makefile.kmk (modified) (1 diff)
• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (15 diffs)
• GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (added)
• GuestHost/SharedClipboard/ClipboardEnumFormatEtcImpl-win.cpp (added)
• GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp (added)
• GuestHost/SharedClipboard/clipboard-win.cpp (modified) (3 diffs)
• HostServices/SharedClipboard/Makefile.kmk (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (49 diffs)

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

@@ -52 +52 @@
         VBoxClipboard.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp
+ ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+ VBoxTray_SOURCES  += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIList.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIObject.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardEnumFormatEtcImpl-win.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp
+ endif
 endif
 ifdef VBOX_WITH_DRAG_AND_DROP

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

@@ -174 +174 @@
         {
            /* Insert the requested clipboard format data into the clipboard. */
-           uint32_t u32Format = 0;
-           UINT format = (UINT)wParam;
-
-           LogFlowFunc(("WM_RENDERFORMAT, format = %x\n", format));
-           switch (format)
+           uint32_t fFormat = VBOX_SHARED_CLIPBOARD_FMT_NONE;
+
+           const UINT cfFormat = (UINT)wParam;
+           switch (cfFormat)
            {
               case CF_UNICODETEXT:
-                  u32Format |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+                  fFormat = VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
                   break;
 
               case CF_DIB:
-                  u32Format |= VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
+                  fFormat = VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
                   break;
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+              case CF_HDROP:
+                  fFormat = VBOX_SHARED_CLIPBOARD_FMT_URI_LIST;
+                  break;
+#endif
               default:
-                  if (format >= 0xC000)
+                  if (cfFormat >= 0xC000) /** @todo r=andy Explain. */
                   {
-                      TCHAR szFormatName[256];
-
-                      int cActual = GetClipboardFormatName(format, szFormatName, sizeof(szFormatName) / sizeof(TCHAR));
+                      TCHAR szFormatName[256]; /** @todo r=andy Do we need Unicode support here as well? */
+
+                      int cActual = GetClipboardFormatName(cfFormat, szFormatName, sizeof(szFormatName) / sizeof(TCHAR));
                       if (cActual)
                       {
                           if (strcmp(szFormatName, "HTML Format") == 0)
-                          {
-                              u32Format |= VBOX_SHARED_CLIPBOARD_FMT_HTML;
-                          }
+                              fFormat = VBOX_SHARED_CLIPBOARD_FMT_HTML;
                       }
                   }
@@ -205 +207 @@
            }
 
-           if (u32Format == 0)
+           LogFunc(("WM_RENDERFORMAT: format=%u -> fFormat=0x%x\n", cfFormat, fFormat));
+
+           if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_NONE)
            {
                /* Unsupported clipboard format is requested. */
-               LogFlowFunc(("Unsupported clipboard format requested: %ld\n", u32Format));
+               LogRel(("Clipboard: Unsupported clipboard format requested (0x%x)\n", fFormat));
                VBoxClipboardWinClear();
            }
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+           else if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
+           {
+
+           }
+#endif
            else
            {
-               const uint32_t cbPrealloc = 4096; /** @todo r=andy Make it dynamic for supporting larger text buffers! */
+               const uint32_t cbPrealloc = _4K;
                uint32_t cb = 0;
 
@@ -228 +238 @@
                    {
                        /* Read the host data to the preallocated buffer. */
-                       int vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, u32Format, pMem, cbPrealloc, &cb);
+                       int vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cbPrealloc, &cb);
                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc\n",  vboxrc));
 
@@ -259 +269 @@
                                        /* Read the host data to the preallocated buffer. */
                                        uint32_t cbNew = 0;
-                                       vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, u32Format, pMem, cb, &cbNew);
+                                       vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cb, &cbNew);
                                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
 
@@ -287 +297 @@
                                 * must have the exact string size.
                                 */
-                               if (u32Format == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+                               if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
                                {
                                    size_t cbActual = 0;
@@ -319 +329 @@
                                    /* 'hMem' contains the host clipboard data.
                                     * size is 'cb' and format is 'format'. */
-                                   HANDLE hClip = SetClipboardData(format, hMem);
+                                   HANDLE hClip = SetClipboardData(cfFormat, hMem);
                                    LogFlowFunc(("WM_RENDERFORMAT hClip = %p\n", hClip));
 
@@ -362 +372 @@
         {
            /* Announce available formats. Do not insert data, they will be inserted in WM_RENDER*. */
-           uint32_t u32Formats = (uint32_t)lParam;
-
-           LogFlowFunc(("VBOX_WM_SHCLPB_SET_FORMATS: u32Formats=0x%x\n", u32Formats));
+           VBOXCLIPBOARDFORMATS fFormats = (uint32_t)lParam;
+
+           LogFlowFunc(("VBOX_WM_SHCLPB_SET_FORMATS: fFormats=0x%x\n", fFormats));
 
            int vboxrc = VBoxClipboardWinOpen(hwnd);
@@ -373 +383 @@
                HANDLE hClip = NULL;
 
-               if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+               if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
                    hClip = SetClipboardData(CF_UNICODETEXT, NULL);
 
-               if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+               if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
                    hClip = SetClipboardData(CF_DIB, NULL);
 
-               if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_HTML)
+               if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_HTML)
                {
                    UINT format = RegisterClipboardFormat("HTML Format");
@@ -387 +397 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-               if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
+               if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
                    hClip = SetClipboardData(CF_HDROP, NULL);
 #endif
+
+               /** @todo Implement more flexible clipboard precedence for supported formats. */
+
+               if (hClip == NULL)
+                   LogRel(("Clipboard: Unsupported format(s) from host (0x%x), ignoring\n", fFormats));
+
                VBoxClipboardWinClose();
 
@@ -479 +495 @@
                        if (hDrop)
                        {
-                           vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_URI_LIST,
-                                                             );
+       /*                    vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_URI_LIST,
+                                                             );*/
                            GlobalUnlock(hClip);
                        }
@@ -681 +697 @@
                 break;
 
-            LogFlowFunc(("Error getting host message, rc=%Rrc\n", rc));
+            LogFunc(("Error getting host message, rc=%Rrc\n", rc));
 
             if (*pfShutdown)
@@ -701 +717 @@
                     * respond to WM_RENDERFORMAT message. */
                    ::PostMessage(pWinCtx->hWnd, VBOX_CLIPBOARD_WM_SET_FORMATS, 0, u32Formats);
-               }
                    break;
+               }
 
                case VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA:
@@ -708 +724 @@
                    /* The host needs data in the specified format. */
                    ::PostMessage(pWinCtx->hWnd, VBOX_CLIPBOARD_WM_READ_DATA, 0, u32Formats);
-               }
                    break;
+               }
 
                case VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT:
@@ -716 +732 @@
                    LogRel(("Clipboard: Terminating ...\n"));
                    ASMAtomicXchgBool(pfShutdown, true);
-               }
                    break;
+               }
 
                default:
@@ -725 +741 @@
                    /* Wait a bit before retrying. */
                    RTThreadSleep(1000);
-               }
                    break;
+               }
             }
         }

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp

@@ -22 +22 @@
 #include <iprt/thread.h>
 
+#define LOG_GROUP LOG_GROUP_SHARED_CLIPBOARD
 #include <VBox/log.h>
+
 #include <VBox/GuestHost/SharedClipboard.h>
 #include <VBox/GuestHost/SharedClipboard-win.h>
@@ -275 +277 @@
     AssertPtrReturn(puFormats, VERR_INVALID_POINTER);
 
-    if (!pCtx)
-    {
-        *puFormats = 0;
-        return VINF_SUCCESS;
-    }
-
-    uint32_t uFormats = 0;
+    uint32_t uFormats = VBOX_SHARED_CLIPBOARD_FMT_NONE;
 
     /* Query list of available formats and report to host. */
@@ -336 +332 @@
     }
     else
+    {
+        LogFlowFunc(("uFormats = 0x%08X\n", uFormats));
         *puFormats = uFormats;
-
-    return rc;
-}
-
+    }
+
+    return rc;
+}
+

trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

@@ -43 +43 @@
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
         darwin-pasteboard.cpp
+ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+ VBoxSharedClipboard_SOURCES += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIList.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIObject.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
+endif
 if1of ($(KBUILD_TARGET), linux solaris freebsd) ## @todo X11
  ifndef VBOX_HEADLESS

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -25 +25 @@
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 #include <VBox/GuestHost/SharedClipboard-win.h>
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+# include <VBox/GuestHost/SharedClipboard-uri.h>
+#endif
 
 #include <iprt/alloc.h>
@@ -30 +33 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <iprt/ldr.h>
+#include <iprt/semaphore.h>
 #include <iprt/thread.h>
-#include <iprt/ldr.h>
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
 # include <iprt/utf16.h>
@@ -58 +62 @@
     RTTHREAD                 hThread;
     /** Event which gets triggered if the host clipboard needs to render its data. */
-    HANDLE                   hRenderEvent;
+    RTSEMEVENT               hRenderEvent;
     /** Structure for keeping and communicating with client data (from the guest). */
     PVBOXCLIPBOARDCLIENTDATA pClient;
@@ -115 +119 @@
                                  void *pvDst, uint32_t cbDst, uint32_t *pcbActualDst)
 {
-    LogFlow(("vboxClipboardGetData cbSrc = %d, cbDst = %d\n", cbSrc, cbDst));
+    LogFlowFunc(("cbSrc = %d, cbDst = %d\n", cbSrc, cbDst));
 
     if (   u32Format == VBOX_SHARED_CLIPBOARD_FMT_HTML
@@ -139 +143 @@
             *pcbActualDst = 0;
     }
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-    if (u32Format == VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
-    {
-        /* Convert data to URI list. */
-    }
-#endif
     else
     {
@@ -163 +161 @@
 }
 
-static int vboxClipboardReadDataFromClient(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Format)
+static int vboxClipboardReadDataFromClient(VBOXCLIPBOARDCONTEXT *pCtx, VBOXCLIPBOARDFORMAT fFormat)
 {
     Assert(pCtx->pClient);
@@ -169 +167 @@
     Assert(pCtx->pClient->data.pv == NULL && pCtx->pClient->data.cb == 0 && pCtx->pClient->data.u32Format == 0);
 
-    LogFlow(("vboxClipboardReadDataFromClient u32Format = %02X\n", u32Format));
-
-    ResetEvent(pCtx->hRenderEvent);
-
-    vboxSvcClipboardReportMsg(pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA, u32Format);
-
-    DWORD ret = WaitForSingleObject(pCtx->hRenderEvent, INFINITE);
-    LogFlow(("vboxClipboardReadDataFromClient wait completed, ret 0x%08X, err %d\n",
-             ret, GetLastError())); NOREF(ret);
-
-    return VINF_SUCCESS;
+    LogFlowFunc(("fFormat=%02X\n", fFormat));
+
+    vboxSvcClipboardReportMsg(pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA, fFormat);
+
+    return RTSemEventWait(pCtx->hRenderEvent, 30 * 1000 /* Timeout in ms */);
 }
 
@@ -193 +185 @@
         case WM_CLIPBOARDUPDATE:
         {
-            Log(("WM_CLIPBOARDUPDATE\n"));
+            LogFunc(("WM_CLIPBOARDUPDATE\n"));
 
             if (GetClipboardOwner() != hwnd)
@@ -205 +197 @@
         case WM_CHANGECBCHAIN:
         {
-            Log(("WM_CHANGECBCHAIN\n"));
+            LogFunc(("WM_CHANGECBCHAIN\n"));
 
             if (VBoxClipboardWinIsNewAPI(&pWinCtx->newAPI))
@@ -240 +232 @@
         case WM_DRAWCLIPBOARD:
         {
-            Log(("WM_DRAWCLIPBOARD\n"));
+            LogFunc(("WM_DRAWCLIPBOARD\n"));
 
             if (GetClipboardOwner() != hwnd)
@@ -251 +243 @@
             if (pWinCtx->hWndNextInChain)
             {
-                Log(("WM_DRAWCLIPBOARD next %p\n", pWinCtx->hWndNextInChain));
+                LogFunc(("WM_DRAWCLIPBOARD next %p\n", pWinCtx->hWndNextInChain));
                 /* Pass the message to next windows in the clipboard chain. */
                 DWORD_PTR dwResult;
@@ -290 +282 @@
         {
             /* Insert the requested clipboard format data into the clipboard. */
-            uint32_t u32Format = 0;
+            VBOXCLIPBOARDFORMAT fFormat = VBOX_SHARED_CLIPBOARD_FMT_NONE;
 
             UINT format = (UINT)wParam;
 
-            Log(("WM_RENDERFORMAT: Format %u\n", format));
+            LogFunc(("WM_RENDERFORMAT: Format %u\n", format));
 
             switch (format)
             {
                 case CF_UNICODETEXT:
-                    u32Format |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+                    fFormat |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
                     break;
 
                 case CF_DIB:
-                    u32Format |= VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
+                    fFormat |= VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
                     break;
 
@@ -314 +306 @@
                         {
                             if (RTStrCmp(szFormatName, "HTML Format") == 0)
-                                u32Format |= VBOX_SHARED_CLIPBOARD_FMT_HTML;
+                                fFormat |= VBOX_SHARED_CLIPBOARD_FMT_HTML;
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
                             if (   RTStrCmp(szFormatName, CFSTR_FILEDESCRIPTOR) == 0
                                 || RTStrCmp(szFormatName, CFSTR_FILECONTENTS) == 0)
-                                u32Format |= VBOX_SHARED_CLIPBOARD_FMT_URI_LIST;
+                                fFormat |= VBOX_SHARED_CLIPBOARD_FMT_URI_LIST;
 #endif
                         }
@@ -325 +317 @@
             }
 
-            if (u32Format == 0 || pCtx->pClient == NULL)
+            if (   fFormat       == VBOX_SHARED_CLIPBOARD_FMT_NONE
+                || pCtx->pClient == NULL)
             {
                 /* Unsupported clipboard format is requested. */
-                Log(("WM_RENDERFORMAT unsupported format requested or client is not active.\n"));
-                EmptyClipboard ();
+                LogFunc(("WM_RENDERFORMAT unsupported format requested or client is not active\n"));
+                EmptyClipboard();
             }
             else
             {
-                int vboxrc = vboxClipboardReadDataFromClient(pCtx, u32Format);
+                int vboxrc = vboxClipboardReadDataFromClient(pCtx, fFormat);
 
                 LogFunc(("vboxClipboardReadDataFromClient vboxrc = %d, pv %p, cb %d, u32Format %d\n",
@@ -341 +334 @@
                     && pCtx->pClient->data.pv != NULL
                     && pCtx->pClient->data.cb > 0
-                    && pCtx->pClient->data.u32Format == u32Format)
+                    && pCtx->pClient->data.u32Format == fFormat)
                 {
                     HANDLE hMem = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, pCtx->pClient->data.cb);
@@ -355 +348 @@
                         if (pMem)
                         {
-                            Log(("WM_RENDERFORMAT setting data\n"));
+                            LogFunc(("WM_RENDERFORMAT setting data\n"));
 
                             if (pCtx->pClient->data.pv)
@@ -401 +394 @@
         case WM_RENDERALLFORMATS:
         {
-            Log(("WM_RENDERALLFORMATS\n"));
+            LogFunc(("WM_RENDERALLFORMATS\n"));
 
             /* Do nothing. The clipboard formats will be unavailable now, because the
@@ -414 +407 @@
             else
             {
-                LogFlow(("vboxClipboardWndProc: WM_RENDERALLFORMATS: error in open clipboard. hwnd: %x, rc: %Rrc\n", hwnd, vboxrc));
+                LogFlowFunc(("WM_RENDERALLFORMATS: error in open clipboard. hwnd: %x, rc: %Rrc\n", hwnd, vboxrc));
             }
         } break;
@@ -425 +418 @@
                  * because host clipboard has more priority.
                  */
-                Log(("VBOX_CLIPBOARD_WM_SET_FORMATS ignored\n"));
+                LogFunc(("VBOX_CLIPBOARD_WM_SET_FORMATS ignored\n"));
                 break;
             }
@@ -432 +425 @@
             uint32_t u32Formats = (uint32_t)lParam;
 
-            Log(("VBOX_CLIPBOARD_WM_SET_FORMATS: u32Formats=%02X\n", u32Formats));
+            LogFunc(("VBOX_CLIPBOARD_WM_SET_FORMATS: u32Formats=%02X\n", u32Formats));
 
             int vboxrc = VBoxClipboardWinOpen(hwnd);
@@ -439 +432 @@
                 VBoxClipboardWinClear();
 
-                Log(("VBOX_CLIPBOARD_WM_SET_FORMATS emptied clipboard\n"));
+                LogFunc(("VBOX_CLIPBOARD_WM_SET_FORMATS emptied clipboard\n"));
 
                 HANDLE hClip = NULL;
@@ -486 +479 @@
         default:
         {
-            Log(("WM_ %p\n", msg));
+            LogFunc(("WM_ %p\n", msg));
             rc = DefWindowProc(hwnd, msg, wParam, lParam);
         }
     }
 
-    Log(("WM_ rc %d\n", rc));
+    LogFunc(("WM_ rc %d\n", rc));
     return rc;
 }
@@ -497 +490 @@
 DECLCALLBACK(int) VBoxClipboardThread(RTTHREAD hThreadSelf, void *pvUser)
 {
-    RT_NOREF2(hThreadSelf, pvUser);
+    RT_NOREF(hThreadSelf, pvUser);
+
     /* Create a window and make it a clipboard viewer. */
     int rc = VINF_SUCCESS;
 
-    LogFlow(("VBoxClipboardThread\n"));
+    LogFlowFuncEnter();
 
     const PVBOXCLIPBOARDCONTEXT pCtx    = &g_ctx;
@@ -522 +516 @@
     if (atomWindowClass == 0)
     {
-        Log(("Failed to register window class\n"));
+        LogFunc(("Failed to register window class\n"));
         rc = VERR_NOT_SUPPORTED;
     }
@@ -534 +528 @@
         if (pWinCtx->hWnd == NULL)
         {
-            Log(("Failed to create window\n"));
+            LogFunc(("Failed to create window\n"));
             rc = VERR_NOT_SUPPORTED;
         }
@@ -559 +553 @@
             */
             Assert(msgret >= 0);
-            Log(("VBoxClipboardThread Message loop finished. GetMessage returned %d, message id: %d \n", msgret, msg.message));
+            LogFunc(("Message loop finished. GetMessage returned %d, message id: %d \n", msgret, msg.message));
         }
     }
@@ -578 +572 @@
  * formats to the guest.
  *
- * @returns VBox status code.
+ * @returns VBox status code, VINF_NO_CHANGE if no synchronization was required.
  * @param   pCtx                Clipboard context to synchronize.
  */
@@ -585 +579 @@
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
 
-    if (pCtx->pClient == NULL) /* If we don't have any client data (yet), bail out. */
-        return VINF_SUCCESS;
-
-    uint32_t uFormats;
-    int rc = VBoxClipboardWinGetFormats(&pCtx->Win, &uFormats);
-    if (RT_SUCCESS(rc))
-        vboxSvcClipboardReportMsg(pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS, uFormats);
-
+    int rc;
+
+    if (pCtx->pClient)
+    {
+        uint32_t uFormats;
+        rc = VBoxClipboardWinGetFormats(&pCtx->Win, &uFormats);
+        if (RT_SUCCESS(rc))
+            vboxSvcClipboardReportMsg(pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS, uFormats);
+    }
+    else /* If we don't have any client data (yet), bail out. */
+        rc = VINF_NO_CHANGE;
+
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -601 +600 @@
 int vboxClipboardInit(void)
 {
-    int rc = VINF_SUCCESS;
-
-    RT_ZERO(g_ctx);
+    RT_ZERO(g_ctx); /* Be careful not messing up non-POD types! */
 
     /* Check that new Clipboard API is available. */
     VBoxClipboardWinCheckAndInitNewAPI(&g_ctx.Win.newAPI);
 
-    g_ctx.hRenderEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-
-    rc = RTThreadCreate(&g_ctx.hThread, VBoxClipboardThread, NULL, _64K /* Stack size */,
-                        RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SHCLIP");
+    int rc = RTSemEventCreate(&g_ctx.hRenderEvent);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTThreadCreate(&g_ctx.hThread, VBoxClipboardThread, NULL, _64K /* Stack size */,
+                            RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SHCLIP");
+    }
 
     if (RT_FAILURE(rc))
-    {
-        CloseHandle(g_ctx.hRenderEvent);
-    }
+        RTSemEventDestroy(g_ctx.hRenderEvent);
 
     return rc;
@@ -623 +620 @@
 void vboxClipboardDestroy(void)
 {
-    Log(("vboxClipboardDestroy\n"));
+    LogFlowFuncEnter();
 
     if (g_ctx.Win.hWnd)
@@ -630 +627 @@
     }
 
-    CloseHandle(g_ctx.hRenderEvent);
+    int rc = RTSemEventDestroy(g_ctx.hRenderEvent);
+    AssertRC(rc);
 
     /* Wait for the window thread to terminate. */
-    RTThreadWait(g_ctx.hThread, RT_INDEFINITE_WAIT, NULL);
+    rc = RTThreadWait(g_ctx.hThread, 30 * 1000 /* Timeout in ms */, NULL);
+    if (RT_FAILURE(rc))
+        LogRel(("Shared Clipboard: Waiting for window thread termination failed with rc=%Rrc\n", rc));
 
     g_ctx.hThread = NIL_RTTHREAD;
@@ -640 +640 @@
 int vboxClipboardConnect(VBOXCLIPBOARDCLIENTDATA *pClient, bool fHeadless)
 {
-    NOREF(fHeadless);
-    Log(("vboxClipboardConnect\n"));
+    RT_NOREF(fHeadless);
+
+    LogFlowFuncEnter();
 
     if (g_ctx.pClient != NULL)
@@ -667 +668 @@
 void vboxClipboardDisconnect(VBOXCLIPBOARDCLIENTDATA *pClient)
 {
-    RT_NOREF1(pClient);
-    Log(("vboxClipboardDisconnect\n"));
+    RT_NOREF(pClient);
+
+    LogFlowFuncEnter();
 
     g_ctx.pClient = NULL;
@@ -684 +686 @@
 }
 
-int DumpHtml(const char *pszSrc, size_t cb)
+#ifdef VBOX_STRICT
+static int vboxClipboardDbgDumpHtml(const char *pszSrc, size_t cb)
 {
     size_t cchIgnored = 0;
@@ -701 +704 @@
             }
             else
-                Log(("Error in copying string.\n"));
-            Log(("Removed \\r\\n: %s\n", pszBuf));
+                LogFunc(("Error in copying string\n"));
+            LogFunc(("Removed \\r\\n: %s\n", pszBuf));
             RTMemFree(pszBuf);
         }
@@ -708 +711 @@
         {
             rc = VERR_NO_MEMORY;
-            Log(("Not enough memory to allocate buffer.\n"));
+            LogFunc(("Not enough memory to allocate buffer\n"));
         }
     }
     return rc;
 }
+#endif
 
 int vboxClipboardReadData(VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, void *pv, uint32_t cb, uint32_t *pcbActual)
@@ -719 +723 @@
     AssertPtrReturn(pClient->pCtx, VERR_INVALID_POINTER);
 
-    LogFlow(("vboxClipboardReadData: u32Format = %02X\n", u32Format));
+    LogFlowFunc(("u32Format=%02X\n", u32Format));
 
     HANDLE hClip = NULL;
@@ -731 +735 @@
     if (RT_SUCCESS(rc))
     {
-        LogFunc(("Clipboard opened.\n"));
+        LogFunc(("Clipboard opened\n"));
 
         if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
         {
             hClip = GetClipboardData(CF_DIB);
-
             if (hClip != NULL)
             {
@@ -759 +762 @@
         {
             hClip = GetClipboardData(CF_UNICODETEXT);
-
             if (hClip != NULL)
             {
@@ -782 +784 @@
         {
             UINT format = RegisterClipboardFormat("HTML Format");
-
             if (format != 0)
             {
                 hClip = GetClipboardData(format);
-
                 if (hClip != NULL)
                 {
                     LPVOID lp = GlobalLock(hClip);
-
                     if (lp != NULL)
                     {
@@ -797 +796 @@
                         vboxClipboardGetData(VBOX_SHARED_CLIPBOARD_FMT_HTML, lp, GlobalSize(hClip),
                                              pv, cb, pcbActual);
-                        LogRelFlowFunc(("Raw HTML clipboard data from host :"));
-                        DumpHtml((char *)pv, cb);
+#ifdef VBOX_STRICT
+                        LogFlowFunc(("Raw HTML clipboard data from host:"));
+                        vboxClipboardDbgDumpHtml((char *)pv, cb);
+#endif
                         GlobalUnlock(hClip);
                     }
@@ -811 +812 @@
         else if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
         {
-    #if 0
-            UINT format = RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR);
-            if (format)
-            {
-                hClip = GetClipboardData(format);
-                if (hClip != NULL)
+            hClip = GetClipboardData(CF_HDROP);
+            if (hClip != NULL)
+            {
+                LPVOID lp = GlobalLock(hClip);
+                if (lp)
                 {
-                    LPVOID lp = GlobalLock(hClip);
-
-                    if (lp != NULL)
+                    /* Convert to a string list, separated by \r\n. */
+                    DROPFILES *pDropFiles = (DROPFILES *)hClip;
+                    AssertPtr(pDropFiles);
+
+                    /* Do we need to do Unicode stuff? */
+                    const bool fUnicode = RT_BOOL(pDropFiles->fWide);
+
+                    /* Get the offset of the file list. */
+                    Assert(pDropFiles->pFiles >= sizeof(DROPFILES));
+
+                    /* Note: This is *not* pDropFiles->pFiles! DragQueryFile only
+                     *       will work with the plain storage medium pointer! */
+                    HDROP hDrop = (HDROP)(hClip);
+
+                    /* First, get the file count. */
+                    /** @todo Does this work on Windows 2000 / NT4? */
+                    char *pszFiles = NULL;
+                    uint32_t cchFiles = 0;
+                    UINT cFiles = DragQueryFile(hDrop, UINT32_MAX /* iFile */, NULL /* lpszFile */, 0 /* cchFile */);
+
+                    LogRel(("Shared Clipboard: Got %RU16 file(s), fUnicode=%RTbool\n", cFiles, fUnicode));
+
+                    for (UINT i = 0; i < cFiles; i++)
                     {
-                        LogFunc(("CF_HTML\n"));
-
-                        vboxClipboardGetData(VBOX_SHARED_CLIPBOARD_FMT_HTML, lp, GlobalSize(hClip),
-                                             pv, cb, pcbActual);
-                        LogRelFlowFunc(("Raw HTML clipboard data from host :"));
-                        DumpHtml((char *)pv, cb);
-                        GlobalUnlock(hClip);
-                    }
-                    else
-                    {
-                        hClip = NULL;
-                    }
-                }
-            }
-    #else
-            /* Convert to a string list, separated by \r\n. */
-            DROPFILES *pDropFiles = (DROPFILES *)hClip;
-            AssertPtr(pDropFiles);
-
-            /* Do we need to do Unicode stuff? */
-            const bool fUnicode = RT_BOOL(pDropFiles->fWide);
-
-            /* Get the offset of the file list. */
-            Assert(pDropFiles->pFiles >= sizeof(DROPFILES));
-
-            /* Note: This is *not* pDropFiles->pFiles! DragQueryFile only
-             *       will work with the plain storage medium pointer! */
-            HDROP hDrop = (HDROP)(hClip);
-
-            /* First, get the file count. */
-            /** @todo Does this work on Windows 2000 / NT4? */
-            char *pszFiles = NULL;
-            uint32_t cchFiles = 0;
-            UINT cFiles = DragQueryFile(hDrop, UINT32_MAX /* iFile */, NULL /* lpszFile */, 0 /* cchFile */);
-
-            LogRel(("DnD: Got %RU16 file(s), fUnicode=%RTbool\n", cFiles, fUnicode));
-
-            for (UINT i = 0; i < cFiles; i++)
-            {
-                UINT cchFile = DragQueryFile(hDrop, i /* File index */, NULL /* Query size first */, 0 /* cchFile */);
-                Assert(cchFile);
-
-                if (RT_FAILURE(rc))
-                    break;
-
-                char *pszFileUtf8 = NULL; /* UTF-8 version. */
-                UINT cchFileUtf8 = 0;
-                if (fUnicode)
-                {
-                    /* Allocate enough space (including terminator). */
-                    WCHAR *pwszFile = (WCHAR *)RTMemAlloc((cchFile + 1) * sizeof(WCHAR));
-                    if (pwszFile)
-                    {
-                        const UINT cwcFileUtf16 = DragQueryFileW(hDrop, i /* File index */,
-                                                                 pwszFile, cchFile + 1 /* Include terminator */);
-
-                        AssertMsg(cwcFileUtf16 == cchFile, ("cchFileUtf16 (%RU16) does not match cchFile (%RU16)\n",
-                                                            cwcFileUtf16, cchFile));
-                        RT_NOREF(cwcFileUtf16);
-
-                        rc = RTUtf16ToUtf8(pwszFile, &pszFileUtf8);
+                        UINT cchFile = DragQueryFile(hDrop, i /* File index */, NULL /* Query size first */, 0 /* cchFile */);
+                        Assert(cchFile);
+
+                        if (RT_FAILURE(rc))
+                            break;
+
+                        char *pszFileUtf8 = NULL; /* UTF-8 version. */
+                        UINT cchFileUtf8 = 0;
+                        if (fUnicode)
+                        {
+                            /* Allocate enough space (including terminator). */
+                            WCHAR *pwszFile = (WCHAR *)RTMemAlloc((cchFile + 1) * sizeof(WCHAR));
+                            if (pwszFile)
+                            {
+                                const UINT cwcFileUtf16 = DragQueryFileW(hDrop, i /* File index */,
+                                                                         pwszFile, cchFile + 1 /* Include terminator */);
+
+                                AssertMsg(cwcFileUtf16 == cchFile, ("cchFileUtf16 (%RU16) does not match cchFile (%RU16)\n",
+                                                                    cwcFileUtf16, cchFile));
+                                RT_NOREF(cwcFileUtf16);
+
+                                rc = RTUtf16ToUtf8(pwszFile, &pszFileUtf8);
+                                if (RT_SUCCESS(rc))
+                                {
+                                    cchFileUtf8 = (UINT)strlen(pszFileUtf8);
+                                    Assert(cchFileUtf8);
+                                }
+
+                                RTMemFree(pwszFile);
+                            }
+                            else
+                                rc = VERR_NO_MEMORY;
+                        }
+                        else /* ANSI */
+                        {
+                            /* Allocate enough space (including terminator). */
+                            pszFileUtf8 = (char *)RTMemAlloc((cchFile + 1) * sizeof(char));
+                            if (pszFileUtf8)
+                            {
+                                cchFileUtf8 = DragQueryFileA(hDrop, i /* File index */,
+                                                             pszFileUtf8, cchFile + 1 /* Include terminator */);
+
+                                AssertMsg(cchFileUtf8 == cchFile, ("cchFileUtf8 (%RU16) does not match cchFile (%RU16)\n",
+                                                                   cchFileUtf8, cchFile));
+                            }
+                            else
+                                rc = VERR_NO_MEMORY;
+                        }
+
                         if (RT_SUCCESS(rc))
                         {
-                            cchFileUtf8 = (UINT)strlen(pszFileUtf8);
-                            Assert(cchFileUtf8);
+                            LogFlowFunc(("\tFile: %s (cchFile=%RU16)\n", pszFileUtf8, cchFileUtf8));
+
+                            LogRel2(("Shared Clipboard: Adding host file '%s'\n", pszFileUtf8));
+
+                            rc = RTStrAAppendExN(&pszFiles, 1 /* cPairs */, pszFileUtf8, cchFileUtf8);
+                            if (RT_SUCCESS(rc))
+                                cchFiles += cchFileUtf8;
                         }
-
-                        RTMemFree(pwszFile);
+                        else
+                            LogRel(("Shared Clipboard: Error handling file entry #%u, rc=%Rrc\n", i, rc));
+
+                        if (pszFileUtf8)
+                            RTStrFree(pszFileUtf8);
+
+                        if (RT_FAILURE(rc))
+                            break;
+
+                        /* Add separation between filenames.
+                         * Note: Also do this for the last element of the list. */
+                        rc = RTStrAAppendExN(&pszFiles, 1 /* cPairs */, "\r\n", 2 /* Bytes */);
+                        if (RT_SUCCESS(rc))
+                            cchFiles += 2; /* Include \r\n */
                     }
-                    else
-                        rc = VERR_NO_MEMORY;
+
+                    if (RT_SUCCESS(rc))
+                    {
+                        cchFiles += 1; /* Add string termination. */
+                        uint32_t cbFiles = cchFiles * sizeof(char);
+
+                        LogFlowFunc(("cFiles=%u, cchFiles=%RU32, cbFiles=%RU32, pszFiles=0x%p\n",
+                                     cFiles, cchFiles, cbFiles, pszFiles));
+
+                        /* Translate the list into URI elements. */
+                        SharedClipboardURIList lstURI;
+                        rc = lstURI.AppendNativePathsFromList(pszFiles, cbFiles,
+                                                              SHAREDCLIPBOARDURILIST_FLAGS_ABSOLUTE_PATHS);
+                        if (RT_SUCCESS(rc))
+                        {
+                            RTCString strRoot = lstURI.GetRootEntries();
+                            size_t cbRoot = strRoot.length() + 1; /* Include termination */
+
+                            if (cbRoot > cb) /** @todo Add overflow handling! */
+                                cbRoot = cb; /* Never copy more than the available buffer supplies. */
+
+                            memcpy(pv, strRoot.c_str(), cbRoot);
+
+                            *pcbActual = (uint32_t)cbRoot;
+                        }
+                    }
+
+                    LogFlowFunc(("Building CF_HDROP list rc=%Rrc, pszFiles=0x%p, cFiles=%RU16, cchFiles=%RU32\n",
+                                 rc, pszFiles, cFiles, cchFiles));
+
+                    if (pszFiles)
+                        RTStrFree(pszFiles);
+
+                    GlobalUnlock(hClip);
                 }
-                else /* ANSI */
-                {
-                    /* Allocate enough space (including terminator). */
-                    pszFileUtf8 = (char *)RTMemAlloc((cchFile + 1) * sizeof(char));
-                    if (pszFileUtf8)
-                    {
-                        cchFileUtf8 = DragQueryFileA(hDrop, i /* File index */,
-                                                     pszFileUtf8, cchFile + 1 /* Include terminator */);
-
-                        AssertMsg(cchFileUtf8 == cchFile, ("cchFileUtf8 (%RU16) does not match cchFile (%RU16)\n",
-                                                           cchFileUtf8, cchFile));
-                    }
-                    else
-                        rc = VERR_NO_MEMORY;
-                }
-
-                if (RT_SUCCESS(rc))
-                {
-                    LogFlowFunc(("\tFile: %s (cchFile=%RU16)\n", pszFileUtf8, cchFileUtf8));
-
-                    LogRel(("DnD: Adding guest file '%s'\n", pszFileUtf8));
-
-                    rc = RTStrAAppendExN(&pszFiles, 1 /* cPairs */, pszFileUtf8, cchFileUtf8);
-                    if (RT_SUCCESS(rc))
-                        cchFiles += cchFileUtf8;
-                }
-                else
-                    LogRel(("DnD: Error handling file entry #%u, rc=%Rrc\n", i, rc));
-
-                if (pszFileUtf8)
-                    RTStrFree(pszFileUtf8);
-
-                if (RT_FAILURE(rc))
-                    break;
-
-                /* Add separation between filenames.
-                 * Note: Also do this for the last element of the list. */
-                rc = RTStrAAppendExN(&pszFiles, 1 /* cPairs */, "\r\n", 2 /* Bytes */);
-                if (RT_SUCCESS(rc))
-                    cchFiles += 2; /* Include \r\n */
-            }
-
-            if (RT_SUCCESS(rc))
-            {
-                cchFiles += 1; /* Add string termination. */
-                uint32_t cbFiles = cchFiles * sizeof(char);
-
-                LogFlowFunc(("cFiles=%u, cchFiles=%RU32, cbFiles=%RU32, pszFiles=0x%p\n",
-                             cFiles, cchFiles, cbFiles, pszFiles));
-
-                /* Translate the list into URI elements. */
-                DnDURIList lstURI;
-                rc = lstURI.AppendNativePathsFromList(pszFiles, cbFiles,
-                                                      DNDURILIST_FLAGS_ABSOLUTE_PATHS);
-                if (RT_SUCCESS(rc))
-                {
-                    RTCString strRoot = lstURI.GetRootEntries();
-                    size_t cbRoot = strRoot.length() + 1; /* Include termination */
-
-                    mpvData = RTMemAlloc(cbRoot);
-                    if (mpvData)
-                    {
-                        memcpy(mpvData, strRoot.c_str(), cbRoot);
-                        mcbData = cbRoot;
-                    }
-                    else
-                        rc = VERR_NO_MEMORY;
-                }
-            }
-
-            LogFlowFunc(("Building CF_HDROP list rc=%Rrc, pszFiles=0x%p, cFiles=%RU16, cchFiles=%RU32\n",
-                         rc, pszFiles, cFiles, cchFiles));
-
-            if (pszFiles)
-                RTStrFree(pszFiles);
-            break;
-    #endif /* 0 */
+            }
         }
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
         VBoxClipboardWinClose();
     }
-    else
-    {
-        LogFunc(("vboxClipboardReadData: failed to open clipboard, rc: %Rrc\n", rc));
-    }
 
     if (hClip == NULL)
     {
         /* Reply with empty data. */
-        vboxClipboardGetData(0, NULL, 0,
-                             pv, cb, pcbActual);
-    }
-
-    return VINF_SUCCESS;
+        vboxClipboardGetData(0, NULL, 0, pv, cb, pcbActual);
+    }
+
+    return VINF_SUCCESS; /** @todo r=andy Return rc here? */
 }
 
 void vboxClipboardWriteData(VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, uint32_t cb, uint32_t u32Format)
 {
-    LogFlow(("vboxClipboardWriteData\n"));
+    LogFlowFuncEnter();
 
     /*
@@ -1032 +1008 @@
     }
 
-    SetEvent(pClient->pCtx->hRenderEvent);
+    AssertPtr(pClient->pCtx);
+    int rc = RTSemEventSignal(pClient->pCtx->hRenderEvent);
+    AssertRC(rc);
+
+    /** @todo Return rc. */
 }
 
@@ -1127 +1107 @@
                 else
                 {
-                    LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected EndFragment.\n"));
+                    LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected EndFragment\n"));
                     rc = VERR_NO_MEMORY;
                 }
@@ -1139 +1119 @@
         else
         {
-            LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected EndFragment. rc = %Rrc.\n", rc));
+            LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected EndFragment. rc = %Rrc\n", rc));
             rc = VERR_INVALID_PARAMETER;
         }
@@ -1145 +1125 @@
     else
     {
-        LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected StartFragment. rc = %Rrc.\n", rc));
+        LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected StartFragment. rc = %Rrc\n", rc));
         rc = VERR_INVALID_PARAMETER;
     }
@@ -1190 +1170 @@
     if (!RT_SUCCESS(rc))
     {
-        LogRelFlowFunc(("Error: invalid source fragment. rc = %Rrc.\n"));
+        LogRelFlowFunc(("Error: invalid source fragment. rc = %Rrc\n"));
         return VERR_INVALID_PARAMETER;
     }
@@ -1230 +1210 @@
     if (pszResult == NULL)
     {
-        LogRelFlowFunc(("Error: Cannot allocate memory for result buffer. rc = %Rrc.\n"));
+        LogRelFlowFunc(("Error: Cannot allocate memory for result buffer. rc = %Rrc\n"));
         return VERR_NO_MEMORY;
     }
@@ -1259 +1239 @@
     return VINF_SUCCESS;
 }
+