Changeset 80858 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Sep 17, 2019 1:03:39 PM (5 years ago)

Author:

vboxsync

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

133428

Message:

Shared Clipboard/URI: More renaming (URI -> transfer).

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (37 diffs)

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

@@ -62 +62 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
     /** Associated transfer data. */
-    SHCLURICTX            URI;
+    SHCLTRANSFERCTX       TransferCtx;
 #endif
 } SHCLCONTEXT, *PSHCLCONTEXT;
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-typedef struct _SHCLURIREADTHREADCTX
+typedef struct _SHCLREADTHREADCTX
 {
     PSHCLCONTEXT     pClipboardCtx;
-    PSHCLURITRANSFER pTransfer;
-} SHCLURIREADTHREADCTX, *PSHCLURIREADTHREADCTX;
-
-typedef struct _SHCLURIWRITETHREADCTX
+    PSHCLTRANSFER pTransfer;
+} SHCLREADTHREADCTX, *PSHCLREADTHREADCTX;
+
+typedef struct _SHCLWRITETHREADCTX
 {
     PSHCLCONTEXT     pClipboardCtx;
-    PSHCLURITRANSFER pTransfer;
-} SHCLURIWRITETHREADCTX, *PSHCLURIWRITETHREADCTX;
+    PSHCLTRANSFER pTransfer;
+} SHCLWRITETHREADCTX, *PSHCLWRITETHREADCTX;
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 
@@ -94 +94 @@
 *********************************************************************************************************************************/
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-static DECLCALLBACK(void) vboxClipboardURITransferCompleteCallback(PSHCLURITRANSFERCALLBACKDATA pData, int rc);
-static DECLCALLBACK(void) vboxClipboardURITransferErrorCallback(PSHCLURITRANSFERCALLBACKDATA pData, int rc);
+static DECLCALLBACK(void) vboxClipboardTransferTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
+static DECLCALLBACK(void) vboxClipboardTransferTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
 #endif
 
@@ -101 +101 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
 #if 0
