Changeset 80847 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Sep 17, 2019 9:38:16 AM (6 years ago)

Author:

vboxsync

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

133417

Message:

Shared Clipboard/URI: More renaming to make code base more uniform.

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• clipboard-common.cpp (modified) (7 diffs)
• clipboard-uri.cpp (modified) (3 diffs)
• clipboard-win.cpp (modified) (6 diffs)
• clipboard-x11.cpp (modified) (26 diffs)

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

@@ -158 +158 @@
     pSource->uID          = uID;
     /* Choose a random event ID starting point. */
-    pSource->uEventIDNext = RTRandU32() % VBOX_SHARED_CLIPBOARD_MAX_EVENTS;
+    pSource->uEventIDNext = RTRandU32() % VBOX_SHCL_MAX_EVENTS;
 
     LogFlowFuncLeaveRC(rc);
@@ -205 +205 @@
 
     pSource->uEventIDNext++;
-    if (pSource->uEventIDNext == VBOX_SHARED_CLIPBOARD_MAX_EVENTS)
+    if (pSource->uEventIDNext == VBOX_SHCL_MAX_EVENTS)
         pSource->uEventIDNext = 0;
 
@@ -749 +749 @@
 
 #ifdef LOG_ENABLED
-int VBoxClipboardDbgDumpHtml(const char *pszSrc, size_t cbSrc)
+int VBoxShClDbgDumpHtml(const char *pszSrc, size_t cbSrc)
 {
     size_t cchIgnored = 0;
@@ -777 +777 @@
 }
 
-void VBoxClipboardDbgDumpData(const void *pv, size_t cb, SHCLFORMAT u32Format)
-{
-    if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
-    {
-        LogFunc(("VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT:\n"));
+void VBoxShClDbgDumpData(const void *pv, size_t cb, SHCLFORMAT u32Format)
+{
+    if (u32Format & VBOX_SHCL_FMT_UNICODETEXT)
+    {
+        LogFunc(("VBOX_SHCL_FMT_UNICODETEXT:\n"));
         if (pv && cb)
             LogFunc(("%ls\n", pv));
@@ -787 +787 @@
             LogFunc(("%p %zu\n", pv, cb));
     }
-    else if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
-        LogFunc(("VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
-    else if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_HTML)
-    {
-        LogFunc(("VBOX_SHARED_CLIPBOARD_FMT_HTML:\n"));
+    else if (u32Format & VBOX_SHCL_FMT_BITMAP)
+        LogFunc(("VBOX_SHCL_FMT_BITMAP\n"));
+    else if (u32Format & VBOX_SHCL_FMT_HTML)
+    {
+        LogFunc(("VBOX_SHCL_FMT_HTML:\n"));
         if (pv && cb)
         {
@@ -822 +822 @@
  * @param   uMsg                The message to translate.
  */
-const char *VBoxClipboardHostMsgToStr(uint32_t uMsg)
+const char *VBoxShClHostMsgToStr(uint32_t uMsg)
 {
     switch (uMsg)
     {
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_TRANSFER_STATUS);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ROOT_LIST_HDR_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ROOT_LIST_HDR_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ROOT_LIST_ENTRY_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ROOT_LIST_ENTRY_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_LIST_OPEN);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_LIST_CLOSE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_LIST_HDR_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_LIST_HDR_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_LIST_ENTRY_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_LIST_ENTRY_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_OBJ_OPEN);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_OBJ_CLOSE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_OBJ_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_OBJ_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_CANCEL);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ERROR);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_QUIT);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_READ_DATA);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_FORMATS_REPORT);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_TRANSFER_STATUS);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_ROOT_LIST_HDR_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_ROOT_LIST_HDR_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_ROOT_LIST_ENTRY_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_ROOT_LIST_ENTRY_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_LIST_OPEN);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_LIST_CLOSE);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_LIST_HDR_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_LIST_HDR_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_LIST_ENTRY_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_LIST_ENTRY_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_OBJ_OPEN);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_OBJ_CLOSE);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_OBJ_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_OBJ_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_CANCEL);
+        RT_CASE_RET_STR(VBOX_SHCL_HOST_MSG_URI_ERROR);
     }
     return "Unknown";
