Changeset 74492 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Sep 27, 2018 11:40:40 AM (6 years ago)

Author:

vboxsync

Message:

DnD/Main: Made sure that the active flag of PRECVDATACTX / PSENDDATACTX is set correctly.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDSourceImpl.cpp (modified) (1 diff)
• GuestDnDTargetImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -957 +957 @@
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
 
+    GuestDnD *pInst = GuestDnDInst();
+    if (!pInst)
+        return VERR_INVALID_POINTER;
+
+    GuestDnDResponse *pResp = pCtx->mpResp;
+    AssertPtr(pCtx->mpResp);
+
+    int rc = pCtx->mCBEvent.Reset();
+    if (RT_FAILURE(rc))
+        return rc;
+
     /* Is this context already in receiving state? */
     if (ASMAtomicReadBool(&pCtx->mIsActive))
         return VERR_WRONG_ORDER;
     ASMAtomicWriteBool(&pCtx->mIsActive, true);
-
-    GuestDnD *pInst = GuestDnDInst();
-    if (!pInst)
-        return VERR_INVALID_POINTER;
-
-    GuestDnDResponse *pResp = pCtx->mpResp;
-    AssertPtr(pCtx->mpResp);
-
-    int rc = pCtx->mCBEvent.Reset();
-    if (RT_FAILURE(rc))
-        return rc;
 
     /*

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -790 +790 @@
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
 
-    int rc;
-
+    /* Is this context already in sending state? */
+    if (ASMAtomicReadBool(&pCtx->mIsActive))
+        return VERR_WRONG_ORDER;
     ASMAtomicWriteBool(&pCtx->mIsActive, true);
 
@@ -807 +808 @@
      *
      ** @todo Support more than one format; add a format<->function handler concept. Later. */
+    int rc;
     bool fHasURIList = std::find(m_lstFmtOffered.begin(),
                                  m_lstFmtOffered.end(), "text/uri-list") != m_lstFmtOffered.end();