Changeset 47576 in vbox for trunk/src/VBox

Timestamp:

Aug 7, 2013 10:13:17 AM (12 years ago)

Author:

vboxsync

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

87776

Message:

Devices,Main: another multi-touch build fix.

Location:

trunk/src/VBox

Files:

• Devices/Input/UsbMouse.cpp (modified) (1 diff)
• Main/src-client/MouseImpl.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Input/UsbMouse.cpp

@@ -1474 +1474 @@
         uint32_t u32Lo = RT_LO_U32(pau64Contacts[i]);
         uint32_t u32Hi = RT_HI_U32(pau64Contacts[i]);
-        paNewContacts[i].x      = RT_LO_U16(u32Lo);
-        paNewContacts[i].y      = RT_HI_U16(u32Lo);
+        paNewContacts[i].x      = (uint16_t)u32Lo;
+        paNewContacts[i].y      = (uint16_t)(u32Lo >> 16);
         paNewContacts[i].id     = RT_BYTE1(u32Hi);
         paNewContacts[i].flags  = RT_BYTE2(u32Hi) & (MT_CONTACT_F_IN_CONTACT | MT_CONTACT_F_IN_RANGE);

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -731 +731 @@
                 uint32_t u32Lo = RT_LO_U32(pau64Contacts[i]);
                 uint32_t u32Hi = RT_HI_U32(pau64Contacts[i]);
-                int32_t x = (int16_t)RT_LO_U16(u32Lo);
-                int32_t y = (int16_t)RT_HI_U16(u32Lo);
+                int32_t x = (int16_t)u32Lo;
+                int32_t y = (int16_t)(u32Lo >> 16);
                 uint8_t contactId =  RT_BYTE1(u32Hi);
                 bool fInContact   = (RT_BYTE2(u32Hi) & 0x1) != 0;