@@ -856 +856 @@
  * @param   uMsg                The message to translate.
  */
-const char *VBoxClipboardGuestMsgToStr(uint32_t uMsg)
+const char *VBoxShClGuestMsgToStr(uint32_t uMsg)
 {
     switch (uMsg)
     {
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_GET_HOST_MSG_OLD);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_REPORT);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_DATA_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_DATA_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_CONNECT);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_MSG_PEEK_NOWAIT);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_MSG_PEEK_WAIT);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_MSG_GET);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_STATUS);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_REPLY);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_ROOT_LIST_HDR_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_ROOT_LIST_HDR_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_ROOT_LIST_ENTRY_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_ROOT_LIST_ENTRY_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_LIST_OPEN);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_LIST_CLOSE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_LIST_HDR_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_LIST_HDR_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_LIST_ENTRY_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_LIST_ENTRY_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_OBJ_OPEN);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_OBJ_CLOSE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_OBJ_READ);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_OBJ_WRITE);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_CANCEL);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_ERROR);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_GET_HOST_MSG_OLD);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_FORMATS_REPORT);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_DATA_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_DATA_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_CONNECT);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_MSG_PEEK_NOWAIT);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_MSG_PEEK_WAIT);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_MSG_GET);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_STATUS);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_REPLY);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_ROOT_LIST_HDR_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_ROOT_LIST_HDR_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_ROOT_LIST_ENTRY_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_ROOT_LIST_ENTRY_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_LIST_OPEN);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_LIST_CLOSE);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_LIST_HDR_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_LIST_HDR_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_LIST_ENTRY_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_LIST_ENTRY_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_OBJ_OPEN);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_OBJ_CLOSE);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_OBJ_READ);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_OBJ_WRITE);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_CANCEL);
+        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_ERROR);
     }
     return "Unknown";

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

@@ -2521 +2521 @@
      * max-1 IDs.
      */
-    uint32_t idTransfer = RTRandU32Ex(1, VBOX_SHARED_CLIPBOARD_MAX_TRANSFERS - 2);
+    uint32_t idTransfer = RTRandU32Ex(1, VBOX_SHCL_MAX_TRANSFERS - 2);
 
     if (!ASMBitTestAndSet(&pURI->bmTransferIds[0], idTransfer))
     { /* likely */ }
