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

Timestamp:

Jul 10, 2019 1:02:50 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: More code for root entries handling.

File:

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

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

@@ -80 +80 @@
     PVBOXCLIPBOARDCONTEXT       pClipboardCtx;
     PSHAREDCLIPBOARDURITRANSFER pTransfer;
-    char                       *papszURIList;
-    uint32_t                    cbURIList;
 } VBOXCLIPBOARDURIWRITETHREADCTX, *PVBOXCLIPBOARDURIWRITETHREADCTX;
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
@@ -156 +154 @@
         VbglR3ClipboardDisconnect(uClientID);
     }
-
-    if (pCtx->papszURIList)
-        RTStrFree(pCtx->papszURIList);
 
     RTMemFree(pCtx);
@@ -787 +782 @@
                if (RT_SUCCESS(rc))
                {
-            #if 0
-                   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_LOCAL;
-
-                   RT_ZERO(creationCtx.Interface);
-                   creationCtx.Interface.pfnListHdrWrite   = vboxClipboardURIListHdrWrite;
-                   creationCtx.Interface.pfnListEntryWrite = vboxClipboardURIListEntryWrite;
-                   creationCtx.Interface.pfnObjOpen        = vboxClipboardURIObjOpen;
-                   creationCtx.Interface.pfnObjClose       = vboxClipboardURIObjClose;
-                   creationCtx.Interface.pfnObjWrite       = vboxClipboardURIObjWrite;
-
-                   creationCtx.pvUser = pCtx;
-
-                   rc = SharedClipboardURITransferSetInterface(pTransfer, &creationCtx);
+                   rc = SharedClipboardURICtxTransferAdd(&pCtx->URI, pTransfer);
                    if (RT_SUCCESS(rc))
                    {
-            #endif
-                       rc = SharedClipboardURICtxTransferAdd(&pCtx->URI, pTransfer);
-                       if (RT_SUCCESS(rc))
+                       /* The data data in CF_HDROP format, as the files are locally present and don't need to be
+                       * presented as a IDataObject or IStream. */
+                       HANDLE hClip = hClip = GetClipboardData(CF_HDROP);
+                       if (hClip)
                        {
-                           /* The data data in CF_HDROP format, as the files are locally present and don't need to be
-                           * presented as a IDataObject or IStream. */
-                           HANDLE hClip = hClip = GetClipboardData(CF_HDROP);
-                           if (hClip)
+                           HDROP hDrop = (HDROP)GlobalLock(hClip);
+                           if (hDrop)
                            {
-                               HDROP hDrop = (HDROP)GlobalLock(hClip);
-                               if (hDrop)
+                               char    *papszList;
+                               uint32_t cbList;
+                               rc = VBoxClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
+
+                               GlobalUnlock(hClip);
+
+                               if (RT_SUCCESS(rc))
                                {
-                                   char    *papszList;
-                                   uint32_t cbList;
-                                   rc = VBoxClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
+                                   rc = SharedClipboardURILTransferSetRoots(pTransfer, papszList, cbList);
                                    if (RT_SUCCESS(rc))
                                    {
@@ -836 +810 @@
                                            pThreadCtx->pClipboardCtx = pCtx;
                                            pThreadCtx->pTransfer     = pTransfer;
-                                           pThreadCtx->papszURIList  = papszList;
-                                           pThreadCtx->cbURIList     = cbList;
-
-                                           GlobalUnlock(hClip);
-
+
+                                           rc = SharedClipboardURITransferPrepare(pTransfer);
                                            if (RT_SUCCESS(rc))
                                            {
-                                               rc = SharedClipboardURITransferPrepare(pTransfer);
-                                               if (RT_SUCCESS(rc))
-                                               {
-                                                   rc = SharedClipboardURITransferRun(pTransfer, vboxClipboardURIWriteThread,
-                                                                                      pThreadCtx /* pvUser */);
-                                                   /* pThreadCtx now is owned by vboxClipboardURIWriteThread(). */
-                                               }
+                                               rc = SharedClipboardURITransferRun(pTransfer, vboxClipboardURIWriteThread,
+                                                                                  pThreadCtx /* pvUser */);
+                                               /* pThreadCtx now is owned by vboxClipboardURIWriteThread(). */
                                            }
                                        }
                                        else
                                            rc = VERR_NO_MEMORY;
-
-                                       if (RT_FAILURE(rc))
-                                       {
-                                           RTStrFree(papszList);
-                                       }
                                    }
-                               }
-                               else
-                               {
-                                   hClip = NULL;
+
+                                   if (papszList)
+                                       RTStrFree(papszList);
                                }
                            }
+                           else
+                           {
+                               hClip = NULL;
+                           }
                        }
-                   //}
+                   }
                }