Changeset 14462 in vbox for trunk

Timestamp:

Nov 21, 2008 2:17:21 PM (16 years ago)

Author:

vboxsync

Message:

VBoxGuest.cpp: VBoxGuestCommonIOCtl_HGCMCall size fix for the timed ioctl.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -1 @@
-/* $Id:$ */
+/* $Id$ */
 /** @file
  * VBoxGuest - Guest Additions Driver.
@@ -1052 +1052 @@
                                          VBoxGuestHGCMCallInfo *pInfo,
                                          uint32_t cMillies, bool fInterruptible,
-                                         size_t cbData, size_t *pcbDataReturned)
+                                         size_t cbExtra, size_t cbData, size_t *pcbDataReturned)
 {
     /*
@@ -1062 +1062 @@
         return VERR_INVALID_PARAMETER;
     }
-    const size_t cbActual = sizeof(*pInfo) + pInfo->cParms * sizeof(HGCMFunctionParameter);
+    const size_t cbActual = cbExtra + sizeof(*pInfo) + pInfo->cParms * sizeof(HGCMFunctionParameter);
     if (cbData < cbActual)
     {
@@ -1263 +1263 @@
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, (VBoxGuestHGCMCallInfo *)pvData, RT_INDEFINITE_WAIT,
                                            fInterruptible,
-                                           cbData, pcbDataReturned);
+                                           0, cbData, pcbDataReturned);
     }
     else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_TIMED(0)))
@@ -1271 +1271 @@
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, &pInfo->info, pInfo->u32Timeout,
                                            !!pInfo->fInterruptible || pSession->R0Process != NIL_RTR0PROCESS,
-                                           cbData, pcbDataReturned);
+                                           RT_OFFSETOF(VBoxGuestHGCMCallInfoTimed, info), cbData, pcbDataReturned);
     }
 #endif /* VBOX_WITH_HGCM */