Changeset 51620 in vbox for trunk/src

Timestamp:

Jun 16, 2014 10:20:15 AM (10 years ago)

Author:

vboxsync

Message:

DnD: Autocallers, locking.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDSourceImpl.cpp (modified) (4 diffs)
• GuestDnDTargetImpl.cpp (modified) (4 diffs)

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

@@ -102 +102 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     return GuestDnDBase::isFormatSupported(aFormat, aSupported);
 #endif /* VBOX_WITH_DRAG_AND_DROP */
@@ -112 +117 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     return GuestDnDBase::getFormats(aFormats);
 #endif /* VBOX_WITH_DRAG_AND_DROP */
@@ -122 +132 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     return GuestDnDBase::addFormats(aFormats);
 #endif /* VBOX_WITH_DRAG_AND_DROP */
@@ -131 +146 @@
     ReturnComNotImplemented();
 #else /* VBOX_WITH_DRAG_AND_DROP */
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     return GuestDnDBase::removeFormats(aFormats);

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

@@ -101 +101 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     return GuestDnDBase::isFormatSupported(aFormat, aSupported);
 #endif /* VBOX_WITH_DRAG_AND_DROP */
@@ -111 +116 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     return GuestDnDBase::getFormats(aFormats);
 #endif /* VBOX_WITH_DRAG_AND_DROP */
@@ -121 +131 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     return GuestDnDBase::addFormats(aFormats);
 #endif /* VBOX_WITH_DRAG_AND_DROP */
@@ -130 +145 @@
     ReturnComNotImplemented();
 #else /* VBOX_WITH_DRAG_AND_DROP */
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     return GuestDnDBase::removeFormats(aFormats);