Changeset 85740 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139888

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

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/GuestDnDSourceImpl.h (modified) (1 diff)
• include/GuestDnDTargetImpl.h (modified) (1 diff)
• src-client/GuestDnDSourceImpl.cpp (modified) (1 diff)
• src-client/GuestDnDTargetImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -12881 +12881 @@
   <interface
     name="IDnDBase" extends="$unknown"
-    uuid="4132147b-42f8-cd96-7570-6a8800e3342c"
+    uuid="00727A73-000A-4C4A-006D-E7D300351186"
     wsmap="managed"
     reservedMethods="1" reservedAttributes="2"
@@ -12889 +12889 @@
     <attribute name="formats" type="wstring" safearray="yes" readonly="yes">
       <desc>Returns all supported drag'n drop formats.</desc>
-    </attribute>
-
-    <attribute name="protocolVersion" type="unsigned long" readonly="yes">
-      <desc>Returns the protocol version which is used to communicate
-        with the guest.</desc>
     </attribute>
 

trunk/src/VBox/Main/include/GuestDnDSourceImpl.h

@@ -57 +57 @@
     HRESULT addFormats(const GuestDnDMIMEList &aFormats);
     HRESULT removeFormats(const GuestDnDMIMEList &aFormats);
-
-    HRESULT getProtocolVersion(ULONG *aProtocolVersion);
     /** @}  */
 

trunk/src/VBox/Main/include/GuestDnDTargetImpl.h

@@ -55 +55 @@
     HRESULT addFormats(const GuestDnDMIMEList &aFormats);
     HRESULT removeFormats(const GuestDnDMIMEList &aFormats);
-
-    HRESULT getProtocolVersion(ULONG *aProtocolVersion);
     /** @}  */
 

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 */
 }