Changeset 41619 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Jun 8, 2012 10:40:09 AM (13 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuest: Hungarian fix.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest.cpp (modified) (4 diffs)
• VBoxGuestInternal.h (modified) (1 diff)

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

@@ -723 +723 @@
     pDevExt->MemBalloon.paMemObj = NULL;
     pDevExt->MemBalloon.pOwner = NULL;
-    for (unsigned i = 0; i < RT_ELEMENTS(pDevExt->cMouseFeatureUsage); ++i)
-        pDevExt->cMouseFeatureUsage[i] = 0;
+    for (unsigned i = 0; i < RT_ELEMENTS(pDevExt->acMouseFeatureUsage); ++i)
+        pDevExt->acMouseFeatureUsage[i] = 0;
     pDevExt->fMouseStatus = 0;
 
@@ -2231 +2231 @@
             if (   (RT_BIT_32(i) & fFeatures)
                 && !(RT_BIT_32(i) & pSession->fMouseStatus))
-                pDevExt->cMouseFeatureUsage[i]++;
+                pDevExt->acMouseFeatureUsage[i]++;
             else if (   !(RT_BIT_32(i) & fFeatures)
                      && (RT_BIT_32(i) & pSession->fMouseStatus))
-                pDevExt->cMouseFeatureUsage[i]--;
-        }
-        if (pDevExt->cMouseFeatureUsage[i] > 0)
+                pDevExt->acMouseFeatureUsage[i]--;
+        }
+        if (pDevExt->acMouseFeatureUsage[i] > 0)
             fNewDevExtStatus |= RT_BIT_32(i);
     }
@@ -2286 +2286 @@
                   == VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE,
                   ("Actual status: 0x%x\n", g_test_statusSetMouseStatus));
-        DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR) - 1] = 1;
+        DevExt.acMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR) - 1] = 1;
         rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt,
                                   &Session, &u32Data, sizeof(u32Data), NULL);
@@ -2315 +2315 @@
                   == VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR,
                   ("Actual status: 0x%x\n", g_test_statusSetMouseStatus));
-        AssertMsg(DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR) - 1] == 1,
-                  ("Actual value: %d\n", DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR)]));
+        AssertMsg(DevExt.acMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR) - 1] == 1,
+                  ("Actual value: %d\n", DevExt.acMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR)]));
         g_test_SetMouseStatusGRRC = VERR_UNRESOLVED_ERROR;
         /* This should succeed as the host request should not be made

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -163 +163 @@
     /** @todo can we programmatically determine the size of the array and
      * still get the following alignment right? */
-    uint32_t volatile           cMouseFeatureUsage[32];
+    uint32_t volatile           acMouseFeatureUsage[32];
     /** The mouse feature status matching the counts above.  These are updated
      * together inside the session spinlock. */