VirtualBox

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


Ignore:
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

Location:
trunk/src/VBox/Main/src-client
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r51092 r51096  
    99999999DECLCALLBACK(void) Console::drvStatus_UnitChanged(PPDMILEDCONNECTORS pInterface, unsigned iLUN)
    1000010000{
    10001     PDRVMAINSTATUS pThis = (PDRVMAINSTATUS)((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINSTATUS, ILedConnectors));
     10001    PDRVMAINSTATUS pThis = RT_FROM_MEMBER(pInterface, DRVMAINSTATUS, ILedConnectors);
    1000210002    if (iLUN >= pThis->iFirstLUN && iLUN <= pThis->iLastLUN)
    1000310003    {
    … …  
    1002110021DECLCALLBACK(int) Console::drvStatus_MediumEjected(PPDMIMEDIANOTIFY pInterface, unsigned uLUN)
    1002210022{
    10023     PDRVMAINSTATUS pThis = (PDRVMAINSTATUS)((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINSTATUS, IMediaNotify));
     10023    PDRVMAINSTATUS pThis = RT_FROM_MEMBER(pInterface, DRVMAINSTATUS, IMediaNotify);
    1002410024    PPDMDRVINS pDrvIns = pThis->pDrvIns;
    1002510025    LogFunc(("uLUN=%d\n", uLUN));

  • trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

    r51092 r51096  
    284284typedef VRDEVoiceOut * PVRDEVoiceOut;
    285285
    286 /** Makes a PDRVBLOCK out of a PPDMIBLOCK. */
    287 #define PDMIHOSTAUDIO_2_DRVAUDIOVRDE(pInterface)        ( (PDRVAUDIOVRDE)((uintptr_t)pInterface - RT_OFFSETOF(DRVAUDIOVRDE, IHostAudioR3)) )
    288 
    289286AudioVRDE::AudioVRDE(Console *console)
    290287    : mpDrv(NULL),
    … …  
    684681static DECLCALLBACK(int)  drvAudioVRDEInitOut(PPDMIHOSTAUDIO pInterface, PPDMHOSTVOICEOUT pHostVoiceOut, audsettings_t *as)
    685682{
    686     PDRVAUDIOVRDE pDrv =  PDMIHOSTAUDIO_2_DRVAUDIOVRDE(pInterface);
     683    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     684
    687685    PVRDEVoiceOut pVRDEVoiceOut = (PVRDEVoiceOut)pHostVoiceOut;
    688686    LogFlow(("DrvAudioVRDEInitOut: audio input begin cShift=%d\n", pHostVoiceOut->Props.cShift));
    … …  
    696694{
    697695    LogFlow(("DrvAudioVRDE: drvAudioVRDEInitIn \n"));
    698     PDRVAUDIOVRDE pDrv =  PDMIHOSTAUDIO_2_DRVAUDIOVRDE(pInterface);
     696    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
    699697    PVRDEVoice pVRDEVoice = (PVRDEVoice)pHostVoiceIn;
    700698    pHostVoiceIn->cSamples =  6174;
    … …  
    781779static DECLCALLBACK(int) drvAudioVRDEPlayOut(PPDMIHOSTAUDIO pInterface, PPDMHOSTVOICEOUT pHostVoiceOut)
    782780{
    783     PDRVAUDIOVRDE pDrv = PDMIHOSTAUDIO_2_DRVAUDIOVRDE(pInterface);
     781    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
    784782    PVRDEVoiceOut pVRDEVoiceOut = (PVRDEVoiceOut)pHostVoiceOut;
    785783    int live;
    … …  
    834832static DECLCALLBACK(void) drvAudioVRDEFiniIn(PPDMIHOSTAUDIO pInterface, PPDMHOSTVOICEIN hw)
    835833{
    836     PDRVAUDIOVRDE pDrv = PDMIHOSTAUDIO_2_DRVAUDIOVRDE(pInterface);
     834    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
    837835    LogFlow(("DrvAudioVRDE: drvAudioVRDEFiniIn \n"));
    838836    pDrv->pConsoleVRDPServer->SendAudioInputEnd(NULL);
    … …  
    841839static DECLCALLBACK(void) drvAudioVRDEFiniOut(PPDMIHOSTAUDIO pInterface, PPDMHOSTVOICEOUT pHostVoiceOut)
    842840{
    843     PDRVAUDIOVRDE pDrv = PDMIHOSTAUDIO_2_DRVAUDIOVRDE(pInterface);
     841    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
    844842    LogFlow(("DrvAudioVRDE: audio input end\n"));
    845843}
    … …  
    853851static DECLCALLBACK(int) drvAudioVRDEDisableEnableIn(PPDMIHOSTAUDIO pInterface, PPDMHOSTVOICEIN pHostVoiceIn, int cmd)
    854852{
    855     PDRVAUDIOVRDE pDrv = PDMIHOSTAUDIO_2_DRVAUDIOVRDE(pInterface);
     853    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
    856854
    857855    /* Initialize  VRDEVoice and return to VRDP server which returns this struct back to us

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

    r50962 r51096  
    6161} DRVMAINKEYBOARD, *PDRVMAINKEYBOARD;
    6262
    63 /** Converts PDMIVMMDEVCONNECTOR pointer to a DRVMAINVMMDEV pointer. */
    64 #define PPDMIKEYBOARDCONNECTOR_2_MAINKEYBOARD(pInterface) ( (PDRVMAINKEYBOARD) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINKEYBOARD, IConnector)) )
    65 
    6663
    6764// constructor / destructor
    … …  
    287284DECLCALLBACK(void) Keyboard::keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds)
    288285{
    289     PDRVMAINKEYBOARD pDrv = PPDMIKEYBOARDCONNECTOR_2_MAINKEYBOARD(pInterface);
     286    PDRVMAINKEYBOARD pDrv = RT_FROM_MEMBER(pInterface, DRVMAINKEYBOARD, IConnector);
    290287    pDrv->pKeyboard->getParent()->onKeyboardLedsChange(RT_BOOL(enmLeds & PDMKEYBLEDS_NUMLOCK),
    291288                                                       RT_BOOL(enmLeds & PDMKEYBLEDS_CAPSLOCK),
    … …  
    298295DECLCALLBACK(void) Keyboard::keyboardSetActive(PPDMIKEYBOARDCONNECTOR pInterface, bool fActive)
    299296{
    300     PDRVMAINKEYBOARD pDrv = PPDMIKEYBOARDCONNECTOR_2_MAINKEYBOARD(pInterface);
     297    PDRVMAINKEYBOARD pDrv = RT_FROM_MEMBER(pInterface, DRVMAINKEYBOARD, IConnector);
    301298    if (fActive)
    302299        pDrv->u32DevCaps |= KEYBOARD_DEVCAP_ENABLED;

  • trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

    r51092 r51096  
    7474} DRVMAINVMMDEV, *PDRVMAINVMMDEV;
    7575
    76 /** Converts PDMIVMMDEVCONNECTOR pointer to a DRVMAINVMMDEV pointer. */
    77 #define PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface) ( (PDRVMAINVMMDEV) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINVMMDEV, Connector)) )
    78 
    79 #ifdef VBOX_WITH_HGCM
    80 /** Converts PDMIHGCMCONNECTOR pointer to a DRVMAINVMMDEV pointer. */
    81 #define PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface) ( (PDRVMAINVMMDEV) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINVMMDEV, HGCMConnector)) )
    82 #endif
    83 
    8476//
    8577// constructor / destructor
    … …  
    164156                                           uint32_t fFlags, PCRTTIMESPEC pTimeSpecTS)
    165157{
    166     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     158    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    167159    Console *pConsole = pDrv->pVMMDev->getParent();
    168160
    169161    /* Store that information in IGuest */
    170162    Guest* guest = pConsole->getGuest();
    171     Assert(guest);
    172     if (!guest)
    173         return;
     163    AssertPtrReturnVoid(guest);
    174164
    175165    guest->setAdditionsStatus((VBoxGuestFacilityType)uFacility, (VBoxGuestFacilityStatus)uStatus, fFlags, pTimeSpecTS);
    … …  
    186176                                              const uint8_t *puDetails, uint32_t cbDetails)
    187177{
    188     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     178    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    189179    AssertPtr(pDrv);
    190180    Console *pConsole = pDrv->pVMMDev->getParent();
    … …  
    193183    /* Store that information in IGuest. */
    194184    Guest* pGuest = pConsole->getGuest();
    195     AssertPtr(pGuest);
    196     if (!pGuest)
    197         return;
     185    AssertPtrReturnVoid(pGuest);
    198186
    199187    pGuest->onUserStateChange(Bstr(pszUser), Bstr(pszDomain), (VBoxGuestUserState)uState,
    … …  
    214202DECLCALLBACK(void) vmmdevUpdateGuestInfo(PPDMIVMMDEVCONNECTOR pInterface, const VBoxGuestInfo *guestInfo)
    215203{
    216     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
    217 
    218     Assert(guestInfo);
    219     if (!guestInfo)
    220         return;
    221 
     204    AssertPtrReturnVoid(guestInfo);
     205   
     206    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    222207    Console *pConsole = pDrv->pVMMDev->getParent();
    223208
    224209    /* Store that information in IGuest */
    225210    Guest* guest = pConsole->getGuest();
    226     Assert(guest);
    227     if (!guest)
    228         return;
     211    AssertPtrReturnVoid(guest);
    229212
    230213    if (guestInfo->interfaceVersion != 0)
    … …  
    266249                                          const char *pszName, uint32_t uRevision, uint32_t fFeatures)
    267250{
    268     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     251    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    269252    AssertPtr(pszName);
    270253    Assert(uFullVersion);
    … …  
    272255    /* Store that information in IGuest. */
    273256    Guest *pGuest = pDrv->pVMMDev->getParent()->getGuest();
    274     Assert(pGuest);
    275     if (!pGuest)
    276         return;
     257    AssertPtrReturnVoid(pGuest);
    277258
    278259    /* Just pass it on... */
    … …  
    297278DECLCALLBACK(void) vmmdevUpdateGuestCapabilities(PPDMIVMMDEVCONNECTOR pInterface, uint32_t newCapabilities)
    298279{
    299     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     280    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    300281    AssertPtr(pDrv);
    301282    Console *pConsole = pDrv->pVMMDev->getParent();
    … …  
    303284    /* store that information in IGuest */
    304285    Guest* pGuest = pConsole->getGuest();
    305     AssertPtr(pGuest);
    306     if (!pGuest)
    307         return;
     286    AssertPtrReturnVoid(pGuest);
    308287
    309288    /*
    … …  
    330309DECLCALLBACK(void) vmmdevUpdateMouseCapabilities(PPDMIVMMDEVCONNECTOR pInterface, uint32_t fNewCaps)
    331310{
    332     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     311    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    333312    Console *pConsole = pDrv->pVMMDev->getParent();
    334313
    … …  
    363342                                            void *pShape)
    364343{
    365     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     344    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    366345    Console *pConsole = pDrv->pVMMDev->getParent();
    367346
    … …  
    382361DECLCALLBACK(int) iface_VideoAccelEnable(PPDMIVMMDEVCONNECTOR pInterface, bool fEnable, VBVAMEMORY *pVbvaMemory)
    383362{
    384     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     363    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    385364    Console *pConsole = pDrv->pVMMDev->getParent();
    386365
    … …  
    397376DECLCALLBACK(void) iface_VideoAccelFlush(PPDMIVMMDEVCONNECTOR pInterface)
    398377{
    399     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     378    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    400379    Console *pConsole = pDrv->pVMMDev->getParent();
    401380
    … …  
    412391                                           uint32_t bpp, bool *fSupported)
    413392{
    414     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     393    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    415394    Console *pConsole = pDrv->pVMMDev->getParent();
    416395
    … …  
    441420DECLCALLBACK(int) vmmdevGetHeightReduction(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *heightReduction)
    442421{
    443     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     422    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    444423    Console *pConsole = pDrv->pVMMDev->getParent();
    445424
    … …  
    456435DECLCALLBACK(int) vmmdevSetCredentialsJudgementResult(PPDMIVMMDEVCONNECTOR pInterface, uint32_t u32Flags)
    457436{
    458     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     437    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    459438
    460439    if (pDrv->pVMMDev)
    … …  
    466445DECLCALLBACK(int) vmmdevSetVisibleRegion(PPDMIVMMDEVCONNECTOR pInterface, uint32_t cRect, PRTRECT pRect)
    467446{
    468     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     447    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    469448    Console *pConsole = pDrv->pVMMDev->getParent();
    470449
    … …  
    477456DECLCALLBACK(int) vmmdevQueryVisibleRegion(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pcRect, PRTRECT pRect)
    478457{
    479     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     458    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    480459    Console *pConsole = pDrv->pVMMDev->getParent();
    481460
    … …  
    496475DECLCALLBACK(int) vmmdevQueryStatisticsInterval(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pulInterval)
    497476{
    498     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     477    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    499478    Console *pConsole = pDrv->pVMMDev->getParent();
    500479    ULONG          val = 0;
    … …  
    505484    /* store that information in IGuest */
    506485    Guest* guest = pConsole->getGuest();
    507     Assert(guest);
    508     if (!guest)
    509         return VERR_GENERAL_FAILURE;
     486    AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
    510487
    511488    guest->COMGETTER(StatisticsUpdateInterval)(&val);
    … …  
    524501DECLCALLBACK(int) vmmdevQueryBalloonSize(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pcbBalloon)
    525502{
    526     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     503    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    527504    Console *pConsole = pDrv->pVMMDev->getParent();
    528505    ULONG          val = 0;
    … …  
    533510    /* store that information in IGuest */
    534511    Guest* guest = pConsole->getGuest();
    535     Assert(guest);
    536     if (!guest)
    537         return VERR_GENERAL_FAILURE;
     512    AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
    538513
    539514    guest->COMGETTER(MemoryBalloonSize)(&val);
    … …  
    552527DECLCALLBACK(int) vmmdevIsPageFusionEnabled(PPDMIVMMDEVCONNECTOR pInterface, bool *pfPageFusionEnabled)
    553528{
    554     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
     529    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
    555530    Console *pConsole = pDrv->pVMMDev->getParent();
    556531    BOOL           val = 0;
    … …  
    561536    /* store that information in IGuest */
    562537    Guest* guest = pConsole->getGuest();
    563     Assert(guest);
    564     if (!guest)
    565         return VERR_GENERAL_FAILURE;
     538    AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
    566539
    567540    *pfPageFusionEnabled = !!guest->isPageFusionEnabled();
    … …  
    579552DECLCALLBACK(int) vmmdevReportStatistics(PPDMIVMMDEVCONNECTOR pInterface, VBoxGuestStatistics *pGuestStats)
    580553{
    581     PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
    582     Console *pConsole = pDrv->pVMMDev->getParent();
    583 
    584     Assert(pGuestStats);
    585     if (!pGuestStats)
    586         return VERR_INVALID_POINTER;
     554    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
     555    Console *pConsole = pDrv->pVMMDev->getParent();
     556
     557    AssertPtrReturn(pGuestStats, VERR_INVALID_POINTER);
    587558
    588559    /* store that information in IGuest */
    589560    Guest* guest = pConsole->getGuest();
    590     Assert(guest);
    591     if (!guest)
    592         return VERR_GENERAL_FAILURE;
     561    AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
    593562
    594563    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_IDLE)
    … …  
    633602    LogSunlover(("Enter\n"));
    634603
    635     PDRVMAINVMMDEV pDrv = PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface);
     604    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, HGCMConnector);
    636605
    637606    if (    !pServiceLocation
    … …  
    652621    LogSunlover(("Enter\n"));
    653622
    654     PDRVMAINVMMDEV pDrv = PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface);
     623    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, HGCMConnector);
    655624
    656625    if (!pDrv->pVMMDev || !pDrv->pVMMDev->hgcmIsActive())
    … …  
    665634    LogSunlover(("Enter\n"));
    666635
    667     PDRVMAINVMMDEV pDrv = PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface);
     636    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, HGCMConnector);
    668637
    669638    if (!pDrv->pVMMDev || !pDrv->pVMMDev->hgcmIsActive())
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette