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

Timestamp:

Apr 30, 2015 5:04:37 PM (10 years ago)

Author:

vboxsync

Message:

DnD: Simplified cancellation logic.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxDnD.cpp (modified) (2 diffs)
• common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (1 diff)
• x11/VBoxClient/draganddrop.cpp (modified) (7 diffs)

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

@@ -1424 +1424 @@
     /*
      * 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,
+     *       on class creation. We might later want to modify the allowed formats at runtime,
      *       so keep this in mind when implementing this.
      */
@@ -1665 +1665 @@
              * don't support the stuff we do on the guest side, so make sure we
              * don't process invalid messages forever. */
-            if (cMsgSkippedInvalid++ > 3)
+            if (rc == VERR_INVALID_PARAMETER)
+                cMsgSkippedInvalid++;
+            if (cMsgSkippedInvalid > 32)
             {
                 LogRel(("DnD: Too many invalid/skipped messages from host, exiting ...\n"));

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

@@ -552 +552 @@
             }
 
-#if 0
+#if 0 /* Not used yet. */
             if (pCtx->uProtocol >= XXX)
             {

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

@@ -1184 +1184 @@
      * Do we have a new window which now is under the cursor?
      */
-    if (   wndCursor != m_wndCur 
+    if (   wndCursor != m_wndCur
         && newVer    != -1)
     {
@@ -1338 +1338 @@
     if (RT_UNLIKELY(xrc == 0))
     {
-        logError(("Error sending SelectionNotify event to window=%#x: %s\n", 
+        logError(("Error sending SelectionNotify event to window=%#x: %s\n",
                   s.xselection.requestor, gX11->xErrorToString(xrc).c_str()));
     }
@@ -1448 +1448 @@
                 }
 
-                /* 
+                /*
                  * Acknowledge the event by sending a status message back to the window.
                  */
@@ -1466 +1466 @@
                 if (RT_UNLIKELY(xRc == 0))
                 {
-                    logError(("Error sending enter XA_XdndStatus to current window=%#x: %s\n", 
+                    logError(("Error sending enter XA_XdndStatus to current window=%#x: %s\n",
                               m_wndCur, gX11->xErrorToString(xRc).c_str()));
                 }
@@ -1492 +1492 @@
                 if (RT_UNLIKELY(xRc == 0))
                 {
-                    logError(("Error sending position XA_XdndStatus to current window=%#x: %s\n", 
+                    logError(("Error sending position XA_XdndStatus to current window=%#x: %s\n",
                               m_wndCur, gX11->xErrorToString(xRc).c_str()));
                 }
@@ -1691 +1691 @@
                     if (RT_UNLIKELY(xrc == 0))
                     {
-                        logError(("Error sending XA_XdndFinished to proxy window=%#x: %s\n", 
+                        logError(("Error sending XA_XdndFinished to proxy window=%#x: %s\n",
                                   m_wndProxy, gX11->xErrorToString(xrc).c_str()));
                     }
@@ -2326 +2326 @@
             if (rc == VERR_INVALID_PARAMETER)
                 cMsgSkippedInvalid++;
-            if (cMsgSkippedInvalid > 3)
+            if (cMsgSkippedInvalid > 32)
             {
                 LogRel(("DnD: Too many invalid/skipped messages from host, exiting ...\n"));