Changeset 57286 in vbox for trunk/src/VBox/HostServices/DragAndDrop/service.cpp

Timestamp:

Aug 12, 2015 11:33:22 AM (9 years ago)

Author:

vboxsync

Message:

DnD/HostService: Check for bad_alloc, report if host callbacks are missing, logging.

File:

• trunk/src/VBox/HostServices/DragAndDrop/service.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/DragAndDrop/service.cpp

@@ -371 +371 @@
                             }
                         }
-                        else
-                            rc = VERR_NOT_FOUND;
+                        else /* No host callback in place, so drag and drop is not supported by the host. */
+                            rc = VERR_NOT_SUPPORTED;
 
                         if (RT_FAILURE(rc))
                             rc = m_pManager->nextMessage(u32Function, cParms, paParms);
 
-                        /* Some error occurred? */
-                        if (   RT_FAILURE(rc)
-                            && paParms[2].u.uint32) /* Blocking flag set? */
+                        /* Some error occurred or no (new) messages available? */
+                        if (RT_FAILURE(rc))
                         {
-                            /* Defer client returning. */
-                            rc = VINF_HGCM_ASYNC_EXECUTE;
+                            if (paParms[2].u.uint32) /* Blocking flag set? */
+                            {
+                                /* Defer client returning. */
+                                rc = VINF_HGCM_ASYNC_EXECUTE;
+                            }
+
+                            LogFlowFunc(("Message queue is empty, returning %Rrc to guest\n", rc));
                         }
                     }
@@ -666 +670 @@
                         }
                     }
+                    else /* No host callback in place, so drag and drop is not supported by the host. */
+                        rc = VERR_NOT_SUPPORTED;
                 }
                 break;
@@ -679 +685 @@
     if (rc == VINF_HGCM_ASYNC_EXECUTE)
     {
-        m_clientQueue.append(new HGCM::Client(u32ClientID, callHandle,
-                                              u32Function, cParms, paParms));
-    }
-
-    if (   rc != VINF_HGCM_ASYNC_EXECUTE
-        && m_pHelpers)
-    {
+        try
+        {
+            LogFlowFunc(("Deferring guest call completion of client ID=%RU32\n", u32ClientID));
+            m_clientQueue.append(new HGCM::Client(u32ClientID, callHandle,
+                                                  u32Function, cParms, paParms));
+        }
+        catch (std::bad_alloc)
+        {
+            rc = VERR_NO_MEMORY;
+            /* Don't report to guest. */
+        }
+    }
+    else if (m_pHelpers)
+    {
+        /* Complete call on guest side. */
         m_pHelpers->pfnCallComplete(callHandle, rc);
     }
+    else
+        rc = VERR_NOT_IMPLEMENTED;
 
     LogFlowFunc(("Returning rc=%Rrc\n", rc));