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

Timestamp:

Aug 13, 2020 7:14:45 AM (4 years ago)

Author:

vboxsync

Message:

DnD/Main: Got rid of protocol-guessing via Guest Additions version and pass down the reported (now marked as deprecated) protocol version and guest feature bits to Main.

Location:

trunk/src/VBox/Main/src-client

Files:

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

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

@@ -250 +250 @@
 
     return GuestDnDBase::i_removeFormats(aFormats);
-#endif /* VBOX_WITH_DRAG_AND_DROP */
-}
-
-HRESULT GuestDnDSource::getProtocolVersion(ULONG *aProtocolVersion)
-{
-#if !defined(VBOX_WITH_DRAG_AND_DROP)
-    ReturnComNotImplemented();
-#else /* VBOX_WITH_DRAG_AND_DROP */
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aProtocolVersion = m_pResp->m_uProtocolVersion;
-
-    return S_OK;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 }

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

@@ -248 +248 @@
 
     return GuestDnDBase::i_removeFormats(aFormats);
-#endif /* VBOX_WITH_DRAG_AND_DROP */
-}
-
-HRESULT GuestDnDTarget::getProtocolVersion(ULONG *aProtocolVersion)
-{
-#if !defined(VBOX_WITH_DRAG_AND_DROP)
-    ReturnComNotImplemented();
-#else /* VBOX_WITH_DRAG_AND_DROP */
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aProtocolVersion = m_pResp->m_uProtocolVersion;
-
-    return S_OK;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 }