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

Timestamp:

Sep 26, 2018 11:59:53 AM (6 years ago)

Author:

vboxsync

Message:

DnD/VBoxTray: Various fixes for the internal message handling.

File:

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

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

@@ -650 +650 @@
             }
 
-            VbglR3DnDEventFree(pEvent->pVbglR3Event);
-            pEvent->pVbglR3Event = NULL;
+            if (pEvent)
+            {
+                VbglR3DnDEventFree(pEvent->pVbglR3Event);
+                pEvent->pVbglR3Event = NULL;
+
+                RTMemFree(pEvent);
+            }
 
             return 0;
@@ -1815 +1820 @@
         if (RT_FAILURE(rc))
         {
-            VbglR3DnDEventFree(pVbglR3Event);
-            pVbglR3Event = NULL;
+            if (pEvent)
+            {
+                VbglR3DnDEventFree(pEvent->pVbglR3Event);
+
+                RTMemFree(pEvent);
+                pEvent = NULL;
+            }
 
             LogFlowFunc(("Processing next message failed with rc=%Rrc\n", rc));
@@ -1823 +1833 @@
              * don't support the stuff we do on the guest side, so make sure we
              * don't process invalid messages forever. */
-            if (rc == VERR_INVALID_PARAMETER)
-                cMsgSkippedInvalid++;
-            if (cMsgSkippedInvalid > 32)
+            if (cMsgSkippedInvalid++ > 32)
             {
                 LogRel(("DnD: Too many invalid/skipped messages from host, exiting ...\n"));
@@ -1834 +1842 @@
              * not block the guest's UI. */
             pWnd->Reset();
-
-            int rc2 = VbglR3DnDGHSendError(&pCtx->cmdCtx, rc);
-            if (RT_FAILURE(rc2))
-            {
-                /* Ignore the following errors reported back from the host. */
-                if (   rc2 != VERR_NOT_SUPPORTED
-                    && rc2 != VERR_NOT_IMPLEMENTED)
-                {
-                    LogRel(("DnD: Could not report error %Rrc back to host: %Rrc\n", rc, rc2));
-                }
-            }
         }
 
@@ -1859 +1856 @@
     if (pEvent)
     {
+        VbglR3DnDEventFree(pEvent->pVbglR3Event);
+
         RTMemFree(pEvent);
         pEvent = NULL;