Changeset 10561 in vbox for trunk/src/VBox

Timestamp:

Jul 12, 2008 1:15:45 AM (16 years ago)

Author:

vboxsync

Message:

Get the size right.

File:

• trunk/src/VBox/Additions/x11/xmouse/VBoxUtils_68.c (modified) (4 diffs)

trunk/src/VBox/Additions/x11/xmouse/VBoxUtils_68.c

@@ -122 +122 @@
     req.pointerXPos = 0;
     req.pointerYPos = 0;
-    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(0), (void*)&req) < 0)
+    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
     {
         ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
@@ -146 +146 @@
         return 1;
     /* perform VMM request */
-    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(0), (void*)g_vmmreqMouseStatus) >= 0)
+    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(vmmdevGetRequestSize(VMMDevReq_GetMouseStatus)), (void*)g_vmmreqMouseStatus) >= 0)
     {
         if (VBOX_SUCCESS(g_vmmreqMouseStatus->header.rc))
@@ -157 +157 @@
                 return 0;
             }
-            else
-                return 1;
+            return 1;
         }
-        else
-        {
-            ErrorF("Error querying host mouse position! header.rc = %d\n", g_vmmreqMouseStatus->header.rc);
-        }
+        ErrorF("Error querying host mouse position! header.rc = %d\n", g_vmmreqMouseStatus->header.rc);
     }
     else
@@ -185 +181 @@
     req.pointerXPos = 0;
     req.pointerYPos = 0;
-    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(0), (void*)&req) < 0)
+    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
     {
         ErrorF("ioctl to vboxadd module failed, rc = %d (%s)\n",