VirtualBox

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


Ignore:
Timestamp:
Mar 13, 2013 8:58:12 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
84274
Message:

Main/drv*: s/pData/pThis/g.

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

Legend:

Unmodified
Added
Removed

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

    r45029 r45030  
    98119811DECLCALLBACK(void) Console::drvStatus_UnitChanged(PPDMILEDCONNECTORS pInterface, unsigned iLUN)
    98129812{
    9813     PDRVMAINSTATUS pData = (PDRVMAINSTATUS)((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINSTATUS, ILedConnectors));
    9814     if (iLUN >= pData->iFirstLUN && iLUN <= pData->iLastLUN)
     9813    PDRVMAINSTATUS pThis = (PDRVMAINSTATUS)((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINSTATUS, ILedConnectors));
     9814    if (iLUN >= pThis->iFirstLUN && iLUN <= pThis->iLastLUN)
    98159815    {
    98169816        PPDMLED pLed;
    9817         int rc = pData->pLedPorts->pfnQueryStatusLed(pData->pLedPorts, iLUN, &pLed);
     9817        int rc = pThis->pLedPorts->pfnQueryStatusLed(pThis->pLedPorts, iLUN, &pLed);
    98189818        if (RT_FAILURE(rc))
    98199819            pLed = NULL;
    9820         ASMAtomicWritePtr(&pData->papLeds[iLUN - pData->iFirstLUN], pLed);
     9820        ASMAtomicWritePtr(&pThis->papLeds[iLUN - pThis->iFirstLUN], pLed);
    98219821        Log(("drvStatus_UnitChanged: iLUN=%d pLed=%p\n", iLUN, pLed));
    98229822    }
    … …  
    98339833DECLCALLBACK(int) Console::drvStatus_MediumEjected(PPDMIMEDIANOTIFY pInterface, unsigned uLUN)
    98349834{
    9835     PDRVMAINSTATUS pData = (PDRVMAINSTATUS)((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINSTATUS, IMediaNotify));
    9836     PPDMDRVINS pDrvIns = pData->pDrvIns;
     9835    PDRVMAINSTATUS pThis = (PDRVMAINSTATUS)((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINSTATUS, IMediaNotify));
     9836    PPDMDRVINS pDrvIns = pThis->pDrvIns;
    98379837    LogFunc(("uLUN=%d\n", uLUN));
    9838     if (pData->pmapMediumAttachments)
    9839     {
    9840         AutoWriteLock alock(pData->pConsole COMMA_LOCKVAL_SRC_POS);
     9838    if (pThis->pmapMediumAttachments)
     9839    {
     9840        AutoWriteLock alock(pThis->pConsole COMMA_LOCKVAL_SRC_POS);
    98419841
    98429842        ComPtr<IMediumAttachment> pMediumAtt;
    9843         Utf8Str devicePath = Utf8StrFmt("%s/LUN#%u", pData->pszDeviceInstance, uLUN);
    9844         Console::MediumAttachmentMap::const_iterator end = pData->pmapMediumAttachments->end();
    9845         Console::MediumAttachmentMap::const_iterator it = pData->pmapMediumAttachments->find(devicePath);
     9843        Utf8Str devicePath = Utf8StrFmt("%s/LUN#%u", pThis->pszDeviceInstance, uLUN);
     9844        Console::MediumAttachmentMap::const_iterator end = pThis->pmapMediumAttachments->end();
     9845        Console::MediumAttachmentMap::const_iterator it = pThis->pmapMediumAttachments->find(devicePath);
    98469846        if (it != end)
    98479847            pMediumAtt = it->second;
    … …  
    98629862
    98639863                    ComPtr<IMediumAttachment> pNewMediumAtt;
    9864                     rc = pData->pConsole->mControl->EjectMedium(pMediumAtt, pNewMediumAtt.asOutParam());
     9864                    rc = pThis->pConsole->mControl->EjectMedium(pMediumAtt, pNewMediumAtt.asOutParam());
    98659865                    if (SUCCEEDED(rc))
    9866                         fireMediumChangedEvent(pData->pConsole->mEventSource, pNewMediumAtt);
     9866                        fireMediumChangedEvent(pThis->pConsole->mEventSource, pNewMediumAtt);
    98679867
    98689868                    alock.acquire();
    98699869                    if (pNewMediumAtt != pMediumAtt)
    98709870                    {
    9871                         pData->pmapMediumAttachments->erase(devicePath);
    9872                         pData->pmapMediumAttachments->insert(std::make_pair(devicePath, pNewMediumAtt));
     9871                        pThis->pmapMediumAttachments->erase(devicePath);
     9872                        pThis->pmapMediumAttachments->insert(std::make_pair(devicePath, pNewMediumAtt));
    98739873                    }
    98749874                }
    … …  
    99039903{
    99049904    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
    9905     PDRVMAINSTATUS pData = PDMINS_2_DATA(pDrvIns, PDRVMAINSTATUS);
     9905    PDRVMAINSTATUS pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINSTATUS);
    99069906    LogFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
    99079907
    9908     if (pData->papLeds)
    9909     {
    9910         unsigned iLed = pData->iLastLUN - pData->iFirstLUN + 1;
     9908    if (pThis->papLeds)
     9909    {
     9910        unsigned iLed = pThis->iLastLUN - pThis->iFirstLUN + 1;
    99119911        while (iLed-- > 0)
    9912             ASMAtomicWriteNullPtr(&pData->papLeds[iLed]);
     9912            ASMAtomicWriteNullPtr(&pThis->papLeds[iLed]);
    99139913    }
    99149914}
    … …  
    99239923{
    99249924    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    9925     PDRVMAINSTATUS pData = PDMINS_2_DATA(pDrvIns, PDRVMAINSTATUS);
     9925    PDRVMAINSTATUS pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINSTATUS);
    99269926    LogFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
    99279927
    … …  
    99399939     */
    99409940    pDrvIns->IBase.pfnQueryInterface        = Console::drvStatus_QueryInterface;
    9941     pData->ILedConnectors.pfnUnitChanged    = Console::drvStatus_UnitChanged;
    9942     pData->IMediaNotify.pfnEjected          = Console::drvStatus_MediumEjected;
    9943     pData->pDrvIns                          = pDrvIns;
    9944     pData->pszDeviceInstance                = NULL;
     9941    pThis->ILedConnectors.pfnUnitChanged    = Console::drvStatus_UnitChanged;
     9942    pThis->IMediaNotify.pfnEjected          = Console::drvStatus_MediumEjected;
     9943    pThis->pDrvIns                          = pDrvIns;
     9944    pThis->pszDeviceInstance                = NULL;
    99459945
    99469946    /*
    99479947     * Read config.
    99489948     */
    9949     int rc = CFGMR3QueryPtr(pCfg, "papLeds", (void **)&pData->papLeds);
     9949    int rc = CFGMR3QueryPtr(pCfg, "papLeds", (void **)&pThis->papLeds);
    99509950    if (RT_FAILURE(rc))
    99519951    {
    … …  
    99549954    }
    99559955
    9956     rc = CFGMR3QueryPtrDef(pCfg, "pmapMediumAttachments", (void **)&pData->pmapMediumAttachments, NULL);
     9956    rc = CFGMR3QueryPtrDef(pCfg, "pmapMediumAttachments", (void **)&pThis->pmapMediumAttachments, NULL);
    99579957    if (RT_FAILURE(rc))
    99589958    {
    … …  
    99609960        return rc;
    99619961    }
    9962     if (pData->pmapMediumAttachments)
    9963     {
    9964         rc = CFGMR3QueryStringAlloc(pCfg, "DeviceInstance", &pData->pszDeviceInstance);
     9962    if (pThis->pmapMediumAttachments)
     9963    {
     9964        rc = CFGMR3QueryStringAlloc(pCfg, "DeviceInstance", &pThis->pszDeviceInstance);
    99659965        if (RT_FAILURE(rc))
    99669966        {
    … …  
    99689968            return rc;
    99699969        }
    9970         rc = CFGMR3QueryPtr(pCfg, "pConsole", (void **)&pData->pConsole);
     9970        rc = CFGMR3QueryPtr(pCfg, "pConsole", (void **)&pThis->pConsole);
    99719971        if (RT_FAILURE(rc))
    99729972        {
    … …  
    99769976    }
    99779977
    9978     rc = CFGMR3QueryU32(pCfg, "First", &pData->iFirstLUN);
     9978    rc = CFGMR3QueryU32(pCfg, "First", &pThis->iFirstLUN);
    99799979    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    9980         pData->iFirstLUN = 0;
     9980        pThis->iFirstLUN = 0;
    99819981    else if (RT_FAILURE(rc))
    99829982    {
    … …  
    99859985    }
    99869986
    9987     rc = CFGMR3QueryU32(pCfg, "Last", &pData->iLastLUN);
     9987    rc = CFGMR3QueryU32(pCfg, "Last", &pThis->iLastLUN);
    99889988    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    9989         pData->iLastLUN = 0;
     9989        pThis->iLastLUN = 0;
    99909990    else if (RT_FAILURE(rc))
    99919991    {
    … …  
    99939993        return rc;
    99949994    }
    9995     if (pData->iFirstLUN > pData->iLastLUN)
    9996     {
    9997         AssertMsgFailed(("Configuration error: Invalid unit range %u-%u\n", pData->iFirstLUN, pData->iLastLUN));
     9995    if (pThis->iFirstLUN > pThis->iLastLUN)
     9996    {
     9997        AssertMsgFailed(("Configuration error: Invalid unit range %u-%u\n", pThis->iFirstLUN, pThis->iLastLUN));
    99989998        return VERR_GENERAL_FAILURE;
    99999999    }
    … …  
    1000310003     * query the LEDs we want.
    1000410004     */
    10005     pData->pLedPorts = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMILEDPORTS);
    10006     AssertMsgReturn(pData->pLedPorts, ("Configuration error: No led ports interface above!\n"),
     10005    pThis->pLedPorts = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMILEDPORTS);
     10006    AssertMsgReturn(pThis->pLedPorts, ("Configuration error: No led ports interface above!\n"),
    1000710007                    VERR_PDM_MISSING_INTERFACE_ABOVE);
    1000810008
    10009     for (unsigned i = pData->iFirstLUN; i <= pData->iLastLUN; ++i)
    10010         Console::drvStatus_UnitChanged(&pData->ILedConnectors, i);
     10009    for (unsigned i = pThis->iFirstLUN; i <= pThis->iLastLUN; ++i)
     10010        Console::drvStatus_UnitChanged(&pThis->ILedConnectors, i);
    1001110011
    1001210012    return VINF_SUCCESS;

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

    r45029 r45030  
    42664266{
    42674267    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
    4268     PDRVMAINDISPLAY pData = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
     4268    PDRVMAINDISPLAY pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
    42694269    LogRelFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
    42704270
    4271     if (pData->pDisplay)
    4272     {
    4273         AutoWriteLock displayLock(pData->pDisplay COMMA_LOCKVAL_SRC_POS);
     4271    if (pThis->pDisplay)
     4272    {
     4273        AutoWriteLock displayLock(pThis->pDisplay COMMA_LOCKVAL_SRC_POS);
    42744274#ifdef VBOX_WITH_CRHGSMI
    4275         pData->pDisplay->destructCrHgsmiData();
     4275        pThis->pDisplay->destructCrHgsmiData();
    42764276#endif
    4277         pData->pDisplay->mpDrv = NULL;
    4278         pData->pDisplay->mpVMMDev = NULL;
    4279         pData->pDisplay->mLastAddress = NULL;
    4280         pData->pDisplay->mLastBytesPerLine = 0;
    4281         pData->pDisplay->mLastBitsPerPixel = 0,
    4282         pData->pDisplay->mLastWidth = 0;
    4283         pData->pDisplay->mLastHeight = 0;
     4277        pThis->pDisplay->mpDrv = NULL;
     4278        pThis->pDisplay->mpVMMDev = NULL;
     4279        pThis->pDisplay->mLastAddress = NULL;
     4280        pThis->pDisplay->mLastBytesPerLine = 0;
     4281        pThis->pDisplay->mLastBitsPerPixel = 0,
     4282        pThis->pDisplay->mLastWidth = 0;
     4283        pThis->pDisplay->mLastHeight = 0;
    42844284    }
    42854285}
    … …  
    42944294{
    42954295    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    4296     PDRVMAINDISPLAY pData = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
     4296    PDRVMAINDISPLAY pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
    42974297    LogRelFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
    42984298
    … …  
    43114311    pDrvIns->IBase.pfnQueryInterface        = Display::drvQueryInterface;
    43124312
    4313     pData->IConnector.pfnResize             = Display::displayResizeCallback;
    4314     pData->IConnector.pfnUpdateRect         = Display::displayUpdateCallback;
    4315     pData->IConnector.pfnRefresh            = Display::displayRefreshCallback;
    4316     pData->IConnector.pfnReset              = Display::displayResetCallback;
    4317     pData->IConnector.pfnLFBModeChange      = Display::displayLFBModeChangeCallback;
    4318     pData->IConnector.pfnProcessAdapterData = Display::displayProcessAdapterDataCallback;
    4319     pData->IConnector.pfnProcessDisplayData = Display::displayProcessDisplayDataCallback;
     4313    pThis->IConnector.pfnResize             = Display::displayResizeCallback;
     4314    pThis->IConnector.pfnUpdateRect         = Display::displayUpdateCallback;
     4315    pThis->IConnector.pfnRefresh            = Display::displayRefreshCallback;
     4316    pThis->IConnector.pfnReset              = Display::displayResetCallback;
     4317    pThis->IConnector.pfnLFBModeChange      = Display::displayLFBModeChangeCallback;
     4318    pThis->IConnector.pfnProcessAdapterData = Display::displayProcessAdapterDataCallback;
     4319    pThis->IConnector.pfnProcessDisplayData = Display::displayProcessDisplayDataCallback;
    43204320#ifdef VBOX_WITH_VIDEOHWACCEL
    4321     pData->IConnector.pfnVHWACommandProcess = Display::displayVHWACommandProcess;
     4321    pThis->IConnector.pfnVHWACommandProcess = Display::displayVHWACommandProcess;
    43224322#endif
    43234323#ifdef VBOX_WITH_CRHGSMI
    4324     pData->IConnector.pfnCrHgsmiCommandProcess = Display::displayCrHgsmiCommandProcess;
    4325     pData->IConnector.pfnCrHgsmiControlProcess = Display::displayCrHgsmiControlProcess;
     4324    pThis->IConnector.pfnCrHgsmiCommandProcess = Display::displayCrHgsmiCommandProcess;
     4325    pThis->IConnector.pfnCrHgsmiControlProcess = Display::displayCrHgsmiControlProcess;
    43264326#endif
    43274327#ifdef VBOX_WITH_HGSMI
    4328     pData->IConnector.pfnVBVAEnable         = Display::displayVBVAEnable;
    4329     pData->IConnector.pfnVBVADisable        = Display::displayVBVADisable;
    4330     pData->IConnector.pfnVBVAUpdateBegin    = Display::displayVBVAUpdateBegin;
    4331     pData->IConnector.pfnVBVAUpdateProcess  = Display::displayVBVAUpdateProcess;
    4332     pData->IConnector.pfnVBVAUpdateEnd      = Display::displayVBVAUpdateEnd;
    4333     pData->IConnector.pfnVBVAResize         = Display::displayVBVAResize;
    4334     pData->IConnector.pfnVBVAMousePointerShape = Display::displayVBVAMousePointerShape;
     4328    pThis->IConnector.pfnVBVAEnable         = Display::displayVBVAEnable;
     4329    pThis->IConnector.pfnVBVADisable        = Display::displayVBVADisable;
     4330    pThis->IConnector.pfnVBVAUpdateBegin    = Display::displayVBVAUpdateBegin;
     4331    pThis->IConnector.pfnVBVAUpdateProcess  = Display::displayVBVAUpdateProcess;
     4332    pThis->IConnector.pfnVBVAUpdateEnd      = Display::displayVBVAUpdateEnd;
     4333    pThis->IConnector.pfnVBVAResize         = Display::displayVBVAResize;
     4334    pThis->IConnector.pfnVBVAMousePointerShape = Display::displayVBVAMousePointerShape;
    43354335#endif
    43364336
    … …  
    43384338     * Get the IDisplayPort interface of the above driver/device.
    43394339     */
    4340     pData->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIDISPLAYPORT);
    4341     if (!pData->pUpPort)
     4340    pThis->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIDISPLAYPORT);
     4341    if (!pThis->pUpPort)
    43424342    {
    43434343        AssertMsgFailed(("Configuration error: No display port interface above!\n"));
    … …  
    43454345    }
    43464346#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)
    4347     pData->pVBVACallbacks = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIDISPLAYVBVACALLBACKS);
    4348     if (!pData->pVBVACallbacks)
     4347    pThis->pVBVACallbacks = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIDISPLAYVBVACALLBACKS);
     4348    if (!pThis->pVBVACallbacks)
    43494349    {
    43504350        AssertMsgFailed(("Configuration error: No VBVA callback interface above!\n"));
    … …  
    43624362        return rc;
    43634363    }
    4364     pData->pDisplay = (Display *)pv;        /** @todo Check this cast! */
    4365     pData->pDisplay->mpDrv = pData;
     4364    pThis->pDisplay = (Display *)pv;        /** @todo Check this cast! */
     4365    pThis->pDisplay->mpDrv = pThis;
    43664366
    43674367    /*
    43684368     * Update our display information according to the framebuffer
    43694369     */
    4370     pData->pDisplay->updateDisplayData();
     4370    pThis->pDisplay->updateDisplayData();
    43714371
    43724372    /*
    43734373     * Start periodic screen refreshes
    43744374     */
    4375     pData->pUpPort->pfnSetRefreshRate(pData->pUpPort, 20);
     4375    pThis->pUpPort->pfnSetRefreshRate(pThis->pUpPort, 20);
    43764376
    43774377#ifdef VBOX_WITH_CRHGSMI
    4378     pData->pDisplay->setupCrHgsmiData();
     4378    pThis->pDisplay->setupCrHgsmiData();
    43794379#endif
    43804380

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

    r45029 r45030  
    316316{
    317317    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
    318     PDRVMAINKEYBOARD pData = PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD);
     318    PDRVMAINKEYBOARD pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD);
    319319    LogFlow(("Keyboard::drvDestruct: iInstance=%d\n", pDrvIns->iInstance));
    320320
    321     if (pData->pKeyboard)
    322     {
    323         AutoWriteLock kbdLock(pData->pKeyboard COMMA_LOCKVAL_SRC_POS);
     321    if (pThis->pKeyboard)
     322    {
     323        AutoWriteLock kbdLock(pThis->pKeyboard COMMA_LOCKVAL_SRC_POS);
    324324        for (unsigned cDev = 0; cDev < KEYBOARD_MAX_DEVICES; ++cDev)
    325             if (pData->pKeyboard->mpDrv[cDev] == pData)
     325            if (pThis->pKeyboard->mpDrv[cDev] == pThis)
    326326            {
    327                 pData->pKeyboard->mpDrv[cDev] = NULL;
     327                pThis->pKeyboard->mpDrv[cDev] = NULL;
    328328                break;
    329329            }
    330         pData->pKeyboard->mpVMMDev = NULL;
     330        pThis->pKeyboard->mpVMMDev = NULL;
    331331    }
    332332}
    … …  
    340340{
    341341    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    342     PDRVMAINKEYBOARD pData = PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD);
     342    PDRVMAINKEYBOARD pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD);
    343343    LogFlow(("Keyboard::drvConstruct: iInstance=%d\n", pDrvIns->iInstance));
    344344
    … …  
    357357    pDrvIns->IBase.pfnQueryInterface        = Keyboard::drvQueryInterface;
    358358
    359     pData->IConnector.pfnLedStatusChange    = keyboardLedStatusChange;
    360     pData->IConnector.pfnSetActive          = Keyboard::keyboardSetActive;
     359    pThis->IConnector.pfnLedStatusChange    = keyboardLedStatusChange;
     360    pThis->IConnector.pfnSetActive          = Keyboard::keyboardSetActive;
    361361
    362362    /*
    363363     * Get the IKeyboardPort interface of the above driver/device.
    364364     */
    365     pData->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIKEYBOARDPORT);
    366     if (!pData->pUpPort)
     365    pThis->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIKEYBOARDPORT);
     366    if (!pThis->pUpPort)
    367367    {
    368368        AssertMsgFailed(("Configuration error: No keyboard port interface above!\n"));
    … …  
    380380        return rc;
    381381    }
    382     pData->pKeyboard = (Keyboard *)pv;        /** @todo Check this cast! */
     382    pThis->pKeyboard = (Keyboard *)pv;        /** @todo Check this cast! */
    383383    unsigned cDev;
    384384    for (cDev = 0; cDev < KEYBOARD_MAX_DEVICES; ++cDev)
    385         if (!pData->pKeyboard->mpDrv[cDev])
     385        if (!pThis->pKeyboard->mpDrv[cDev])
    386386        {
    387             pData->pKeyboard->mpDrv[cDev] = pData;
     387            pThis->pKeyboard->mpDrv[cDev] = pThis;
    388388            break;
    389389        }

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

    r45029 r45030  
    714714{
    715715    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
    716     PDRVMAINMOUSE pData = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
     716    PDRVMAINMOUSE pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
    717717    LogFlow(("Mouse::drvDestruct: iInstance=%d\n", pDrvIns->iInstance));
    718718
    719     if (pData->pMouse)
    720     {
    721         AutoWriteLock mouseLock(pData->pMouse COMMA_LOCKVAL_SRC_POS);
     719    if (pThis->pMouse)
     720    {
     721        AutoWriteLock mouseLock(pThis->pMouse COMMA_LOCKVAL_SRC_POS);
    722722        for (unsigned cDev = 0; cDev < MOUSE_MAX_DEVICES; ++cDev)
    723             if (pData->pMouse->mpDrv[cDev] == pData)
     723            if (pThis->pMouse->mpDrv[cDev] == pThis)
    724724            {
    725                 pData->pMouse->mpDrv[cDev] = NULL;
     725                pThis->pMouse->mpDrv[cDev] = NULL;
    726726                break;
    727727            }
    … …  
    738738{
    739739    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    740     PDRVMAINMOUSE pData = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
     740    PDRVMAINMOUSE pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
    741741    LogFlow(("drvMainMouse_Construct: iInstance=%d\n", pDrvIns->iInstance));
    742742
    … …  
    755755    pDrvIns->IBase.pfnQueryInterface        = Mouse::drvQueryInterface;
    756756
    757     pData->IConnector.pfnReportModes        = Mouse::mouseReportModes;
     757    pThis->IConnector.pfnReportModes        = Mouse::mouseReportModes;
    758758
    759759    /*
    760760     * Get the IMousePort interface of the above driver/device.
    761761     */
    762     pData->pUpPort = (PPDMIMOUSEPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMIMOUSEPORT_IID);
    763     if (!pData->pUpPort)
     762    pThis->pUpPort = (PPDMIMOUSEPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMIMOUSEPORT_IID);
     763    if (!pThis->pUpPort)
    764764    {
    765765        AssertMsgFailed(("Configuration error: No mouse port interface above!\n"));
    … …  
    777777        return rc;
    778778    }
    779     pData->pMouse = (Mouse *)pv;        /** @todo Check this cast! */
     779    pThis->pMouse = (Mouse *)pv;        /** @todo Check this cast! */
    780780    unsigned cDev;
    781781    {
    782         AutoReadLock mouseLock(pData->pMouse COMMA_LOCKVAL_SRC_POS);
     782        AutoReadLock mouseLock(pThis->pMouse COMMA_LOCKVAL_SRC_POS);
    783783
    784784        for (cDev = 0; cDev < MOUSE_MAX_DEVICES; ++cDev)
    785             if (!pData->pMouse->mpDrv[cDev])
     785            if (!pThis->pMouse->mpDrv[cDev])
    786786            {
    787                 pData->pMouse->mpDrv[cDev] = pData;
     787                pThis->pMouse->mpDrv[cDev] = pThis;
    788788                break;
    789789            }

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

    r45029 r45030  
    119119{
    120120    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
    121     PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
    122 
    123     if (pData->pPCIRawDev)
    124         pData->pPCIRawDev->mpDrv = NULL;
     121    PDRVMAINPCIRAWDEV pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
     122
     123    if (pThis->pPCIRawDev)
     124        pThis->pPCIRawDev->mpDrv = NULL;
    125125}
    126126
    … …  
    132132{
    133133    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    134     PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
     134    PDRVMAINPCIRAWDEV pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
    135135
    136136    /*
    … …  
    152152     * IConnector.
    153153     */
    154     pData->IConnector.pfnDeviceConstructComplete = PCIRawDev::drvDeviceConstructComplete;
     154    pThis->IConnector.pfnDeviceConstructComplete = PCIRawDev::drvDeviceConstructComplete;
    155155
    156156    /*
    … …  
    165165    }
    166166
    167     pData->pPCIRawDev = (PCIRawDev *)pv;
    168     pData->pPCIRawDev->mpDrv = pData;
     167    pThis->pPCIRawDev = (PCIRawDev *)pv;
     168    pThis->pPCIRawDev->mpDrv = pThis;
    169169
    170170    return VINF_SUCCESS;

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

    r45029 r45030  
    762762{
    763763    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
    764     PDRVMAINVMMDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
     764    PDRVMAINVMMDEV pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
    765765    LogFlow(("VMMDev::drvDestruct: iInstance=%d\n", pDrvIns->iInstance));
    766766
    … …  
    768768    /* HGCM is shut down on the VMMDev destructor. */
    769769#endif /* VBOX_WITH_HGCM */
    770     if (pData->pVMMDev)
    771         pData->pVMMDev->mpDrv = NULL;
     770    if (pThis->pVMMDev)
     771        pThis->pVMMDev->mpDrv = NULL;
    772772}
    773773
    … …  
    778778{
    779779    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    780     PDRVMAINVMMDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
     780    PDRVMAINVMMDEV pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
    781781    LogFlow(("Keyboard::drvConstruct: iInstance=%d\n", pDrvIns->iInstance));
    782782
    … …  
    795795    pDrvIns->IBase.pfnQueryInterface                  = VMMDev::drvQueryInterface;
    796796
    797     pData->Connector.pfnUpdateGuestStatus             = vmmdevUpdateGuestStatus;
    798     pData->Connector.pfnUpdateGuestInfo               = vmmdevUpdateGuestInfo;
    799     pData->Connector.pfnUpdateGuestInfo2              = vmmdevUpdateGuestInfo2;
    800     pData->Connector.pfnUpdateGuestCapabilities       = vmmdevUpdateGuestCapabilities;
    801     pData->Connector.pfnUpdateMouseCapabilities       = vmmdevUpdateMouseCapabilities;
    802     pData->Connector.pfnUpdatePointerShape            = vmmdevUpdatePointerShape;
    803     pData->Connector.pfnVideoAccelEnable              = iface_VideoAccelEnable;
    804     pData->Connector.pfnVideoAccelFlush               = iface_VideoAccelFlush;
    805     pData->Connector.pfnVideoModeSupported            = vmmdevVideoModeSupported;
    806     pData->Connector.pfnGetHeightReduction            = vmmdevGetHeightReduction;
    807     pData->Connector.pfnSetCredentialsJudgementResult = vmmdevSetCredentialsJudgementResult;
    808     pData->Connector.pfnSetVisibleRegion              = vmmdevSetVisibleRegion;
    809     pData->Connector.pfnQueryVisibleRegion            = vmmdevQueryVisibleRegion;
    810     pData->Connector.pfnReportStatistics              = vmmdevReportStatistics;
    811     pData->Connector.pfnQueryStatisticsInterval       = vmmdevQueryStatisticsInterval;
    812     pData->Connector.pfnQueryBalloonSize              = vmmdevQueryBalloonSize;
    813     pData->Connector.pfnIsPageFusionEnabled           = vmmdevIsPageFusionEnabled;
    814 
    815 #ifdef VBOX_WITH_HGCM
    816     pData->HGCMConnector.pfnConnect                   = iface_hgcmConnect;
    817     pData->HGCMConnector.pfnDisconnect                = iface_hgcmDisconnect;
    818     pData->HGCMConnector.pfnCall                      = iface_hgcmCall;
     797    pThis->Connector.pfnUpdateGuestStatus             = vmmdevUpdateGuestStatus;
     798    pThis->Connector.pfnUpdateGuestInfo               = vmmdevUpdateGuestInfo;
     799    pThis->Connector.pfnUpdateGuestInfo2              = vmmdevUpdateGuestInfo2;
     800    pThis->Connector.pfnUpdateGuestCapabilities       = vmmdevUpdateGuestCapabilities;
     801    pThis->Connector.pfnUpdateMouseCapabilities       = vmmdevUpdateMouseCapabilities;
     802    pThis->Connector.pfnUpdatePointerShape            = vmmdevUpdatePointerShape;
     803    pThis->Connector.pfnVideoAccelEnable              = iface_VideoAccelEnable;
     804    pThis->Connector.pfnVideoAccelFlush               = iface_VideoAccelFlush;
     805    pThis->Connector.pfnVideoModeSupported            = vmmdevVideoModeSupported;
     806    pThis->Connector.pfnGetHeightReduction            = vmmdevGetHeightReduction;
     807    pThis->Connector.pfnSetCredentialsJudgementResult = vmmdevSetCredentialsJudgementResult;
     808    pThis->Connector.pfnSetVisibleRegion              = vmmdevSetVisibleRegion;
     809    pThis->Connector.pfnQueryVisibleRegion            = vmmdevQueryVisibleRegion;
     810    pThis->Connector.pfnReportStatistics              = vmmdevReportStatistics;
     811    pThis->Connector.pfnQueryStatisticsInterval       = vmmdevQueryStatisticsInterval;
     812    pThis->Connector.pfnQueryBalloonSize              = vmmdevQueryBalloonSize;
     813    pThis->Connector.pfnIsPageFusionEnabled           = vmmdevIsPageFusionEnabled;
     814
     815#ifdef VBOX_WITH_HGCM
     816    pThis->HGCMConnector.pfnConnect                   = iface_hgcmConnect;
     817    pThis->HGCMConnector.pfnDisconnect                = iface_hgcmDisconnect;
     818    pThis->HGCMConnector.pfnCall                      = iface_hgcmCall;
    819819#endif
    820820
    … …  
    822822     * Get the IVMMDevPort interface of the above driver/device.
    823823     */
    824     pData->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIVMMDEVPORT);
    825     AssertMsgReturn(pData->pUpPort, ("Configuration error: No VMMDev port interface above!\n"), VERR_PDM_MISSING_INTERFACE_ABOVE);
    826 
    827 #ifdef VBOX_WITH_HGCM
    828     pData->pHGCMPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIHGCMPORT);
    829     AssertMsgReturn(pData->pHGCMPort, ("Configuration error: No HGCM port interface above!\n"), VERR_PDM_MISSING_INTERFACE_ABOVE);
     824    pThis->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIVMMDEVPORT);
     825    AssertMsgReturn(pThis->pUpPort, ("Configuration error: No VMMDev port interface above!\n"), VERR_PDM_MISSING_INTERFACE_ABOVE);
     826
     827#ifdef VBOX_WITH_HGCM
     828    pThis->pHGCMPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIHGCMPORT);
     829    AssertMsgReturn(pThis->pHGCMPort, ("Configuration error: No HGCM port interface above!\n"), VERR_PDM_MISSING_INTERFACE_ABOVE);
    830830#endif
    831831
    … …  
    841841    }
    842842
    843     pData->pVMMDev = (VMMDev*)pv;        /** @todo Check this cast! */
    844     pData->pVMMDev->mpDrv = pData;
    845 
    846 #ifdef VBOX_WITH_HGCM
    847     rc = pData->pVMMDev->hgcmLoadService(VBOXSHAREDFOLDERS_DLL,
     843    pThis->pVMMDev = (VMMDev*)pv;        /** @todo Check this cast! */
     844    pThis->pVMMDev->mpDrv = pThis;
     845
     846#ifdef VBOX_WITH_HGCM
     847    rc = pThis->pVMMDev->hgcmLoadService(VBOXSHAREDFOLDERS_DLL,
    848848                                         "VBoxSharedFolders");
    849     pData->pVMMDev->fSharedFolderActive = RT_SUCCESS(rc);
     849    pThis->pVMMDev->fSharedFolderActive = RT_SUCCESS(rc);
    850850    if (RT_SUCCESS(rc))
    851851    {
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