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

Timestamp:

Jan 15, 2008 9:17:05 AM (17 years ago)

Author:

vboxsync

Message:

Ioctl decoding fix in common r0 guest code and small change in logging.

File:

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

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

@@ -1001 +1001 @@
         static unsigned s_cErrors = 0;
         if (s_cErrors++ > 32)
-            LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: u32Client=%RX32\n", u32ClientId));
+            LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: Invalid handle. u32Client=%RX32\n", u32ClientId));
         return VERR_INVALID_HANDLE;
     }
@@ -1019 +1019 @@
             *pcbDataReturned = cbActual;
     }
+    Log(("VBoxGuestCommonIOCtl: HGCM_CALL: Failed. rc=%Rrc.\n", rc));
     return rc;
 }
@@ -1142 +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
     {
         CHECKRET_MIN_SIZE("VMMREQUEST", sizeof(VMMDevRequestHeader));
@@ -1152 +1160 @@
      * 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
     {
         CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));