Changeset 55091 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

Timestamp:

Apr 2, 2015 12:32:40 PM (10 years ago)

Author:

vboxsync

Message:

VBoxTray/VBoxDnD: Fixed a crash + format detection.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (modified) (5 diffs)

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

@@ -78 +78 @@
     RT_ZERO(startupInfo);
 
+    LogFlowFunc(("Supported formats:\n"));
     const RTCString arrEntries[] = { VBOX_DND_FORMATS_DEFAULT };
     for (size_t i = 0; i < RT_ELEMENTS(arrEntries); i++)
+    {
+        LogFlowFunc(("\t%s\n", arrEntries[i].c_str()));
         this->lstAllowedFormats.append(arrEntries[i]);
+    }
 }
 
@@ -755 +759 @@
     for (size_t i = 0; i < lstFormats.size(); i++)
     {
-        bool fSupported = this->lstAllowedFormats.contains(lstFormats.at(i));
-        if (fSupported)
-            this->lstFormats.append(lstFormats.at(i));
+        bool fSupported = false;
+        for (size_t a = 0; a < this->lstAllowedFormats.size(); a++)
+        {
+            LogFlowThisFunc(("\t\"%s\" <=> \"%s\"\n", this->lstAllowedFormats.at(a).c_str(), lstFormats.at(i).c_str()));
+            fSupported = RTStrICmp(this->lstAllowedFormats.at(a).c_str(), lstFormats.at(i).c_str()) == 0;
+            if (fSupported)
+            {
+                this->lstFormats.append(lstFormats.at(i));
+                break;
+            }
+        }
+
         LogFlowThisFunc(("\t%s: %RTbool\n", lstFormats.at(i).c_str(), fSupported));
     }
+
+    /*
+     * Warn in the log if this guest does not accept anything.
+     */
+    if (!this->lstFormats.size())
+        LogRel(("DnD: Warning: No supported drag'n drop formats on the guest found!\n"));
 
     /*
@@ -767 +786 @@
     try
     {
-        /* Translate our drop actions into
-         * allowed Windows drop effects. */
+        /* Translate our drop actions into allowed Windows drop effects. */
         startupInfo.dwOKEffects = DROPEFFECT_NONE;
         if (uAllActions)
@@ -886 +904 @@
     if (mState == Dragging)
     {
-        Assert(lstFormats.size() >= 1);
-
-        /** @todo What to do when multiple formats are available? */
-        mFormatRequested = lstFormats.at(0);
-
-        rc = RTCritSectEnter(&mCritSect);
-        if (RT_SUCCESS(rc))
-        {
-            if (startupInfo.pDataObject)
-                startupInfo.pDataObject->SetStatus(VBoxDnDDataObject::Dropping);
-            else
-                rc = VERR_NOT_FOUND;
-
-            RTCritSectLeave(&mCritSect);
-        }
-
-        if (RT_SUCCESS(rc))
-        {
-            LogRel(("DnD: Requesting data as '%s' ...\n", mFormatRequested.c_str()));
-            rc = VbglR3DnDHGRequestData(mClientID, mFormatRequested.c_str());
-            if (RT_FAILURE(rc))
-                LogFlowThisFunc(("Requesting data failed with rc=%Rrc\n", rc));
-        }
+        if (lstFormats.size() >= 1)
+        {
+            /** @todo What to do when multiple formats are available? */
+            mFormatRequested = lstFormats.at(0);
+
+            rc = RTCritSectEnter(&mCritSect);
+            if (RT_SUCCESS(rc))
+            {
+                if (startupInfo.pDataObject)
+                    startupInfo.pDataObject->SetStatus(VBoxDnDDataObject::Dropping);
+                else
+                    rc = VERR_NOT_FOUND;
+
+                RTCritSectLeave(&mCritSect);
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                LogRel(("DnD: Requesting data as '%s' ...\n", mFormatRequested.c_str()));
+                rc = VbglR3DnDHGRequestData(mClientID, mFormatRequested.c_str());
+                if (RT_FAILURE(rc))
+                    LogFlowThisFunc(("Requesting data failed with rc=%Rrc\n", rc));
+            }
+        }
+        else /* Should never happen. */
+            LogRel(("DnD: Error: Host did not specify a data format for drop data\n"));
     }
 
@@ -1404 +1425 @@
                      mMode, mState));
 
-    lstAllowedFormats.clear();
-    lstFormats.clear();
-    uAllActions = DND_IGNORE_ACTION;
+    /*
+     * Note: Don't clear this->lstAllowedFormats at the moment, as this value is initialized
+     *       on class creation. We might later want to modify the allowed formats in runtime,
+     *       so keep this in mind when implementing this.
+     */
+
+    this->lstFormats.clear();
+    this->uAllActions = DND_IGNORE_ACTION;
 
     int rc2 = setMode(Unknown);