-    else if (pURI->cTransfers < VBOX_SHARED_CLIPBOARD_MAX_TRANSFERS - 2 /* First and last are not used */)
+    else if (pURI->cTransfers < VBOX_SHCL_MAX_TRANSFERS - 2 /* First and last are not used */)
     {
         /* Forward search. */
-        int iHit = ASMBitNextClear(&pURI->bmTransferIds[0], VBOX_SHARED_CLIPBOARD_MAX_TRANSFERS, idTransfer);
+        int iHit = ASMBitNextClear(&pURI->bmTransferIds[0], VBOX_SHCL_MAX_TRANSFERS, idTransfer);
         if (iHit < 0)
-            iHit = ASMBitFirstClear(&pURI->bmTransferIds[0], VBOX_SHARED_CLIPBOARD_MAX_TRANSFERS);
+            iHit = ASMBitFirstClear(&pURI->bmTransferIds[0], VBOX_SHCL_MAX_TRANSFERS);
         AssertLogRelMsgReturn(iHit >= 0, ("Transfer count: %RU16\n", pURI->cTransfers), VERR_SHCLPB_MAX_TRANSFERS_REACHED);
         idTransfer = iHit;
@@ -2567 +2567 @@
     LogFlowFunc(("cTransfers=%RU16, idTransfer=%RU32\n", pURI->cTransfers, idTransfer));
 
-    if (pURI->cTransfers < VBOX_SHARED_CLIPBOARD_MAX_TRANSFERS - 2 /* First and last are not used */)
+    if (pURI->cTransfers < VBOX_SHCL_MAX_TRANSFERS - 2 /* First and last are not used */)
     {
         if (!ASMBitTestAndSet(&pURI->bmTransferIds[0], idTransfer))
@@ -2950 +2950 @@
  * @param   uStatus             The transfer status to translate.
  */
-const char *VBoxClipboardTransferStatusToStr(uint32_t uStatus)
+const char *VBoxShClTransferStatusToStr(uint32_t uStatus)
 {
     switch (uStatus)

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

@@ -369 +369 @@
  * Converts a (registered or standard) Windows clipboard format to a VBox clipboard format.
  *
- * @returns Converted VBox clipboard format, or VBOX_SHARED_CLIPBOARD_FMT_NONE if not found.
+ * @returns Converted VBox clipboard format, or VBOX_SHCL_FMT_NONE if not found.
  * @param   uFormat             Windows clipboard format to convert.
  */
@@ -375 +375 @@
 {
     /* Insert the requested clipboard format data into the clipboard. */
-    SHCLFORMAT vboxFormat = VBOX_SHARED_CLIPBOARD_FMT_NONE;
+    SHCLFORMAT vboxFormat = VBOX_SHCL_FMT_NONE;
 
     switch (uFormat)
     {
         case CF_UNICODETEXT:
-            vboxFormat = VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+            vboxFormat = VBOX_SHCL_FMT_UNICODETEXT;
             break;
 
         case CF_DIB:
-            vboxFormat = VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
+            vboxFormat = VBOX_SHCL_FMT_BITMAP;
             break;
 
@@ -393 +393 @@
          * This does *not* invoke any IDataObject / IStream implementations! */
         case CF_HDROP:
-            vboxFormat = VBOX_SHARED_CLIPBOARD_FMT_URI_LIST;
+            vboxFormat = VBOX_SHCL_FMT_URI_LIST;
             break;
 #endif
@@ -407 +407 @@
 
                     if (RTStrCmp(szFormatName, SHCL_WIN_REGFMT_HTML) == 0)
-                        vboxFormat = VBOX_SHARED_CLIPBOARD_FMT_HTML;
+                        vboxFormat = VBOX_SHCL_FMT_HTML;
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
                     /* These types invoke our IDataObject / IStream implementations. */
                     else if (   (RTStrCmp(szFormatName, CFSTR_FILEDESCRIPTORA) == 0)
                              || (RTStrCmp(szFormatName, CFSTR_FILECONTENTS)    == 0))
-                        vboxFormat = VBOX_SHARED_CLIPBOARD_FMT_URI_LIST;
+                        vboxFormat = VBOX_SHCL_FMT_URI_LIST;
                     /** @todo Do we need to handle CFSTR_FILEDESCRIPTORW here as well? */
 #endif
@@ -436 +436 @@
     AssertPtrReturn(pFormats, VERR_INVALID_POINTER);
 
-    SHCLFORMATS fFormats = VBOX_SHARED_CLIPBOARD_FMT_NONE;
+    SHCLFORMATS fFormats = VBOX_SHCL_FMT_NONE;
 
     /* Query list of available formats and report to host. */
@@ -847 +847 @@
     /** @todo Implement more flexible clipboard precedence for supported formats. */
 
-    if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    if (fFormats & VBOX_SHCL_FMT_UNICODETEXT)
     {
         LogFunc(("CF_UNICODETEXT\n"));
         hClip = SetClipboardData(CF_UNICODETEXT, NULL);
     }
-    else if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+    else if (fFormats & VBOX_SHCL_FMT_BITMAP)
     {
         LogFunc(("CF_DIB\n"));
         hClip = SetClipboardData(CF_DIB, NULL);
     }
-    else if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_HTML)
-    {
-        LogFunc(("VBOX_SHARED_CLIPBOARD_FMT_HTML\n"));
+    else if (fFormats & VBOX_SHCL_FMT_HTML)
+    {
+        LogFunc(("VBOX_SHCL_FMT_HTML\n"));
         cfFormat = RegisterClipboardFormat(SHCL_WIN_REGFMT_HTML);
         if (cfFormat != 0)

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

@@ -113 +113 @@
 {
     { "INVALID", INVALID, 0 },
-    { "UTF8_STRING", UTF8, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
+    { "UTF8_STRING", UTF8, VBOX_SHCL_FMT_UNICODETEXT },
     { "text/plain;charset=UTF-8", UTF8,
-      VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
+      VBOX_SHCL_FMT_UNICODETEXT },
     { "text/plain;charset=utf-8", UTF8,
-      VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
-    { "STRING", TEXT, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
-    { "TEXT", TEXT, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
-    { "text/plain", TEXT, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT },
-    { "text/html", HTML, VBOX_SHARED_CLIPBOARD_FMT_HTML },
+      VBOX_SHCL_FMT_UNICODETEXT },
+    { "STRING", TEXT, VBOX_SHCL_FMT_UNICODETEXT },
+    { "TEXT", TEXT, VBOX_SHCL_FMT_UNICODETEXT },
+    { "text/plain", TEXT, VBOX_SHCL_FMT_UNICODETEXT },
+    { "text/html", HTML, VBOX_SHCL_FMT_HTML },
     { "text/html;charset=utf-8", HTML,
-      VBOX_SHARED_CLIPBOARD_FMT_HTML },
-    { "image/bmp", BMP, VBOX_SHARED_CLIPBOARD_FMT_BITMAP },
-    { "image/x-bmp", BMP, VBOX_SHARED_CLIPBOARD_FMT_BITMAP },
-    { "image/x-MS-bmp", BMP, VBOX_SHARED_CLIPBOARD_FMT_BITMAP }
+      VBOX_SHCL_FMT_HTML },
+    { "image/bmp", BMP, VBOX_SHCL_FMT_BITMAP },
+    { "image/x-bmp", BMP, VBOX_SHCL_FMT_BITMAP },
+    { "image/x-MS-bmp", BMP, VBOX_SHCL_FMT_BITMAP }
 
 
@@ -419 +419 @@
         {
             if (   (clipVBoxFormatForX11Format(format)
-                            == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+                            == VBOX_SHCL_FMT_UNICODETEXT)
                     && enmBestTextTarget < clipRealFormatForX11Format(format))
             {
@@ -472 +472 @@
         {
             if (   (clipVBoxFormatForX11Format(format)
-                            == VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+                            == VBOX_SHCL_FMT_BITMAP)
                     && enmBestBitmapTarget < clipRealFormatForX11Format(format))
             {
@@ -503 +503 @@
         if (format != NIL_CLIPX11FORMAT)
         {
-            if (   (clipVBoxFormatForX11Format(format) == VBOX_SHARED_CLIPBOARD_FMT_HTML)
+            if (   (clipVBoxFormatForX11Format(format) == VBOX_SHCL_FMT_HTML)
                 && enmBestHtmlTarget < clipRealFormatForX11Format(format))
             {
@@ -858 +858 @@
     XtToolkitInitialize();
     pCtx->appContext = XtCreateApplicationContext();
-    pDisplay = XtOpenDisplay(pCtx->appContext, 0, 0, "VBoxClipboard", 0, 0, &cArgc, &pcArgv);
+    pDisplay = XtOpenDisplay(pCtx->appContext, 0, 0, "VBoxShCl", 0, 0, &cArgc, &pcArgv);
     if (NULL == pDisplay)
     {
@@ -874 +874 @@
     if (RT_SUCCESS(rc))
     {
-        pCtx->widget = XtVaAppCreateShell(0, "VBoxClipboard",
+        pCtx->widget = XtVaAppCreateShell(0, "VBoxShCl",
                                           applicationShellWidgetClass,
                                           pDisplay, XtNwidth, 1, XtNheight,
@@ -1088 +1088 @@
  * data returned.
  */
-static int clipReadVBoxClipboard(CLIPBACKEND *pCtx, uint32_t u32Format,
+static int clipReadVBoxShCl(CLIPBACKEND *pCtx, uint32_t u32Format,
                                  void **ppv, uint32_t *pcb)
 {
@@ -1094 +1094 @@
     LogRelFlowFunc(("pCtx=%p, u32Format=%02X, ppv=%p, pcb=%p\n", pCtx,
                  u32Format, ppv, pcb));
-    if (u32Format == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    if (u32Format == VBOX_SHCL_FMT_UNICODETEXT)
     {
         if (pCtx->pvUnicodeCache == NULL)
@@ -1319 +1319 @@
     CLIPFORMAT format = clipRealFormatForX11Format(x11Format);
     if (   ((format == UTF8) || (format == TEXT))
-        && (pCtx->vboxFormats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT))
+        && (pCtx->vboxFormats & VBOX_SHCL_FMT_UNICODETEXT))
     {
         void *pv = NULL;
         uint32_t cb = 0;
-        rc = clipReadVBoxClipboard(pCtx,
-                                   VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+        rc = clipReadVBoxShCl(pCtx,
+                                   VBOX_SHCL_FMT_UNICODETEXT,
                                    &pv, &cb);
         if (RT_SUCCESS(rc) && (cb == 0))
@@ -1338 +1338 @@
     }
     else if (   (format == BMP)
-             && (pCtx->vboxFormats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP))
+             && (pCtx->vboxFormats & VBOX_SHCL_FMT_BITMAP))
     {
         void *pv = NULL;
         uint32_t cb = 0;
-        rc = clipReadVBoxClipboard(pCtx,
-                                   VBOX_SHARED_CLIPBOARD_FMT_BITMAP,
+        rc = clipReadVBoxShCl(pCtx,
+                                   VBOX_SHCL_FMT_BITMAP,
                                    &pv, &cb);
         if (RT_SUCCESS(rc) && (cb == 0))
@@ -1364 +1364 @@
     }
     else if ( (format == HTML)
-            && (pCtx->vboxFormats & VBOX_SHARED_CLIPBOARD_FMT_HTML))
+            && (pCtx->vboxFormats & VBOX_SHCL_FMT_HTML))
     {
         void *pv = NULL;
         uint32_t cb = 0;
-        rc = clipReadVBoxClipboard(pCtx,
-                                   VBOX_SHARED_CLIPBOARD_FMT_HTML,
+        rc = clipReadVBoxShCl(pCtx,
+                                   VBOX_SHCL_FMT_HTML,
                                    &pv, &cb);
         if (RT_SUCCESS(rc) && (cb == 0))
@@ -1788 +1788 @@
         /* The clipboard selection may have changed before we could get it. */
         rc = VERR_NO_DATA;
-    else if (pReq->mFormat == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    else if (pReq->mFormat == VBOX_SHCL_FMT_UNICODETEXT)
     {
         /* In which format is the clipboard data? */
@@ -1811 +1811 @@
         }
     }
-    else if (pReq->mFormat == VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+    else if (pReq->mFormat == VBOX_SHCL_FMT_BITMAP)
     {
         /* In which format is the clipboard data? */
@@ -1839 +1839 @@
         }
     }
-    else if(pReq->mFormat == VBOX_SHARED_CLIPBOARD_FMT_HTML)
+    else if(pReq->mFormat == VBOX_SHCL_FMT_HTML)
     {
         /* In which format is the clipboard data? */
@@ -1961 +1961 @@
     else
 #endif
-    if (pReq->mFormat == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    if (pReq->mFormat == VBOX_SHCL_FMT_UNICODETEXT)
     {
         /*
@@ -1975 +1975 @@
             getSelectionValue(pCtx, pCtx->X11TextFormat, pReq);
     }
-    else if (pReq->mFormat == VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+    else if (pReq->mFormat == VBOX_SHCL_FMT_BITMAP)
     {
         pReq->mBitmapFormat = pCtx->X11BitmapFormat;
@@ -1986 +1986 @@
             getSelectionValue(pCtx, pCtx->X11BitmapFormat, pReq);
     }
-    else if(pReq->mFormat == VBOX_SHARED_CLIPBOARD_FMT_HTML)
+    else if(pReq->mFormat == VBOX_SHCL_FMT_HTML)
     {
         /* Send out a request for the data to the current clipboard
@@ -2115 +2115 @@
     g_vboxDatacb = cb;
     ClipAnnounceFormatToX11(pCtx,
-                                       VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT);
+                                       VBOX_SHCL_FMT_UNICODETEXT);
     return VINF_SUCCESS;
 }
@@ -2435 +2435 @@
     bool retval = true;
     clipSendTargetUpdate(pCtx);
-    if (clipQueryFormats() != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    if (clipQueryFormats() != VBOX_SHCL_FMT_UNICODETEXT)
         RTTestFailed(hTest, "Wrong targets reported: %02X\n",
                      clipQueryFormats());
@@ -2442 +2442 @@
         char *pc;
         CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq, *pReqRet = NULL;
-        ClipRequestDataFromX11(pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+        ClipRequestDataFromX11(pCtx, VBOX_SHCL_FMT_UNICODETEXT,
                                pReq);
         int rc = VINF_SUCCESS;
@@ -2493 +2493 @@
     bool retval = false;
     clipSendTargetUpdate(pCtx);
-    if (clipQueryFormats() != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    if (clipQueryFormats() != VBOX_SHCL_FMT_UNICODETEXT)
         RTTestFailed(hTest, "Wrong targets reported: %02X\n",
                      clipQueryFormats());
@@ -2500 +2500 @@
         char *pc;
         CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq, *pReqRet = NULL;
-        ClipRequestDataFromX11(pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+        ClipRequestDataFromX11(pCtx, VBOX_SHCL_FMT_UNICODETEXT,
                                pReq);
         int rc = VINF_SUCCESS;
@@ -2578 +2578 @@
     CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq;
     int rc = ClipRequestDataFromX11(pCtx,
-                                    VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+                                    VBOX_SHCL_FMT_UNICODETEXT,
                                     pReq);
     RTTESTI_CHECK_MSG(rc == VERR_NO_DATA, ("context: %s\n", pcszTestCtx));
@@ -2609 +2609 @@
                            sizeof("hello world"), 8);
     clipSendTargetUpdate(pCtx);
-    if (clipQueryFormats() != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    if (clipQueryFormats() != VBOX_SHCL_FMT_UNICODETEXT)
         RTTestFailed(hTest, "Wrong targets reported: %02X\n",
                      clipQueryFormats());
@@ -2625 +2625 @@
         clipSetSelectionValues("", XA_STRING, "", sizeof(""), 8);
         clipSendTargetUpdate(pCtx);
-        if (clipQueryFormats() == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+        if (clipQueryFormats() == VBOX_SHCL_FMT_UNICODETEXT)
             RTTestFailed(hTest, "Failed to report targets after bad host request.\n");
     }
@@ -2725 +2725 @@
     clipSetSelectionValues("UTF8_STRING", XA_STRING, NULL,
                            0, 8);
-    ClipRequestDataFromX11(pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+    ClipRequestDataFromX11(pCtx, VBOX_SHCL_FMT_UNICODETEXT,
                            pReq);
     clipGetCompletedRequest(&rc, &pc, &cbActual, &pReqRet);