Changeset 28402 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Apr 16, 2010 10:13:22 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (guest shutdown handling, timed peeks).

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp

@@ -107 +107 @@
  *                          in a second call to the host.
  */
-VBGLR3DECL(int) VbglR3GuestCtrlGetHostMsg(uint32_t u32ClientId, uint32_t *puMsg, uint32_t *puNumParms)
+VBGLR3DECL(int) VbglR3GuestCtrlGetHostMsg(uint32_t u32ClientId, uint32_t *puMsg, uint32_t *puNumParms, uint32_t u32Timeout)
 {
     AssertPtr(puMsg);
@@ -114 +114 @@
     VBoxGuestCtrlHGCMMsgType Msg;
 
-    Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
-    Msg.hdr.u32Function = GUEST_GET_HOST_MSG; /* Tell the host we want our next command. */
-    Msg.hdr.cParms = 2;                       /* Just peek for the next message! */
+    Msg.hdr.u32Timeout = u32Timeout;
+    Msg.hdr.fInterruptible = true;
+
+    Msg.hdr.info.result = VERR_WRONG_ORDER;
+    Msg.hdr.info.u32ClientID = u32ClientId;
+    Msg.hdr.info.u32Function = GUEST_GET_HOST_MSG; /* Tell the host we want our next command. */
+    Msg.hdr.info.cParms = 2;                       /* Just peek for the next message! */
 
     VbglHGCMParmUInt32Set(&Msg.msg, 0);
     VbglHGCMParmUInt32Set(&Msg.num_parms, 0);
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL_TIMED(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {
@@ -129 +132 @@
             rc = VbglHGCMParmUInt32Get(&Msg.num_parms, puNumParms);
             if (RT_SUCCESS(rc))
-                rc = Msg.hdr.result;
+                rc = Msg.hdr.info.result;
                 /* Ok, so now we know what message type and how much parameters there are. */
     }