Changeset 6426 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jan 21, 2008 6:37:06 PM (17 years ago)

Author:

vboxsync

Message:

Use VBOXGUEST_IOCTL_STRIP_SIZE as indicated by #2591.

File:

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

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

@@ -1143 +1143 @@
      */
     int rc = VINF_SUCCESS;
-#ifdef RT_OS_SOLARIS
-    /* The other way of determining the request type does not work on Solaris (and perhaps on Linux too) 
-     * as the range between the request types overlap when comparing all bits of the function code...
-     */
-    if (VBOXGUEST_IOCTL_NUMBER(iFunction) == VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_VMMREQUEST(0)))
-#else
-    if (    iFunction >= VBOXGUEST_IOCTL_VMMREQUEST(0)
-        &&  iFunction <= VBOXGUEST_IOCTL_VMMREQUEST(0xfff)) /** @todo find a better way to do this*/
-#endif
+    if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_VMMREQUEST(0)))
     {
         CHECKRET_MIN_SIZE("VMMREQUEST", sizeof(VMMDevRequestHeader));
@@ -1160 +1152 @@
      * This one is tricky and can be done later.
      */
-# ifdef RT_OS_SOLARIS
-    else if (VBOXGUEST_IOCTL_NUMBER(iFunction) == VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_HGCM_CALL(0)))
-#else
-    else if (   iFunction >= VBOXGUEST_IOCTL_HGCM_CALL(0)
-             && iFunction <= VBOXGUEST_IOCTL_HGCM_CALL(0xfff))
-#endif
+    else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0)))
     {
         CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));