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

Timestamp:

Sep 19, 2019 1:12:34 PM (5 years ago)

Author:

vboxsync

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

133482

Message:

Shared Clipboard/Transfers: Update.

File:

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

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

@@ -161 +161 @@
 #endif
 
+/**
+ * Cleanup helper function for transfer callbacks.
+ *
+ * @param   pData               Callback data to cleanup.
+ */
 static void vboxClipboardTransferCallbackCleanup(PSHCLTRANSFERCALLBACKDATA pData)
 {
@@ -194 +199 @@
     if (RT_SUCCESS(rc))
     {
-        PSHCLTRANSFER pTransfer;
-        rc = SharedClipboardTransferCreate(&pTransfer);
-        if (RT_SUCCESS(rc))
-            rc = SharedClipboardTransferInit(pTransfer, 0 /* uID */,
-                                             SHCLTRANSFERDIR_WRITE, SHCLSOURCE_LOCAL);
-        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 = NULL;
+                uint32_t cbList;
+                rc = SharedClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
+
+                GlobalUnlock(hClip);
+
+                if (RT_SUCCESS(rc))
                 {
-                    char    *papszList = NULL;
-                    uint32_t cbList;
-                    rc = SharedClipboardWinDropFilesToStringList((DROPFILES *)hDrop, &papszList, &cbList);
-
-                    GlobalUnlock(hClip);
-
-                    if (RT_SUCCESS(rc))
-                    {
-                        rc = SharedClipboardTransferRootsSet(pTransfer,
-                                                             papszList, cbList + 1 /* Include termination */);
-                        RTStrFree(papszList);
-                    }
+                    rc = SharedClipboardTransferRootsSet(pData->pTransfer,
+                                                         papszList, cbList + 1 /* Include termination */);
+                    RTStrFree(papszList);
                 }
-                else
-                {
-                    hClip = NULL;
-                }
+            }
+            else
+            {
+                hClip = NULL;
             }
         }