Index: trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp
===================================================================
--- trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp	(revision 80845)
+++ trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp	(revision 80847)
@@ -488,5 +488,5 @@
            LogFunc(("WM_RENDERFORMAT: cfFormat=%u -> fFormat=0x%x\n", cfFormat, fFormat));
 
-           if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_NONE)
+           if (fFormat == VBOX_SHCL_FMT_NONE)
            {
                LogFunc(("WM_RENDERFORMAT: Unsupported format requested\n"));
@@ -571,5 +571,5 @@
                                 * must have the exact string size.
                                 */
-                               if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+                               if (fFormat == VBOX_SHCL_FMT_UNICODETEXT)
                                {
                                    size_t cbActual = 0;
@@ -648,5 +648,5 @@
            const SHCLFORMATS fFormats =  pEvent->u.ReportedFormats.uFormats;
 
-           if (fFormats != VBOX_SHARED_CLIPBOARD_FMT_NONE) /* Could arrive with some older GA versions. */
+           if (fFormats != VBOX_SHCL_FMT_NONE) /* Could arrive with some older GA versions. */
            {
                int rc = SharedClipboardWinOpen(hwnd);
@@ -656,7 +656,7 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-                    if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
+                    if (fFormats & VBOX_SHCL_FMT_URI_LIST)
                     {
-                        LogFunc(("VBOX_SHARED_CLIPBOARD_FMT_URI_LIST\n"));
+                        LogFunc(("VBOX_SHCL_FMT_URI_LIST\n"));
 
                         PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(&pCtx->URI, 0); /** @todo FIX !!! */
@@ -705,5 +705,5 @@
            if (RT_SUCCESS(rc))
            {
-               if (uFormat == VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+               if (uFormat == VBOX_SHCL_FMT_BITMAP)
                {
                    hClip = GetClipboardData(CF_DIB);
@@ -725,5 +725,5 @@
                    }
                }
-               else if (uFormat == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+               else if (uFormat == VBOX_SHCL_FMT_UNICODETEXT)
                {
                    hClip = GetClipboardData(CF_UNICODETEXT);
@@ -745,5 +745,5 @@
                    }
                }
-               else if (uFormat == VBOX_SHARED_CLIPBOARD_FMT_HTML)
+               else if (uFormat == VBOX_SHCL_FMT_HTML)
                {
                    UINT format = RegisterClipboardFormat(SHCL_WIN_REGFMT_HTML);
@@ -771,5 +771,5 @@
                }
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-               else if (uFormat == VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
+               else if (uFormat == VBOX_SHCL_FMT_URI_LIST)
                {
                    LogFunc(("cTransfersRunning=%RU32\n", SharedClipboardURICtxGetRunningTransfers(&pCtx->URI)));
@@ -855,5 +855,5 @@
 
                    /* Requested clipboard format is not available, send empty data. */
-                   VbglR3ClipboardWriteData(pCtx->CmdCtx.uClientID, VBOX_SHARED_CLIPBOARD_FMT_NONE, NULL, 0);
+                   VbglR3ClipboardWriteData(pCtx->CmdCtx.uClientID, VBOX_SHCL_FMT_NONE, NULL, 0);
 #ifdef DEBUG_andy
                    AssertFailed();
@@ -1119,5 +1119,5 @@
 }
 
-DECLCALLBACK(int) VBoxClipboardInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+DECLCALLBACK(int) VBoxShClInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
 {
     LogFlowFuncEnter();
@@ -1182,5 +1182,5 @@
 }
 
-DECLCALLBACK(int) VBoxClipboardWorker(void *pInstance, bool volatile *pfShutdown)
+DECLCALLBACK(int) VBoxShClWorker(void *pInstance, bool volatile *pfShutdown)
 {
     AssertPtr(pInstance);
@@ -1229,5 +1229,5 @@
                 switch (uMsg)
                 {
-                    case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
+                    case VBOX_SHCL_HOST_MSG_FORMATS_REPORT:
                     {
                         pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_REPORT_FORMATS;
@@ -1236,5 +1236,5 @@
                     }
 
-                    case VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA:
+                    case VBOX_SHCL_HOST_MSG_READ_DATA:
                     {
                         pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_READ_DATA;
@@ -1340,5 +1340,5 @@
 }
 
-DECLCALLBACK(int) VBoxClipboardStop(void *pInstance)
+DECLCALLBACK(int) VBoxShClStop(void *pInstance)
 {
     AssertPtrReturn(pInstance, VERR_INVALID_POINTER);
@@ -1356,5 +1356,5 @@
 }
 
-DECLCALLBACK(void) VBoxClipboardDestroy(void *pInstance)
+DECLCALLBACK(void) VBoxShClDestroy(void *pInstance)
 {
     AssertPtrReturnVoid(pInstance);
@@ -1388,8 +1388,8 @@
     "Shared Clipboard",
     /* methods */
-    VBoxClipboardInit,
-    VBoxClipboardWorker,
-    VBoxClipboardStop,
-    VBoxClipboardDestroy
+    VBoxShClInit,
+    VBoxShClWorker,
+    VBoxShClStop,
+    VBoxShClDestroy
 };
 
Index: trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp
===================================================================
--- trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp	(revision 80845)
+++ trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp	(revision 80847)
@@ -374,5 +374,5 @@
                         AssertPtr(pDropFiles);
 
-                        /** @todo Replace / merge the following code with VBoxClipboardWinDropFilesToStringList(). */
+                        /** @todo Replace / merge the following code with VBoxShClWinDropFilesToStringList(). */
 
                         /* Do we need to do Unicode stuff? */
