Changeset 10562 in vbox for trunk/src/VBox

Timestamp:

Jul 12, 2008 1:22:00 AM (16 years ago)

Author:

vboxsync

Message:

r=bird: Still calling ioctl, Michael fix it!

Location:

trunk/src/VBox/Additions/x11

Files:

• xgraphics/vboxutils_68.c (modified) (3 diffs)
• xmouse/VBoxUtils_68.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/xgraphics/vboxutils_68.c

@@ -122 +122 @@
     }
 #else
+    /** @todo r=bird: Michael, I thought we decided a long time ago that all these should be replaced by VbglR3. I assume this is just a leftover... */
     err = ioctl (pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST(0), hdrp);
 #endif
@@ -149 +150 @@
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
             "Unable to determine whether the virtual machine supports mouse pointer integration - request initialization failed with return code %d\n", rc);
+/** @todo r=bird: Michael, ditto. */
     if (   RT_SUCCESS(vrc)
-        && (ioctl(pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST(0), (void*)&req) < 0))
+        && (ioctl(pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0))
     {
         vrc = VERR_FILE_IO_ERROR;
@@ -819 +821 @@
     memset (pm, 0xFF, mask_size);
 
-    /** 
+    /**
      * The additions driver must provide the AND mask for alpha cursors. The host frontend
      * which can handle alpha channel, will ignore the AND mask and draw an alpha cursor.

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

@@ -122 +122 @@
     req.pointerXPos = 0;
     req.pointerYPos = 0;
+/** @todo r=bird: Michael, I thought we decided a long time ago that all these should be replaced by VbglR3. I assume this is just a leftover... */
     if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
     {
@@ -146 +147 @@
         return 1;
     /* perform VMM request */
+/** @todo r=bird: Michael, ditto. */
     if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(vmmdevGetRequestSize(VMMDevReq_GetMouseStatus)), (void*)g_vmmreqMouseStatus) >= 0)
     {
@@ -181 +183 @@
     req.pointerXPos = 0;
     req.pointerYPos = 0;
+/** @todo r=bird: Michael, ditto. */
     if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
     {