Changeset 14352 in vbox for trunk/include/VBox

Timestamp:

Nov 19, 2008 2:10:24 PM (16 years ago)

Author:

vboxsync

Message:

Additions/HGCM: merged code for HGCMCall and HGCMCallTimed, as per todo

Location:

trunk/include/VBox

Files:

• HostServices/GuestPropertySvc.h (modified) (1 diff)
• VBoxGuest.h (modified) (2 diffs)
• VBoxGuestLib.h (modified) (1 diff)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -448 +448 @@
 typedef struct _GetNotification
 {
-    VBoxGuestHGCMCallInfoTimeout hdr;
+    VBoxGuestHGCMCallInfoTimed hdr;
 
     /**

trunk/include/VBox/VBoxGuest.h

@@ -1371 +1371 @@
 } VBoxGuestHGCMCallInfo;
 
-typedef struct _VBoxGuestHGCMCallInfoTimeout
+typedef struct _VBoxGuestHGCMCallInfoTimed
 {
     uint32_t u32Timeout;         /**< IN  How long to wait for completion before cancelling the call */
+    uint32_t fInterruptible;     /**< IN  Is this request interruptible? */
     VBoxGuestHGCMCallInfo info;  /**< IN/OUT The rest of the call information.  Placed after the timeout
                                   * so that the parameters follow as they would for a normal call. */
     /* Parameters follow in form HGCMFunctionParameter aParms[cParms] */
-} VBoxGuestHGCMCallInfoTimeout;
+} VBoxGuestHGCMCallInfoTimed;
 # pragma pack()
 
@@ -1383 +1384 @@
 # define VBOXGUEST_IOCTL_HGCM_DISCONNECT          VBOXGUEST_IOCTL_CODE(17, sizeof(VBoxGuestHGCMDisconnectInfo))
 # define VBOXGUEST_IOCTL_HGCM_CALL(Size)          VBOXGUEST_IOCTL_CODE(18, (Size))
-# define VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT(Size)  VBOXGUEST_IOCTL_CODE(20, (Size))
+# define VBOXGUEST_IOCTL_HGCM_CALL_TIMED(Size)    VBOXGUEST_IOCTL_CODE(20, (Size))
 # define VBOXGUEST_IOCTL_CLIPBOARD_CONNECT        VBOXGUEST_IOCTL_CODE(19, sizeof(uint32_t))
 

trunk/include/VBox/VBoxGuestLib.h

@@ -252 +252 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglHGCMCallTimeout (VBGLHGCMHANDLE handle,
-                                   VBoxGuestHGCMCallInfoTimeout *pData, uint32_t cbData);
+DECLVBGL(int) VbglHGCMCallTimed (VBGLHGCMHANDLE handle,
+                                 VBoxGuestHGCMCallInfoTimed *pData, uint32_t cbData);
 /** @} */