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

Timestamp:

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

Author:

vboxsync

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

39566

Message:

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

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCM.cpp (modified) (1 diff)
• VBoxGuestR3LibGuestProp.cpp (modified) (1 diff)

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

@@ -187 +187 @@
 }
 
-DECLVBGL(int) VbglHGCMCallTimeout (VBGLHGCMHANDLE handle,
-                                   VBoxGuestHGCMCallInfoTimeout *pData, uint32_t cbData)
+DECLVBGL(int) VbglHGCMCallTimed (VBGLHGCMHANDLE handle,
+                                 VBoxGuestHGCMCallInfoTimed *pData, uint32_t cbData)
 {
     int rc = VINF_SUCCESS;
 
-    VBGL_HGCM_ASSERTMsg(cbData >= sizeof (VBoxGuestHGCMCallInfoTimeout) + pData->info.cParms * sizeof (HGCMFunctionParameter),
-                        ("cbData = %d, cParms = %d (calculated size %d)\n", cbData, pData->info.cParms, sizeof (VBoxGuestHGCMCallInfoTimeout) + pData->info.cParms * sizeof (VBoxGuestHGCMCallInfo)));
-
-    if (pData->u32Timeout == RT_INDEFINITE_WAIT)
-    {
-        uint32_t cbDataNew = cbData - RT_OFFSETOF(VBoxGuestHGCMCallInfoTimeout, info);
-        rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL(cbDataNew), &pData->info,
-                              cbDataNew);
-    }
-    else
-        rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT(cbData), pData, cbData);
+    uint32_t cbExpected =   sizeof (VBoxGuestHGCMCallInfoTimed)
+                          + pData->info.cParms * sizeof (HGCMFunctionParameter);
+    VBGL_HGCM_ASSERTMsg(cbData >= cbExpected,
+                        ("cbData = %d, cParms = %d (calculated size %d)\n",
+                        cbData, pData->info.cParms, cbExpected));
+
+    rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL_TIMED(cbData),
+                          pData, cbData);
 
     return rc;

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

@@ -846 +846 @@
     Msg.size.SetUInt32(0);
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT(sizeof(Msg)), &Msg, sizeof(Msg));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL_TIMED(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
         rc = Msg.hdr.info.result;