Changeset 50636 in vbox

Timestamp:

Feb 27, 2014 6:46:50 PM (11 years ago)

Author:

vboxsync

Message:

DnD/HostService: Defer client calls if drag'n drop mode is set to disabled.

File:

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

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

@@ -193 +193 @@
 
     /* Check if we've the right mode set. */
-    bool fIgnoreRequest = true; /* Play safe. */
+    int rc = VERR_ACCESS_DENIED; /* Play safe. */
     switch (u32Function)
     {
@@ -199 +199 @@
             if (modeGet() != VBOX_DRAG_AND_DROP_MODE_OFF)
             {
-                fIgnoreRequest = false;
+                rc = VINF_SUCCESS;
             }
             else
-                LogFlowFunc(("Drag'n drop disabled, ignoring request\n"));
+            {
+                LogFlowFunc(("DnD disabled, deferring request\n"));
+                rc = VINF_HGCM_ASYNC_EXECUTE;
+            }
             break;
         case DragAndDropSvc::GUEST_DND_HG_ACK_OP:
@@ -209 +212 @@
                 || modeGet() == VBOX_DRAG_AND_DROP_MODE_HOST_TO_GUEST)
             {
-                fIgnoreRequest = false;
+                rc = VINF_SUCCESS;
             }
             else
-                LogFlowFunc(("Host -> guest DnD mode disabled, ignoring request\n"));
+                LogFlowFunc(("Host -> Guest DnD mode disabled, ignoring request\n"));
             break;
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
         case DragAndDropSvc::GUEST_DND_GH_ACK_PENDING:
         case DragAndDropSvc::GUEST_DND_GH_SND_DATA:
@@ -220 +222 @@
         case DragAndDropSvc::GUEST_DND_GH_SND_FILE:
         case DragAndDropSvc::GUEST_DND_GH_EVT_ERROR:
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
             if (   modeGet() == VBOX_DRAG_AND_DROP_MODE_BIDIRECTIONAL
                 || modeGet() == VBOX_DRAG_AND_DROP_MODE_GUEST_TO_HOST)
             {
-                fIgnoreRequest = false;
+                rc = VINF_SUCCESS;
             }
             else
-                LogFlowFunc(("Guest -> host DnD mode disabled, ignoring request\n"));
+#endif
+                LogFlowFunc(("Guest -> Host DnD mode disabled, ignoring request\n"));
             break;
-#endif
         default:
             /* Reach through to DnD manager. */
-            fIgnoreRequest = false;
+            rc = VINF_SUCCESS;
             break;
     }
 
-    int rc;
-    if (!fIgnoreRequest)
+#ifdef DEBUG_andy
+    LogFlowFunc(("Mode check rc=%Rrc\n", rc));
+#endif
+
+    if (rc == VINF_SUCCESS) /* Note: rc might be VINF_HGCM_ASYNC_EXECUTE! */
     {
         switch (u32Function)
@@ -259 +265 @@
                         && paParms[2].u.uint32) /* Blocking? */
                     {
-                        m_clientQueue.append(new HGCM::Client(u32ClientID, callHandle,
-                                                              u32Function, cParms, paParms));
+                        /* Defer client returning. */
                         rc = VINF_HGCM_ASYNC_EXECUTE;
                     }
@@ -276 +281 @@
                     DragAndDropSvc::VBOXDNDCBHGACKOPDATA data;
                     data.hdr.u32Magic = DragAndDropSvc::CB_MAGIC_DND_HG_ACK_OP;
-                    paParms[0].getUInt32(&data.uAction);
-                    if (m_pfnHostCallback)
-                        rc = m_pfnHostCallback(m_pvHostData, u32Function, &data, sizeof(data));
-    //                m_pHelpers->pfnCallComplete(callHandle, rc);
+                    paParms[0].getUInt32(&data.uAction); /* Get drop action. */
+                    if (m_pfnHostCallback)
+                        rc = m_pfnHostCallback(m_pvHostData, u32Function, &data, sizeof(data));
                 }
                 break;
@@ -297 +301 @@
                     if (m_pfnHostCallback)
                         rc = m_pfnHostCallback(m_pvHostData, u32Function, &data, sizeof(data));
-    //                m_pHelpers->pfnCallComplete(callHandle, rc);
-    //                if (data.pszFormat)
-    //                    RTMemFree(data.pszFormat);
-    //                if (data.pszTmpPath)
-    //                    RTMemFree(data.pszTmpPath);
                 }
                 break;
@@ -428 +427 @@
         }
     }
-    else
-        rc = VERR_ACCESS_DENIED;
-
-    /* If async execute is requested, we didn't notify the guest about
+
+    /* If async execution is requested, we didn't notify the guest yet about
      * completion. The client is queued into the waiters list and will be
      * notified as soon as a new event is available. */
+    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)