Changeset 36423 in vbox for trunk/include/VBox

Timestamp:

Mar 25, 2011 11:14:52 AM (14 years ago)

Author:

vboxsync

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

70785

Message:

VRDE.h: note about UTF8 USB descriptor strings. Minor updates for 4th version of VRDE interface

File:

• trunk/include/VBox/RemoteDesktop/VRDE.h (modified) (3 diffs)

trunk/include/VBox/RemoteDesktop/VRDE.h

@@ -428 +428 @@
     /** Revision, integer part. */
     uint16_t        bcdRev;
-    /** Manufacturer string. */
+    /** Offset of the UTF8 manufacturer string relative to the structure start. */
     uint16_t        oManufacturer;
-    /** Product string. */
+    /** Offset of the UTF8 product string relative to the structure start. */
     uint16_t        oProduct;
-    /** Serial number string. */
+    /** Offset of the UTF8 serial number string relative to the structure start. */
     uint16_t        oSerialNumber;
     /** Physical USB port the device is connected to. */
@@ -588 +588 @@
 #define VRDE_INTERFACE_VERSION_2 (2)
 #define VRDE_INTERFACE_VERSION_3 (3)
+#define VRDE_INTERFACE_VERSION_4 (4)
 
 /** The header that does not change when the interface changes. */
@@ -1462 +1463 @@
      *                   Only VRDEINTERFACEHDR is initialized by the caller.
      * @param pCallbacks Callbacks required by the interface. The server makes a local copy.
+     *                   VRDEINTERFACEHDR version must correspond to the requested interface version.
      * @param pvContext  The context to be used in callbacks.
      */
 
-    int VRDEGetInterface(HVRDESERVER hServer,
-                         const char *pszId,
-                         VRDEINTERFACEHDR *pInterface,
-                         const VRDEINTERFACEHDR *pCallbacks,
-                         void *pvContext);
+    DECLR3CALLBACKMEMBER(int, VRDEGetInterface, (HVRDESERVER hServer,
+                                                 const char *pszId,
+                                                 VRDEINTERFACEHDR *pInterface,
+                                                 const VRDEINTERFACEHDR *pCallbacks,
+                                                 void *pvContext));
 } VRDEENTRYPOINTS_4;
 
+/* Callbacks are the same for the version 3 and version 4 interfaces. */
+typedef VRDECALLBACKS_3 VRDECALLBACKS_4;
 
 /**