Changeset 51096 in vbox for trunk/src/VBox/Main/src-client/KeyboardImpl.cpp

Timestamp:

Apr 17, 2014 9:29:40 AM (11 years ago)

Author:

vboxsync

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

93373

Message:

Main: use RT_FROM_MEMBER instead of RT_OFFSETOF; some Assert* cleanup

File:

• trunk/src/VBox/Main/src-client/KeyboardImpl.cpp (modified) (3 diffs)

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

@@ -61 +61 @@
 } DRVMAINKEYBOARD, *PDRVMAINKEYBOARD;
 
-/** Converts PDMIVMMDEVCONNECTOR pointer to a DRVMAINVMMDEV pointer. */
-#define PPDMIKEYBOARDCONNECTOR_2_MAINKEYBOARD(pInterface) ( (PDRVMAINKEYBOARD) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINKEYBOARD, IConnector)) )
-
 
 // constructor / destructor
@@ -287 +284 @@
 DECLCALLBACK(void) Keyboard::keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds)
 {
-    PDRVMAINKEYBOARD pDrv = PPDMIKEYBOARDCONNECTOR_2_MAINKEYBOARD(pInterface);
+    PDRVMAINKEYBOARD pDrv = RT_FROM_MEMBER(pInterface, DRVMAINKEYBOARD, IConnector);
     pDrv->pKeyboard->getParent()->onKeyboardLedsChange(RT_BOOL(enmLeds & PDMKEYBLEDS_NUMLOCK),
                                                        RT_BOOL(enmLeds & PDMKEYBLEDS_CAPSLOCK),
@@ -298 +295 @@
 DECLCALLBACK(void) Keyboard::keyboardSetActive(PPDMIKEYBOARDCONNECTOR pInterface, bool fActive)
 {
-    PDRVMAINKEYBOARD pDrv = PPDMIKEYBOARDCONNECTOR_2_MAINKEYBOARD(pInterface);
+    PDRVMAINKEYBOARD pDrv = RT_FROM_MEMBER(pInterface, DRVMAINKEYBOARD, IConnector);
     if (fActive)
         pDrv->u32DevCaps |= KEYBOARD_DEVCAP_ENABLED;