Changeset 56652 in vbox for trunk/src/VBox

Timestamp:

Jun 26, 2015 8:28:09 AM (9 years ago)

Author:

vboxsync

Message:

DnD/VbglR3: Also support non URI-data transfers, logging.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -782 +782 @@
     }
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -818 +819 @@
         AssertPtr(pcbFormatRecv);
         if (DnDMIMEHasFileURLs(pszFormat, *pcbFormatRecv))
-        {
             rc = vbglR3DnDHGProcessURIMessages(pCtx,
                                                ppvData,
                                                cbData,
                                                pcbDataRecv);
-        }
-        else
-            rc = VERR_NOT_SUPPORTED;
-
         if (RT_FAILURE(rc))
         {
-            if (RT_FAILURE(rc))
-            {
-                int rc2 = VbglR3DnDHGSetProgress(pCtx, DragAndDropSvc::DND_PROGRESS_ERROR, 100 /* Percent */, rc);
-                AssertRC(rc2);
-            }
-        }
-    }
-
+            int rc2 = VbglR3DnDHGSetProgress(pCtx, DragAndDropSvc::DND_PROGRESS_ERROR, 100 /* Percent */, rc);
+            AssertRC(rc2);
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }