Changeset 56671 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 29, 2015 11:14:58 AM (10 years ago)

Author:

vboxsync

Message:

DnD/VBoxClient: Initialize empty format string in ghIsDnDPending(), logging.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -1961 +1961 @@
     {
         strFormats   = gX11->xAtomListToString(m_lstFormats);
+        if (strFormats.isEmpty())
+            strFormats = "\r\n";        /** @todo If empty, IOCTL fails with VERR_ACCESS_DENIED. */
         uDefAction   = DND_COPY_ACTION; /** @todo Handle default action! */
         uAllActions  = DND_COPY_ACTION; /** @todo Ditto. */
@@ -1969 +1971 @@
 
     rc2 = VbglR3DnDGHAcknowledgePending(&m_dndCtx, uDefAction, uAllActions, strFormats.c_str());
-    LogFlowThisFunc(("Pending status to host: uClientID=%RU32, uDefAction=0x%x, allActions=0x%x, strFormats=%s, rc=%Rrc\n",
+    LogFlowThisFunc(("uClientID=%RU32, uDefAction=0x%x, allActions=0x%x, strFormats=%s, rc=%Rrc\n",
                      m_dndCtx.uClientID, uDefAction, uAllActions, strFormats.c_str(), rc2));
-    if (RT_SUCCESS(rc))
-        rc = rc2;
+    if (RT_FAILURE(rc2))
+    {
+        logError("Error reporting pending drag and drop operation status to host: %Rrc\n", rc2);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
 
     if (RT_FAILURE(rc)) /* Start over on failure. */