Changeset 10543 in vbox

Timestamp:

Jul 11, 2008 6:27:31 PM (17 years ago)

Author:

vboxsync

Message:

IOCTL fix for Linux. Hope nothing broke ...

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest.cpp (modified) (1 diff)
• common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp (modified) (4 diffs)
• common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp (modified) (3 diffs)
• linux/module/vboxmod.c (modified) (1 diff)

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

@@ -1224 +1224 @@
      * This one is tricky and can be done later.
      */
-    else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0)))
+    else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL))
     {
         CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));

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

@@ -100 +100 @@
     VbglHGCMParmUInt32Set(&Msg.formats, 0);
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL, &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {
@@ -150 +150 @@
     VbglHGCMParmUInt32Set(&Msg.size, 0);
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL, &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
     {
@@ -188 +188 @@
     VbglHGCMParmUInt32Set(&Msg.formats, fFormats);
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL, &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
         rc = Msg.hdr.result;
@@ -217 +217 @@
     VbglHGCMParmPtrSet(&Msg.ptr, pv, cb);
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-        rc = Msg.hdr.result;
-    return rc;
-}
-
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL, &Msg, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+        rc = Msg.hdr.result;
+    return rc;
+}
+

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

@@ -103 +103 @@
         VbglHGCMParmPtrSet(&Msg.key, pszKey, strlen(pszKey) + 1);
         VbglHGCMParmPtrSet(&Msg.value, pszValue, strlen(pszValue) + 1);
-        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL, &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc))
             rc = Msg.hdr.result;
@@ -116 +116 @@
         Msg.hdr.cParms = 1;
         VbglHGCMParmPtrSet(&Msg.key, pszKey, strlen(pszKey) + 1);
-        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL, &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc))
             rc = Msg.hdr.result;
@@ -155 +155 @@
     VbglHGCMParmUInt32Set(&Msg.size, 0);
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL, &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
         rc = Msg.hdr.result;

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -525 +525 @@
             IOCTL_VMM_EXIT(arg);
         }
-        else if (   (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0))
+        else if (   (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL)
                 == VBOXGUEST_IOCTL_STRIP_SIZE(cmd))
             || (cmd == VBOXGUEST_IOCTL_HGCM_CALL))