Changeset 32831 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 29, 2010 8:06:00 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66290

Message:

VMMDev: renamed two capabilities

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Miniport/Helper.cpp (modified) (1 diff)
• WINNT/MouseFilter/VBoxMouse.cpp (modified) (1 diff)
• WINNT/i8042prt/moudep.c (modified) (2 diffs)
• x11/vboxmouse/VBoxUtils.c (modified) (1 diff)
• x11/vboxmouse/VBoxUtils_68.c (modified) (1 diff)
• x11/vboxmouse/vboxmouse_15.c (modified) (3 diffs)
• x11/vboxvideo/vboxutils.c (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.cpp

@@ -224 +224 @@
         if (RT_SUCCESS(rc))
         {
-            if (req->mouseFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
+            if (req->mouseFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE)
             {
                 if (pointerXPos)

trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp

@@ -1121 +1121 @@
         if (RT_SUCCESS(rc))
         {
-            if (req->mouseFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
+            if (req->mouseFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE)
             {
                 PMOUSE_INPUT_DATA inputData = InputDataStart;

trunk/src/VBox/Additions/WINNT/i8042prt/moudep.c

@@ -543 +543 @@
                     if (RT_SUCCESS(rc))
                     {
-                        if (req->mouseFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
+                        if (req->mouseFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE)
                         {
                             // make it an absolute move
@@ -609 +609 @@
                     if (RT_SUCCESS(rc))
                     {
-                        if (req->mouseFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
+                        if (req->mouseFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE)
                         {
                             // make it an absolute move

trunk/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c

@@ -90 +90 @@
         rc = VbglR3GetMouseStatus(&fFeatures, &cx, &cy);
     if (   RT_SUCCESS(rc)
-        && !(fFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
+        && !(fFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE))
         rc = VERR_NOT_SUPPORTED;
     if (RT_SUCCESS(rc))

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

@@ -150 +150 @@
         {
             /* does the host want absolute coordinates? */
-            if (g_vmmreqMouseStatus->mouseFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
+            if (g_vmmreqMouseStatus->mouseFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE)
             {
                 *abs_x = g_vmmreqMouseStatus->pointerXPos;

trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c

@@ -75 +75 @@
 #endif
         &&  RT_SUCCESS(VbglR3GetMouseStatus(&fFeatures, &cx, &cy))
-        && (fFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
+        && (fFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE))
     {
 #if ABI_XINPUT_VERSION == SET_ABI_VERSION(2, 0)
@@ -177 +177 @@
             rc = VbglR3SetMouseStatus(  fFeatures
                                       | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                      | VMMDEV_MOUSE_GUEST_USES_VMMDEV);
+                                      | VMMDEV_MOUSE_GUEST_USES_EVENT);
         if (!RT_SUCCESS(rc)) {
             xf86Msg(X_ERROR, "%s: Failed to switch guest mouse into absolute mode\n",
@@ -194 +194 @@
             rc = VbglR3SetMouseStatus(  fFeatures
                                       & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                      & ~VMMDEV_MOUSE_GUEST_USES_VMMDEV);
+                                      & ~VMMDEV_MOUSE_GUEST_USES_EVENT);
         xf86RemoveEnabledDevice(pInfo);
         device->public.on = FALSE;

trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c

@@ -142 +142 @@
         if (   (fFeatures & VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER)
             || !pVBox->guestCanAbsolute
-            || !(fFeatures & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
+            || !(fFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE)
            )
             rc = FALSE;