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

Timestamp:

Jul 9, 2019 8:14:01 AM (6 years ago)

Author:

vboxsync

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

131932

Message:

Shared Clipboard/URI: Update.

File:

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

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

@@ -70 +70 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+typedef struct _VBOXCLIPBOARDURIREADTHREADCTX
+{
+    PVBOXCLIPBOARDCONTEXT       pClipboardCtx;
+    PSHAREDCLIPBOARDURITRANSFER pTransfer;
+} VBOXCLIPBOARDURIREADTHREADCTX, *PVBOXCLIPBOARDURIREADTHREADCTX;
+
 typedef struct _VBOXCLIPBOARDURIWRITETHREADCTX
 {
@@ -108 +114 @@
     AssertPtr(pCtx);
 
+    PSHAREDCLIPBOARDURITRANSFER pTransfer = pCtx->pTransfer;
+    AssertPtr(pTransfer);
+
+    pTransfer->Thread.fStarted = true;
+
     RTThreadUserSignal(RTThreadSelf());
 
@@ -114 +125 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxClipboardTransferReport Msg;
-        RT_ZERO(Msg);
-
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, uClientID,
-                            VBOX_SHARED_CLIPBOARD_GUEST_FN_TRANSFER_REPORT, VBOX_SHARED_CLIPBOARD_CPARMS_TRANSFER_REPORT);
-
-        Msg.uContext.SetUInt32(0);
-        Msg.uStatus.SetUInt32(0);
-
-        rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
-
+        rc = VbglR3ClipboardTransferSendStatus(uClientID, SHAREDCLIPBOARDURITRANSFERSTATUS_RUNNING);
         if (RT_SUCCESS(rc))
         {
@@ -132 +133 @@
             for (;;)
             {
-                PVBGLR3CLIPBOARDEVENT pEvent;
-                rc = VbglR3ClipboardEventGetNext(uClientID, pCtx->pTransfer, &pEvent);
+                PVBGLR3CLIPBOARDEVENT pEvent = NULL;
+                rc = VbglR3ClipboardEventGetNext(uClientID, pTransfer, &pEvent);
                 if (RT_SUCCESS(rc))
                 {
-                   switch (pEvent->enmType)
-                   {
-                       case VBGLR3CLIPBOARDEVENTTYPE_URI_LIST_HDR_READ:
-                       {
-                           LogFlowFunc(("VBGLR3CLIPBOARDEVENTTYPE_URI_READ_LIST_HDR\n"));
-                           break;
-                       }
-
-                       case VBGLR3CLIPBOARDEVENTTYPE_URI_LIST_ENTRY_READ:
-                       {
-                           LogFlowFunc(("VBGLR3CLIPBOARDEVENTTYPE_URI_READ_LIST_ENTRY\n"));
-                           break;
-                       }
-
-                       case VBGLR3CLIPBOARDEVENTTYPE_URI_OBJ_OPEN:
-                       {
-                           LogFlowFunc(("VBGLR3CLIPBOARDEVENTTYPE_URI_OBJ_OPEN\n"));
-                           break;
-                       }
-
-                       case VBGLR3CLIPBOARDEVENTTYPE_URI_OBJ_CLOSE:
-                       {
-                           LogFlowFunc(("VBGLR3CLIPBOARDEVENTTYPE_URI_OBJ_CLOSE\n"));
-                           break;
-                       }
-
-                       case VBGLR3CLIPBOARDEVENTTYPE_URI_OBJ_READ:
-                       {
-                           LogFlowFunc(("VBGLR3CLIPBOARDEVENTTYPE_URI_OBJ_READ\n"));
-                           break;
-                       }
-
-                       case VBGLR3CLIPBOARDEVENTTYPE_URI_CANCEL:
-                           RT_FALL_THROUGH();
-                       case VBGLR3CLIPBOARDEVENTTYPE_URI_ERROR:
-                           LogFlowFunc(("VBGLR3CLIPBOARDEVENTTYPE_URI_CANCEL / ERROR\n"));
-                           fTerminate = true;
-                           break;
-
-                       default:
-                           rc = VERR_NOT_SUPPORTED;
-                           cErrors++;
-                           break;
-                   }
-
-                   VbglR3ClipboardEventFree(pEvent);
+                    /* Nothing to do in here right now. */
+
+                    VbglR3ClipboardEventFree(pEvent);
                 }
 
@@ -272 +230 @@
 }
 
-static int vboxClipboardURIListHdrRead(PSHAREDCLIPBOARDPROVIDERCTX pCtx, VBOXCLIPBOARDLISTHANDLE hList,
-                                       PVBOXCLIPBOARDLISTHDR pListHdr)
-{
-    RT_NOREF(hList);
+static int vboxClipboardURIListOpen(PSHAREDCLIPBOARDPROVIDERCTX pCtx, PVBOXCLIPBOARDLISTHDR pListHdr,
+                                    PSHAREDCLIPBOARDLISTHANDLE phList)
+{
+    RT_NOREF(pCtx, pListHdr, phList);
 
     LogFlowFuncEnter();
@@ -282 +240 @@
     AssertPtr(pThisCtx);
 
-    LogFlowFunc(("c=%RU32\n", pThisCtx->u32ClientID));
-
-    RT_NOREF(pListHdr);
-    int rc = 0; //VbglR3ClipboardListHdrRead(pThisCtx->u32ClientID, pListHdr);
+    int rc = 0; // VbglR3ClipboardRecvListOpen(pThisCtx->u32ClientID, pListHdr, phList);
 
     LogFlowFuncLeaveRC(rc);
@@ -291 +246 @@
 }
 
-static int vboxClipboardURIListHdrWrite(PSHAREDCLIPBOARDPROVIDERCTX pCtx, VBOXCLIPBOARDLISTHANDLE hList,
-                                        PVBOXCLIPBOARDLISTHDR pListHdr)
-{
+static int vboxClipboardURIListHdrRead(PSHAREDCLIPBOARDPROVIDERCTX pCtx, SHAREDCLIPBOARDLISTHANDLE hList,
+                                       PVBOXCLIPBOARDLISTHDR pListHdr)
+{
+    RT_NOREF(hList);
+
     LogFlowFuncEnter();
 
@@ -299 +256 @@
     AssertPtr(pThisCtx);
 
-    int rc = VbglR3ClipboardSendListHdrWrite(pThisCtx->u32ClientID, hList, pListHdr);
+    LogFlowFunc(("c=%RU32\n", pThisCtx->u32ClientID));
+
+    int rc = SharedClipboardURIListHdrInit(pListHdr);
+    if (RT_SUCCESS(rc))
+    {
+        if (RT_SUCCESS(rc))
+        {
+            //rc = VbglR3ClipboardListHdrReadRecv(pThisCtx->u32ClientID, hList, pListHdr);
+        }
+        else
+            SharedClipboardURIListHdrDestroy(pListHdr);
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -305 +273 @@
 }
 
-static int vboxClipboardURIListEntryRead(PSHAREDCLIPBOARDPROVIDERCTX pCtx, VBOXCLIPBOARDLISTHANDLE hList,
-                                         PVBOXCLIPBOARDLISTENTRY pListEntry)
-{
-    RT_NOREF(hList);
-
+/*
+static int vboxClipboardURIListHdrWrite(PSHAREDCLIPBOARDPROVIDERCTX pCtx, SHAREDCLIPBOARDLISTHANDLE hList,
+                                        PVBOXCLIPBOARDLISTHDR pListHdr)
+{
     LogFlowFuncEnter();
 
@@ -315 +282 @@
     AssertPtr(pThisCtx);
 
+    int rc = VbglR3ClipboardListHdrWrite(pThisCtx->u32ClientID, hList, pListHdr);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}*/
+
+static int vboxClipboardURIListEntryRead(PSHAREDCLIPBOARDPROVIDERCTX pCtx, SHAREDCLIPBOARDLISTHANDLE hList,
+                                         PVBOXCLIPBOARDLISTENTRY pListEntry)
+{
+    RT_NOREF(hList);
+
+    LogFlowFuncEnter();
+
+    PVBOXCLIPBOARDCONTEXT pThisCtx = (PVBOXCLIPBOARDCONTEXT)pCtx->pvUser;
+    AssertPtr(pThisCtx);
+
     RT_NOREF(pListEntry);
     int rc = 0; // VbglR3ClipboardListEntryRead(pThisCtx->u32ClientID, pListEntry);
@@ -322 +305 @@
 }
 
-static int vboxClipboardURIListEntryWrite(PSHAREDCLIPBOARDPROVIDERCTX pCtx, VBOXCLIPBOARDLISTHANDLE hList,
+/*
+static int vboxClipboardURIListEntryWrite(PSHAREDCLIPBOARDPROVIDERCTX pCtx, SHAREDCLIPBOARDLISTHANDLE hList,
                                           PVBOXCLIPBOARDLISTENTRY pListEntry)
 {
@@ -330 +314 @@
     AssertPtr(pThisCtx);
 
-    int rc = VbglR3ClipboardSendListEntryWrite(pThisCtx->u32ClientID, hList, pListEntry);
+    int rc = VbglR3ClipboardListEntryWrite(pThisCtx->u32ClientID, hList, pListEntry);
 
     LogFlowFuncLeaveRC(rc);
     return rc;
 }
+*/
 
 static int vboxClipboardURIObjOpen(PSHAREDCLIPBOARDPROVIDERCTX pCtx, const char *pszPath,
@@ -636 +621 @@
                    VBoxClipboardWinClear();
 
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+#if 0
                    if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
                    {
@@ -671 +656 @@
                            creationCtx.pvUser = pCtx;
 
-                           rc = SharedClipboardURITransferProviderCreate(pTransfer, &creationCtx);
+                           rc = SharedClipboardURITransferSetInterface(pTransfer, &creationCtx);
                            if (RT_SUCCESS(rc))
                            {
@@ -690 +675 @@
 
                        VBoxClipboardWinClose();
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+#if 0
                    }
 #endif
@@ -802 +787 @@
                if (RT_SUCCESS(rc))
                {
+            #if 0
                    SHAREDCLIPBOARDURITRANSFERCALLBACKS TransferCallbacks;
                    RT_ZERO(TransferCallbacks);
@@ -824 +810 @@
                    creationCtx.pvUser = pCtx;
 
-                   rc = SharedClipboardURITransferProviderCreate(pTransfer, &creationCtx);
+                   rc = SharedClipboardURITransferSetInterface(pTransfer, &creationCtx);
                    if (RT_SUCCESS(rc))
                    {
+            #endif
                        rc = SharedClipboardURICtxTransferAdd(&pCtx->URI, pTransfer);
                        if (RT_SUCCESS(rc))
@@ -880 +867 @@
                            }
                        }
-                   }
+                   //}
                }
 
@@ -891 +878 @@
        }
 
+       /* The host wants to write URI data. */
        case VBOX_CLIPBOARD_WM_URI_START_WRITE:
        {
            LogFunc(("VBOX_CLIPBOARD_WM_URI_START_WRITE: cTransfersRunning=%RU32\n",
                     SharedClipboardURICtxGetRunningTransfers(&pCtx->URI)));
+
+           PSHAREDCLIPBOARDURITRANSFER pTransfer;
+           int rc = SharedClipboardURITransferCreate(SHAREDCLIPBOARDURITRANSFERDIR_READ,
+                                                     SHAREDCLIPBOARDSOURCE_LOCAL,
+                                                     &pTransfer);
+           if (RT_SUCCESS(rc))
+           {
+               SHAREDCLIPBOARDURITRANSFERCALLBACKS TransferCallbacks;
+               RT_ZERO(TransferCallbacks);
+
+               TransferCallbacks.pvUser              = &pCtx->URI;
+               TransferCallbacks.pfnTransferComplete = vboxClipboardURITransferCompleteCallback;
+               TransferCallbacks.pfnTransferError    = vboxClipboardURITransferErrorCallback;
+
+               SharedClipboardURITransferSetCallbacks(pTransfer, &TransferCallbacks);
+
+               SHAREDCLIPBOARDPROVIDERCREATIONCTX creationCtx;
+               RT_ZERO(creationCtx);
+               creationCtx.enmSource = SHAREDCLIPBOARDSOURCE_REMOTE;
+
+               RT_ZERO(creationCtx.Interface);
+               creationCtx.Interface.pfnListHdrRead   = vboxClipboardURIListHdrRead;
+               creationCtx.Interface.pfnListEntryRead = vboxClipboardURIListEntryRead;
+               creationCtx.Interface.pfnObjOpen       = vboxClipboardURIObjOpen;
+               creationCtx.Interface.pfnObjClose      = vboxClipboardURIObjClose;
+               creationCtx.Interface.pfnObjRead       = vboxClipboardURIObjRead;
+
+               creationCtx.pvUser = pCtx;
+
+               rc = SharedClipboardURITransferSetInterface(pTransfer, &creationCtx);
+               if (RT_SUCCESS(rc))
+               {
+                   rc = SharedClipboardURICtxTransferAdd(&pCtx->URI, pTransfer);
+                   if (RT_SUCCESS(rc))
+                   {
+                       if (RT_SUCCESS(rc))
+                       {
+                           rc = SharedClipboardURITransferPrepare(pTransfer);
+                           if (RT_SUCCESS(rc))
+                           {
+                               rc = VBoxClipboardWinURITransferCreate(pWinCtx, pTransfer);
+                           }
+                       }
+                   }
+               }
+           }
 
            break;