-static DECLCALLBACK(int) vboxClipboardURIWriteThread(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) vboxClipboardTransferWriteThread(RTTHREAD ThreadSelf, void *pvUser)
 {
     RT_NOREF(ThreadSelf);
@@ -107 +107 @@
     LogFlowFuncEnter();
 
-    PSHCLURIWRITETHREADCTX pCtx = (PSHCLURIWRITETHREADCTX)pvUser;
+    PSHCLWRITETHREADCTX pCtx = (PSHCLWRITETHREADCTX)pvUser;
     AssertPtr(pCtx);
 
-    PSHCLURITRANSFER pTransfer = pCtx->pTransfer;
+    PSHCLTRANSFER pTransfer = pCtx->pTransfer;
     AssertPtr(pTransfer);
 
@@ -121 +121 @@
     if (RT_SUCCESS(rc))
     {
-        rc = VbglR3ClipboardTransferSendStatus(&cmdCtx, pTransfer, SHCLURITRANSFERSTATUS_RUNNING);
+        rc = VbglR3ClipboardTransferSendStatus(&cmdCtx, pTransfer, SHCLTRANSFERSTATUS_RUNNING);
         if (RT_SUCCESS(rc))
         {
@@ -160 +160 @@
 #endif
 
-static void vboxClipboardURITransferCallbackCleanup(PSHCLURITRANSFERCALLBACKDATA pData)
-{
-    PSHCLURICTX pCtx = (PSHCLURICTX)pData->pvUser;
+static void vboxClipboardTransferTransferCallbackCleanup(PSHCLTRANSFERCALLBACKDATA pData)
+{
+    PSHCLTRANSFERCTX pCtx = (PSHCLTRANSFERCTX)pData->pvUser;
     AssertPtr(pCtx);
 
-    PSHCLURITRANSFER pTransfer = pData->pTransfer;
+    PSHCLTRANSFER pTransfer = pData->pTransfer;
     AssertPtr(pTransfer);
 
-    if (pTransfer->pvUser) /* SharedClipboardWinURITransferCtx */
+    if (pTransfer->pvUser) /* SharedClipboardWinTransferCtx */
     {
         delete pTransfer->pvUser;
@@ -174 +174 @@
     }
 
-    int rc2 = SharedClipboardURICtxTransferUnregister(pCtx, pTransfer->State.uID);
+    int rc2 = SharedClipboardTransferCtxTransferUnregister(pCtx, pTransfer->State.uID);
     AssertRC(rc2);
 
-    SharedClipboardURITransferDestroy(pTransfer);
+    SharedClipboardTransferDestroy(pTransfer);
 
     RTMemFree(pTransfer);
@@ -183 +183 @@
 }
 
-static DECLCALLBACK(void) vboxClipboardURITransferCompleteCallback(PSHCLURITRANSFERCALLBACKDATA pData, int rc)
+static DECLCALLBACK(void) vboxClipboardTransferTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
 {
     RT_NOREF(rc);
@@ -191 +191 @@
     LogRel2(("Shared Clipboard: Transfer to destination complete\n"));
 
-    vboxClipboardURITransferCallbackCleanup(pData);
-}
-
-static DECLCALLBACK(void) vboxClipboardURITransferErrorCallback(PSHCLURITRANSFERCALLBACKDATA pData, int rc)
+    vboxClipboardTransferTransferCallbackCleanup(pData);
+}
+
+static DECLCALLBACK(void) vboxClipboardTransferTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
 {
     RT_NOREF(rc);
@@ -202 +202 @@
     LogRel(("Shared Clipboard: Transfer to destination failed with %Rrc\n", rc));
 
-    vboxClipboardURITransferCallbackCleanup(pData);
-}
-
-static int vboxClipboardURITransferOpen(PSHCLPROVIDERCTX pCtx)
+    vboxClipboardTransferTransferCallbackCleanup(pData);
+}
+
+static int vboxClipboardTransferTransferOpen(PSHCLPROVIDERCTX pCtx)
 {
     RT_NOREF(pCtx);
@@ -213 +213 @@
 }
 
-static int vboxClipboardURITransferClose(PSHCLPROVIDERCTX pCtx)
+static int vboxClipboardTransferTransferClose(PSHCLPROVIDERCTX pCtx)
 {
     RT_NOREF(pCtx);
@@ -221 +221 @@
 }
 
-static int vboxClipboardURIListOpen(PSHCLPROVIDERCTX pCtx, PSHCLLISTOPENPARMS pOpenParms,
-                                    PSHCLLISTHANDLE phList)
+static int vboxClipboardTransferListOpen(PSHCLPROVIDERCTX pCtx, PSHCLLISTOPENPARMS pOpenParms,
+                                         PSHCLLISTHANDLE phList)
 {
     RT_NOREF(pCtx, pOpenParms, phList);
@@ -239 +239 @@
 }
 
-static int vboxClipboardURIListClose(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList)
+static int vboxClipboardTransferListClose(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList)
 {
     RT_NOREF(pCtx, hList);
@@ -256 +256 @@
 }
 
-static int vboxClipboardURIGetRoots(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList)
+static int vboxClipboardTransferGetRoots(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList)
 {
     LogFlowFuncEnter();
@@ -269 +269 @@
 }
 
-static int vboxClipboardURIListHdrRead(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList,
-                                       PSHCLLISTHDR pListHdr)
+static int vboxClipboardTransferListHdrRead(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList,
+                                            PSHCLLISTHDR pListHdr)
 {
     RT_NOREF(hList);
@@ -281 +281 @@
     RT_NOREF(pThisCtx);
 
-    int rc = SharedClipboardURIListHdrInit(pListHdr);
+    int rc = SharedClipboardTransferListHdrInit(pListHdr);
     if (RT_SUCCESS(rc))
     {
@@ -289 +289 @@
         }
         else
-            SharedClipboardURIListHdrDestroy(pListHdr);
+            SharedClipboardTransferListHdrDestroy(pListHdr);
     }
 
@@ -297 +297 @@
 
 /*
-static int vboxClipboardURIListHdrWrite(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList,
-                                        PSHCLLISTHDR pListHdr)
+static int vboxClipboardTransferListHdrWrite(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList,
+                                             PSHCLLISTHDR pListHdr)
 {
     LogFlowFuncEnter();
@@ -311 +311 @@
 }*/
 
-static int vboxClipboardURIListEntryRead(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList,
-                                         PSHCLLISTENTRY pListEntry)
+static int vboxClipboardTransferListEntryRead(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList,
+                                              PSHCLLISTENTRY pListEntry)
 {
     RT_NOREF(hList);
@@ -331 +331 @@
 
 /*
-static int vboxClipboardURIListEntryWrite(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList,
-                                          PSHCLLISTENTRY pListEntry)
+static int vboxClipboardTransferListEntryWrite(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList,
+                                               PSHCLLISTENTRY pListEntry)
 {
     LogFlowFuncEnter();
@@ -346 +346 @@
 */
 
-static int vboxClipboardURIObjOpen(PSHCLPROVIDERCTX pCtx,
-                                   PSHCLOBJOPENCREATEPARMS pCreateParms, PSHCLOBJHANDLE phObj)
+static int vboxClipboardTransferObjOpen(PSHCLPROVIDERCTX pCtx,
+                                        PSHCLOBJOPENCREATEPARMS pCreateParms, PSHCLOBJHANDLE phObj)
 {
     LogFlowFuncEnter();
@@ -360 +360 @@
 }
 
-static int vboxClipboardURIObjClose(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj)
+static int vboxClipboardTransferObjClose(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj)
 {
     LogFlowFuncEnter();
@@ -373 +373 @@
 }
 
-static int vboxClipboardURIObjRead(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
-                                   void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead)
+static int vboxClipboardTransferObjRead(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
+                                        void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead)
 {
     RT_NOREF(fFlags);
@@ -389 +389 @@
 }
 
-static int vboxClipboardURIObjWrite(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
-                                    void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbWritten)
+static int vboxClipboardTransferObjWrite(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
+                                         void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbWritten)
 {
     RT_NOREF(fFlags);
@@ -660 +660 @@
                         LogFunc(("VBOX_SHCL_FMT_URI_LIST\n"));
 
-                        PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(&pCtx->URI, 0); /** @todo FIX !!! */
+                        PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(&pCtx->TransferCtx, 0); /** @todo FIX !!! */
                         if (pTransfer)
                         {
-                            rc = SharedClipboardWinURITransferCreate(pWinCtx, pTransfer);
+                            rc = SharedClipboardWinTransferCreate(pWinCtx, pTransfer);
 
                             /* Note: The actual requesting + retrieving of data will be done in the IDataObject implementation
@@ -671 +671 @@
                             AssertFailedStmt(rc = VERR_NOT_FOUND);
 
-                        /* Note: SharedClipboardWinURITransferCreate() takes care of closing the clipboard. */
+                        /* Note: SharedClipboardWinTransferCreate() takes care of closing the clipboard. */
                     }
                     else
@@ -773 +773 @@
                else if (uFormat == VBOX_SHCL_FMT_URI_LIST)
                {
-                   LogFunc(("cTransfersRunning=%RU32\n", SharedClipboardURICtxGetRunningTransfers(&pCtx->URI)));
+                   LogFunc(("cTransfersRunning=%RU32\n", SharedClipboardTransferCtxGetRunningTransfers(&pCtx->TransferCtx)));
 
                    int rc = SharedClipboardWinOpen(hwnd);
                    if (RT_SUCCESS(rc))
                    {
-                       PSHCLURITRANSFER pTransfer;
-                       rc = SharedClipboardURITransferCreate(&pTransfer);
+                       PSHCLTRANSFER pTransfer;
+                       rc = SharedClipboardTransferCreate(&pTransfer);
                        if (RT_SUCCESS(rc))
-                           rc = SharedClipboardURITransferInit(pTransfer, 0 /* uID */,
-                                                               SHCLURITRANSFERDIR_WRITE, SHCLSOURCE_LOCAL);
+                           rc = SharedClipboardTransferInit(pTransfer, 0 /* uID */,
+                                                            SHCLTRANSFERDIR_WRITE, SHCLSOURCE_LOCAL);
                        if (RT_SUCCESS(rc))
                        {
@@ -801 +801 @@
                                    if (RT_SUCCESS(rc))
                                    {
-                                       rc = SharedClipboardURILTransferSetRoots(pTransfer,
-                                                                                papszList, cbList + 1 /* Include termination */);
+                                       rc = SharedClipboardTransferLTransferSetRoots(pTransfer,
+                                                                                     papszList, cbList + 1 /* Include termination */);
                                        if (RT_SUCCESS(rc))
                                        {
-                                           PSHCLURIWRITETHREADCTX pThreadCtx
-                                               = (PSHCLURIWRITETHREADCTX)RTMemAllocZ(sizeof(SHCLURIWRITETHREADCTX));
+                                           PSHCLWRITETHREADCTX pThreadCtx
+                                               = (PSHCLWRITETHREADCTX)RTMemAllocZ(sizeof(SHCLWRITETHREADCTX));
                                            if (pThreadCtx)
                                            {
@@ -812 +812 @@
                                                pThreadCtx->pTransfer     = pTransfer;
 
-                                               rc = SharedClipboardURITransferPrepare(pTransfer);
+                                               rc = SharedClipboardTransferPrepare(pTransfer);
                                                if (RT_SUCCESS(rc))
                                                {
-                                                   rc = SharedClipboardURICtxTransferRegister(&pCtx->URI, pTransfer,
-                                                                                              NULL /* puTransferID */);
+                                                   rc = SharedClipboardTransferCtxTransferRegister(&pCtx->TransferCtx, pTransfer,
+                                                                                                   NULL /* puTransferID */);
                                             #if 0
                                                    if (RT_SUCCESS(rc))
                                                    {
-                                                       rc = SharedClipboardURITransferRun(pTransfer, vboxClipboardURIWriteThread,
-                                                                                          pThreadCtx /* pvUser */);
-                                                       /* pThreadCtx now is owned by vboxClipboardURIWriteThread(). */
+                                                       rc = SharedClipboardTransferRun(pTransfer, vboxClipboardTransferWriteThread,
+                                                                                       pThreadCtx /* pvUser */);
+                                                       /* pThreadCtx now is owned by vboxClipboardTransferWriteThread(). */
                                                    }
                                             #endif
@@ -876 +876 @@
 
 #if 0
-       /* The host wants to read URI data. */
+       /* The host wants to read transfer data. */
        case VBOX_CLIPBOARD_WM_URI_START_READ:
        {
            LogFunc(("VBOX_CLIPBOARD_WM_URI_START_READ: cTransfersRunning=%RU32\n",
-                    SharedClipboardURICtxGetRunningTransfers(&pCtx->URI)));
+                    SharedClipboardTransferCtxGetRunningTransfers(&pCtx->URI)));
 
            int rc = SharedClipboardWinOpen(hwnd);
            if (RT_SUCCESS(rc))
            {
-               PSHCLURITRANSFER pTransfer;
-               rc = SharedClipboardURITransferCreate(SHCLURITRANSFERDIR_WRITE,
-                                                     SHCLSOURCE_LOCAL,
-                                                     &pTransfer);
+               PSHCLTRANSFER pTransfer;
+               rc = SharedClipboardTransferCreate(SHCLTRANSFERDIR_WRITE,
+                                                  SHCLSOURCE_LOCAL,
+                                                  &pTransfer);
                if (RT_SUCCESS(rc))
                {
-                   rc = SharedClipboardURICtxTransferAdd(&pCtx->URI, pTransfer);
+                   rc = SharedClipboardTransferCtxTransferAdd(&pCtx->URI, pTransfer);
                    if (RT_SUCCESS(rc))
                    {
@@ -910 +910 @@
                                if (RT_SUCCESS(rc))
                                {
-                                   rc = SharedClipboardURILTransferSetRoots(pTransfer,
-                                                                            papszList, cbList + 1 /* Include termination */);
+                                   rc = SharedClipboardTransferLTransferSetRoots(pTransfer,
+                                                                                 papszList, cbList + 1 /* Include termination */);
                                    if (RT_SUCCESS(rc))
                                    {
-                                       PSHCLURIWRITETHREADCTX pThreadCtx
-                                           = (PSHCLURIWRITETHREADCTX)RTMemAllocZ(sizeof(SHCLURIWRITETHREADCTX));
+                                       PSHCLWRITETHREADCTX pThreadCtx
+                                           = (PSHCLWRITETHREADCTX)RTMemAllocZ(sizeof(SHCLWRITETHREADCTX));
                                        if (pThreadCtx)
                                        {
@@ -921 +921 @@
                                            pThreadCtx->pTransfer     = pTransfer;
 
-                                           rc = SharedClipboardURITransferPrepare(pTransfer);
+                                           rc = SharedClipboardTransferPrepare(pTransfer);
                                            if (RT_SUCCESS(rc))
                                            {
-                                               rc = SharedClipboardURITransferRun(pTransfer, vboxClipboardURIWriteThread,
-                                                                                  pThreadCtx /* pvUser */);
-                                               /* pThreadCtx now is owned by vboxClipboardURIWriteThread(). */
+                                               rc = SharedClipboardTransferRun(pTransfer, vboxClipboardTransferWriteThread,
+                                                                               pThreadCtx /* pvUser */);
+                                               /* pThreadCtx now is owned by vboxClipboardTransferWriteThread(). */
                                            }
                                        }
@@ -953 +953 @@
        }
 
-       /* The host wants to write URI data. */
+       /* The host wants to write transfer data. */
        case VBOX_CLIPBOARD_WM_URI_START_WRITE:
        {
            LogFunc(("VBOX_CLIPBOARD_WM_URI_START_WRITE: cTransfersRunning=%RU32\n",
-                    SharedClipboardURICtxGetRunningTransfers(&pCtx->URI)));
-
-           PSHCLURITRANSFER pTransfer;
-           int rc = SharedClipboardURITransferCreate(SHCLURITRANSFERDIR_READ,
-                                                     SHCLSOURCE_LOCAL,
-                                                     &pTransfer);
+                    SharedClipboardTransferCtxGetRunningTransfers(&pCtx->URI)));
+
+           PSHCLTRANSFER pTransfer;
+           int rc = SharedClipboardTransferCreate(SHCLTRANSFERDIR_READ,
+                                                  SHCLSOURCE_LOCAL,
+                                                  &pTransfer);
            if (RT_SUCCESS(rc))
            {
-               SHCLURITRANSFERCALLBACKS TransferCallbacks;
+               SHCLTRANSFERCALLBACKS TransferCallbacks;
                RT_ZERO(TransferCallbacks);
 
                TransferCallbacks.pvUser              = &pCtx->URI;
-               TransferCallbacks.pfnTransferComplete = vboxClipboardURITransferCompleteCallback;
-               TransferCallbacks.pfnTransferError    = vboxClipboardURITransferErrorCallback;
-
-               SharedClipboardURITransferSetCallbacks(pTransfer, &TransferCallbacks);
+               TransferCallbacks.pfnTransferComplete = vboxClipboardTransferTransferCompleteCallback;
+               TransferCallbacks.pfnTransferError    = vboxClipboardTransferTransferErrorCallback;
+
+               SharedClipboardTransferSetCallbacks(pTransfer, &TransferCallbacks);
 
                SHCLPROVIDERCREATIONCTX creationCtx;
@@ -979 +979 @@
                creationCtx.enmSource = SHCLSOURCE_REMOTE;
 
-               creationCtx.Interface.pfnGetRoots      = vboxClipboardURIGetRoots;
-               creationCtx.Interface.pfnListOpen      = vboxClipboardURIListOpen;
-               creationCtx.Interface.pfnListClose     = vboxClipboardURIListClose;
-               creationCtx.Interface.pfnListHdrRead   = vboxClipboardURIListHdrRead;
-               creationCtx.Interface.pfnListEntryRead = vboxClipboardURIListEntryRead;
-               creationCtx.Interface.pfnObjOpen       = vboxClipboardURIObjOpen;
-               creationCtx.Interface.pfnObjClose      = vboxClipboardURIObjClose;
-               creationCtx.Interface.pfnObjRead       = vboxClipboardURIObjRead;
+               creationCtx.Interface.pfnGetRoots      = vboxClipboardTransferGetRoots;
+               creationCtx.Interface.pfnListOpen      = vboxClipboardTransferListOpen;
+               creationCtx.Interface.pfnListClose     = vboxClipboardTransferListClose;
+               creationCtx.Interface.pfnListHdrRead   = vboxClipboardTransferListHdrRead;
+               creationCtx.Interface.pfnListEntryRead = vboxClipboardTransferListEntryRead;
+               creationCtx.Interface.pfnObjOpen       = vboxClipboardTransferObjOpen;
+               creationCtx.Interface.pfnObjClose      = vboxClipboardTransferObjClose;
+               creationCtx.Interface.pfnObjRead       = vboxClipboardTransferObjRead;
 
                creationCtx.pvUser = pCtx;
 
-               rc = SharedClipboardURITransferSetInterface(pTransfer, &creationCtx);
+               rc = SharedClipboardTransferSetInterface(pTransfer, &creationCtx);
                if (RT_SUCCESS(rc))
                {
-                   rc = SharedClipboardURICtxTransferAdd(&pCtx->URI, pTransfer);
+                   rc = SharedClipboardTransferCtxTransferAdd(&pCtx->URI, pTransfer);
                    if (RT_SUCCESS(rc))
                    {
-                       rc = SharedClipboardURITransferPrepare(pTransfer);
+                       rc = SharedClipboardTransferPrepare(pTransfer);
                        if (RT_SUCCESS(rc))
                        {
-                           rc = SharedClipboardWinURITransferCreate(pWinCtx, pTransfer);
+                           rc = SharedClipboardWinTransferCreate(pWinCtx, pTransfer);
                        }
                    }
@@ -1166 +1166 @@
             {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-                rc = SharedClipboardURICtxInit(&pCtx->URI);
+                rc = SharedClipboardTransferCtxInit(&pCtx->TransferCtx);
                 if (RT_SUCCESS(rc))
 #endif
@@ -1260 +1260 @@
             {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-                rc = VbglR3ClipboardEventGetNextEx(uMsg, cParms, &pCtx->CmdCtx, &pCtx->URI, pEvent);
+                rc = VbglR3ClipboardEventGetNextEx(uMsg, cParms, &pCtx->CmdCtx, &pCtx->TransferCtx, pEvent);
 #else
                 rc = VbglR3ClipboardEventGetNext(uMsg, cParms, &pCtx->CmdCtx, pEvent);
@@ -1372 +1372 @@
     OleUninitialize();
 
-    SharedClipboardURICtxDestroy(&pCtx->URI);
+    SharedClipboardTransferCtxDestroy(&pCtx->TransferCtx);
 #endif