VirtualBox

Changeset 71594 in vbox


Ignore:
Timestamp:
Mar 31, 2018 8:08:29 PM (7 years ago)
Author:
vboxsync
Message:

DevVGA,VBoxVideo: Code cleanup in progress. bugref:9094

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

    r71371 r71594  
    21702170            /* 1. hide overlay */
    21712171            pCmd = vhwaHHCmdCreate(VBOXVHWACMD_TYPE_SURF_OVERLAY_UPDATE, sizeof(VBOXVHWACMD_SURF_OVERLAY_UPDATE));
    2172             VBOXVHWACMD_SURF_OVERLAY_UPDATE *pOUCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_UPDATE);
     2172            VBOXVHWACMD_SURF_OVERLAY_UPDATE RT_UNTRUSTED_VOLATILE_GUEST *pOUCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_UPDATE);
    21732173            pOUCmd->u.in.hSrcSurf = pSurfList->current()->handle();
    21742174            pOUCmd->u.in.flags = VBOXVHWA_OVER_HIDE;
    … …  
    21852185            VBoxVHWASurfaceBase *pCurSurf = (*sIt);
    21862186            pCmd = vhwaHHCmdCreate(VBOXVHWACMD_TYPE_SURF_DESTROY, sizeof(VBOXVHWACMD_SURF_DESTROY));
    2187             VBOXVHWACMD_SURF_DESTROY *pSDCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
     2187            VBOXVHWACMD_SURF_DESTROY RT_UNTRUSTED_VOLATILE_GUEST *pSDCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
    21882188            pSDCmd->u.in.hSurf = pCurSurf->handle();
    21892189
    … …  
    22012201        {
    22022202            pCmd = vhwaHHCmdCreate(VBOXVHWACMD_TYPE_SURF_DESTROY, sizeof(VBOXVHWACMD_SURF_DESTROY));
    2203             VBOXVHWACMD_SURF_DESTROY *pSDCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
     2203            VBOXVHWACMD_SURF_DESTROY RT_UNTRUSTED_VOLATILE_GUEST *pSDCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
    22042204            pSDCmd->u.in.hSurf = pCurSurf->handle();
    22052205
    … …  
    22122212
    22132213#ifdef VBOX_WITH_VIDEOHWACCEL
    2214 int VBoxVHWAImage::vhwaSurfaceCanCreate(struct VBOXVHWACMD_SURF_CANCREATE *pCmd)
     2214int VBoxVHWAImage::vhwaSurfaceCanCreate(struct VBOXVHWACMD_SURF_CANCREATE RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    22152215{
    22162216    VBOXQGLLOG_ENTER(("\n"));
    … …  
    23102310}
    23112311
    2312 int VBoxVHWAImage::vhwaSurfaceCreate (struct VBOXVHWACMD_SURF_CREATE *pCmd)
     2312int VBoxVHWAImage::vhwaSurfaceCreate (struct VBOXVHWACMD_SURF_CREATE RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    23132313{
    23142314    VBOXQGLLOG_ENTER (("\n"));
    … …  
    25582558
    25592559#ifdef VBOX_WITH_WDDM
    2560 int VBoxVHWAImage::vhwaSurfaceGetInfo(struct VBOXVHWACMD_SURF_GETINFO *pCmd)
     2560int VBoxVHWAImage::vhwaSurfaceGetInfo(struct VBOXVHWACMD_SURF_GETINFO RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    25612561{
    25622562    VBoxVHWAColorFormat format;
    … …  
    25842584}
    25852585#endif
    2586 int VBoxVHWAImage::vhwaSurfaceDestroy(struct VBOXVHWACMD_SURF_DESTROY *pCmd)
     2586int VBoxVHWAImage::vhwaSurfaceDestroy(struct VBOXVHWACMD_SURF_DESTROY RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    25872587{
    25882588    VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
    … …  
    26622662                 (_pr)->bottom - (_pr)->top)
    26632663
    2664 int VBoxVHWAImage::vhwaSurfaceLock(struct VBOXVHWACMD_SURF_LOCK *pCmd)
     2664int VBoxVHWAImage::vhwaSurfaceLock(struct VBOXVHWACMD_SURF_LOCK RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    26652665{
    26662666    VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
    … …  
    26752675}
    26762676
    2677 int VBoxVHWAImage::vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK *pCmd)
     2677int VBoxVHWAImage::vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    26782678{
    26792679    VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
    … …  
    27162716}
    27172717
    2718 int VBoxVHWAImage::vhwaSurfaceBlt(struct VBOXVHWACMD_SURF_BLT *pCmd)
     2718int VBoxVHWAImage::vhwaSurfaceBlt(struct VBOXVHWACMD_SURF_BLT RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    27192719{
    27202720    Q_UNUSED(pCmd);
    … …  
    27222722}
    27232723
    2724 int VBoxVHWAImage::vhwaSurfaceFlip(struct VBOXVHWACMD_SURF_FLIP *pCmd)
     2724int VBoxVHWAImage::vhwaSurfaceFlip(struct VBOXVHWACMD_SURF_FLIP RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    27252725{
    27262726    VBoxVHWASurfaceBase *pTargSurf = handle2Surface(pCmd->u.in.hTargSurf);
    … …  
    27462746}
    27472747
    2748 int VBoxVHWAImage::vhwaSurfaceColorFill(struct VBOXVHWACMD_SURF_COLORFILL *pCmd)
     2748int VBoxVHWAImage::vhwaSurfaceColorFill(struct VBOXVHWACMD_SURF_COLORFILL RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    27492749{
    27502750    NOREF(pCmd);
    … …  
    27522752}
    27532753
    2754 void VBoxVHWAImage::vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd)
     2754void VBoxVHWAImage::vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf,
     2755                                               struct VBOXVHWACMD_SURF_OVERLAY_UPDATE RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    27552756{
    27562757    if(pCmd->u.in.flags & VBOXVHWA_OVER_KEYDEST)
    … …  
    28322833}
    28332834
    2834 int VBoxVHWAImage::vhwaSurfaceOverlayUpdate(struct VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd)
     2835int VBoxVHWAImage::vhwaSurfaceOverlayUpdate(struct VBOXVHWACMD_SURF_OVERLAY_UPDATE RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    28352836{
    28362837    VBoxVHWASurfaceBase *pSrcSurf = handle2Surface(pCmd->u.in.hSrcSurf);
    … …  
    28992900}
    29002901
    2901 int VBoxVHWAImage::vhwaSurfaceOverlaySetPosition(struct VBOXVHWACMD_SURF_OVERLAY_SETPOSITION *pCmd)
     2902int VBoxVHWAImage::vhwaSurfaceOverlaySetPosition(struct VBOXVHWACMD_SURF_OVERLAY_SETPOSITION RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    29022903{
    29032904    VBoxVHWASurfaceBase *pDstSurf = handle2Surface(pCmd->u.in.hDstSurf);
    … …  
    29402941}
    29412942
    2942 int VBoxVHWAImage::vhwaSurfaceColorkeySet(struct VBOXVHWACMD_SURF_COLORKEY_SET *pCmd)
     2943int VBoxVHWAImage::vhwaSurfaceColorkeySet(struct VBOXVHWACMD_SURF_COLORKEY_SET RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    29432944{
    29442945    VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
    … …  
    29752976}
    29762977
    2977 int VBoxVHWAImage::vhwaQueryInfo1(struct VBOXVHWACMD_QUERYINFO1 *pCmd)
     2978int VBoxVHWAImage::vhwaQueryInfo1(struct VBOXVHWACMD_QUERYINFO1 RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    29782979{
    29792980    VBOXQGLLOG_ENTER(("\n"));
    … …  
    30013002    }
    30023003
    3003     memset(pCmd, 0, sizeof(VBOXVHWACMD_QUERYINFO1));
    3004     if(bEnabled)
     3004    memset((void *)pCmd, 0, sizeof(VBOXVHWACMD_QUERYINFO1));
     3005    if (bEnabled)
    30053006    {
    30063007        pCmd->u.out.cfgFlags = VBOXVHWA_CFG_ENABLED;
    … …  
    30783079}
    30793080
    3080 int VBoxVHWAImage::vhwaQueryInfo2(struct VBOXVHWACMD_QUERYINFO2 *pCmd)
     3081int VBoxVHWAImage::vhwaQueryInfo2(struct VBOXVHWACMD_QUERYINFO2 RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    30813082{
    30823083    VBOXQGLLOG_ENTER(("\n"));
    … …  
    30903091
    30913092    pCmd->numFourCC = (uint32_t)num;
    3092     memcpy(pCmd->FourCC, aFourcc, num*sizeof(aFourcc[0]));
     3093    memcpy((void *)pCmd->FourCC, aFourcc, num * sizeof(aFourcc[0]));
    30933094    return VINF_SUCCESS;
    30943095}
    … …  
    31983199    pCmd->Flags = VBOXVHWACMD_FLAG_HH_CMD;
    31993200
    3200     VBOXVHWACMD_SURF_CREATE * pCreateSurf = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_CREATE);
     3201    VBOXVHWACMD_SURF_CREATE *pCreateSurf = VBOXVHWACMD_BODY_HOST_HEAP(pCmd, VBOXVHWACMD_SURF_CREATE);
    32013202    int rc;
    32023203    uint32_t u32;
    … …  
    33583359    pCmd->Flags = VBOXVHWACMD_FLAG_HH_CMD;
    33593360
    3360     VBOXVHWACMD_SURF_OVERLAY_UPDATE * pUpdateOverlay = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_UPDATE);
     3361    VBOXVHWACMD_SURF_OVERLAY_UPDATE *pUpdateOverlay = VBOXVHWACMD_BODY_HOST_HEAP(pCmd, VBOXVHWACMD_SURF_OVERLAY_UPDATE);
    33613362    int rc;
    33623363
    … …  
    35193520}
    35203521
    3521 int VBoxVHWAImage::vhwaLoadExec(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version)
     3522int VBoxVHWAImage::vhwaLoadExec(VHWACommandList *pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version)
    35223523{
    35233524    VBOXQGL_LOAD_START(pSSM);
    … …  
    43064307        case VBOXVHWACMD_TYPE_HH_CONSTRUCT:
    43074308        {
    4308             VBOXVHWACMD_HH_CONSTRUCT * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_HH_CONSTRUCT);
     4309            VBOXVHWACMD_HH_CONSTRUCT *pBody = VBOXVHWACMD_BODY_HOST_HEAP(pCmd, VBOXVHWACMD_HH_CONSTRUCT);
    43094310            pCmd->Flags &= ~VBOXVHWACMD_FLAG_HG_ASYNCH;
    43104311            pCmd->rc = vhwaConstruct(pBody);
    … …  
    43454346        case VBOXVHWACMD_TYPE_HH_SAVESTATE_SAVEPERFORM:
    43464347        {
    4347             VBOXVHWACMD_HH_SAVESTATE_SAVEPERFORM *pSave = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_HH_SAVESTATE_SAVEPERFORM);
     4348            VBOXVHWACMD_HH_SAVESTATE_SAVEPERFORM *pSave = VBOXVHWACMD_BODY_HOST_HEAP(pCmd, VBOXVHWACMD_HH_SAVESTATE_SAVEPERFORM);
    43484349            PSSMHANDLE pSSM = pSave->pSSM;
    43494350            int rc = SSMR3PutU32(pSSM, VBOXQGL_STATE_VERSION); AssertRC(rc);
    … …  
    43594360        case VBOXVHWACMD_TYPE_HH_SAVESTATE_LOADPERFORM:
    43604361        {
    4361             VBOXVHWACMD_HH_SAVESTATE_LOADPERFORM *pLoad = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_HH_SAVESTATE_LOADPERFORM);
     4362            VBOXVHWACMD_HH_SAVESTATE_LOADPERFORM *pLoad = VBOXVHWACMD_BODY_HOST_HEAP(pCmd, VBOXVHWACMD_HH_SAVESTATE_LOADPERFORM);
    43624363            PSSMHANDLE pSSM = pLoad->pSSM;
    43634364            uint32_t u32Version = 0;
    … …  
    43834384        {
    43844385#ifdef RT_STRICT
    4385             VBOXVHWACMD_QUERYINFO1 * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO1);
     4386            VBOXVHWACMD_QUERYINFO1 RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO1);
    43864387#endif
    43874388            Assert(pBody->u.in.guestVersion.maj == VBOXVHWA_VERSION_MAJ);
    … …  
    46744675}
    46754676
    4676 int VBoxQGLOverlay::vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK *pCmd)
     4677int VBoxQGLOverlay::vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK RT_UNTRUSTED_VOLATILE_GUEST *pCmd)
    46774678{
    46784679    int rc = mOverlayImage.vhwaSurfaceUnlock(pCmd);
    … …  
    46944695        case VBOXVHWACMD_TYPE_SURF_CANCREATE:
    46954696        {
    4696             VBOXVHWACMD_SURF_CANCREATE * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_CANCREATE);
     4697            VBOXVHWACMD_SURF_CANCREATE RT_UNTRUSTED_VOLATILE_GUEST  *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_CANCREATE);
    46974698            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    46984699            initGl();
    … …  
    47034704        case VBOXVHWACMD_TYPE_SURF_CREATE:
    47044705        {
    4705             VBOXVHWACMD_SURF_CREATE * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_CREATE);
     4706            VBOXVHWACMD_SURF_CREATE RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_CREATE);
    47064707            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    47074708            initGl();
    … …  
    47284729        case VBOXVHWACMD_TYPE_SURF_DESTROY:
    47294730        {
    4730             VBOXVHWACMD_SURF_DESTROY * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
     4731            VBOXVHWACMD_SURF_DESTROY RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
    47314732            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    47324733            initGl();
    … …  
    47514752        case VBOXVHWACMD_TYPE_SURF_LOCK:
    47524753        {
    4753             VBOXVHWACMD_SURF_LOCK * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_LOCK);
     4754            VBOXVHWACMD_SURF_LOCK RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_LOCK);
    47544755            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    47554756            initGl();
    … …  
    47604761        case VBOXVHWACMD_TYPE_SURF_UNLOCK:
    47614762        {
    4762             VBOXVHWACMD_SURF_UNLOCK * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_UNLOCK);
     4763            VBOXVHWACMD_SURF_UNLOCK RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_UNLOCK);
    47634764            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    47644765            initGl();
    … …  
    47704771        case VBOXVHWACMD_TYPE_SURF_BLT:
    47714772        {
    4772             VBOXVHWACMD_SURF_BLT * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_BLT);
     4773            VBOXVHWACMD_SURF_BLT RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_BLT);
    47734774            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    47744775            initGl();
    … …  
    47804781        case VBOXVHWACMD_TYPE_SURF_FLIP:
    47814782        {
    4782             VBOXVHWACMD_SURF_FLIP * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_FLIP);
     4783            VBOXVHWACMD_SURF_FLIP RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_FLIP);
    47834784            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    47844785            initGl();
    … …  
    47904791        case VBOXVHWACMD_TYPE_SURF_OVERLAY_UPDATE:
    47914792        {
    4792             VBOXVHWACMD_SURF_OVERLAY_UPDATE * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_UPDATE);
     4793            VBOXVHWACMD_SURF_OVERLAY_UPDATE RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_UPDATE);
    47934794            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    47944795            initGl();
    … …  
    48064807        case VBOXVHWACMD_TYPE_SURF_OVERLAY_SETPOSITION:
    48074808        {
    4808             VBOXVHWACMD_SURF_OVERLAY_SETPOSITION * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_SETPOSITION);
     4809            VBOXVHWACMD_SURF_OVERLAY_SETPOSITION RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_SETPOSITION);
    48094810            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    48104811            initGl();
    … …  
    48234824        case VBOXVHWACMD_TYPE_SURF_COLORFILL:
    48244825        {
    4825             VBOXVHWACMD_SURF_COLORFILL * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_COLORFILL);
     4826            VBOXVHWACMD_SURF_COLORFILL RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_COLORFILL);
    48264827            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    48274828            initGl();
    … …  
    48344835        case VBOXVHWACMD_TYPE_SURF_COLORKEY_SET:
    48354836        {
    4836             VBOXVHWACMD_SURF_COLORKEY_SET * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_COLORKEY_SET);
     4837            VBOXVHWACMD_SURF_COLORKEY_SET RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_COLORKEY_SET);
    48374838            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    48384839            initGl();
    … …  
    48464847        case VBOXVHWACMD_TYPE_QUERY_INFO1:
    48474848        {
    4848             VBOXVHWACMD_QUERYINFO1 * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO1);
     4849            VBOXVHWACMD_QUERYINFO1 RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO1);
    48494850            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    48504851            initGl();
    … …  
    48554856        case VBOXVHWACMD_TYPE_QUERY_INFO2:
    48564857        {
    4857             VBOXVHWACMD_QUERYINFO2 * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO2);
     4858            VBOXVHWACMD_QUERYINFO2 RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO2);
    48584859            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    48594860            initGl();
    … …  
    48734874        case VBOXVHWACMD_TYPE_HH_CONSTRUCT:
    48744875        {
    4875             VBOXVHWACMD_HH_CONSTRUCT * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_HH_CONSTRUCT);
     4876            VBOXVHWACMD_HH_CONSTRUCT *pBody = VBOXVHWACMD_BODY_HOST_HEAP(pCmd, VBOXVHWACMD_HH_CONSTRUCT);
    48764877            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    48774878            pCmd->rc = vhwaConstruct(pBody);
    … …  
    48814882        case VBOXVHWACMD_TYPE_SURF_GETINFO:
    48824883        {
    4883             VBOXVHWACMD_SURF_GETINFO * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_GETINFO);
     4884            VBOXVHWACMD_SURF_GETINFO RT_UNTRUSTED_VOLATILE_GUEST *pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_GETINFO);
    48844885            Assert(!mGlOn == !mOverlayImage.hasSurfaces());
    48854886            pCmd->rc = mOverlayImage.vhwaSurfaceGetInfo(pBody);

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

    r69500 r71594  
    14111411    static int vhwaLoadExec(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version);
    14121412
    1413     int vhwaSurfaceCanCreate(struct VBOXVHWACMD_SURF_CANCREATE *pCmd);
    1414     int vhwaSurfaceCreate(struct VBOXVHWACMD_SURF_CREATE *pCmd);
     1413    int vhwaSurfaceCanCreate(struct VBOXVHWACMD_SURF_CANCREATE RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1414    int vhwaSurfaceCreate(struct VBOXVHWACMD_SURF_CREATE RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
    14151415#ifdef VBOX_WITH_WDDM
    1416     int vhwaSurfaceGetInfo(struct VBOXVHWACMD_SURF_GETINFO *pCmd);
     1416    int vhwaSurfaceGetInfo(struct VBOXVHWACMD_SURF_GETINFO RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
    14171417#endif
    1418     int vhwaSurfaceDestroy(struct VBOXVHWACMD_SURF_DESTROY *pCmd);
    1419     int vhwaSurfaceLock(struct VBOXVHWACMD_SURF_LOCK *pCmd);
    1420     int vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK *pCmd);
    1421     int vhwaSurfaceBlt(struct VBOXVHWACMD_SURF_BLT *pCmd);
    1422     int vhwaSurfaceFlip(struct VBOXVHWACMD_SURF_FLIP *pCmd);
    1423     int vhwaSurfaceColorFill(struct VBOXVHWACMD_SURF_COLORFILL *pCmd);
    1424     int vhwaSurfaceOverlayUpdate(struct VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmf);
    1425     int vhwaSurfaceOverlaySetPosition(struct VBOXVHWACMD_SURF_OVERLAY_SETPOSITION *pCmd);
    1426     int vhwaSurfaceColorkeySet(struct VBOXVHWACMD_SURF_COLORKEY_SET *pCmd);
    1427     int vhwaQueryInfo1(struct VBOXVHWACMD_QUERYINFO1 *pCmd);
    1428     int vhwaQueryInfo2(struct VBOXVHWACMD_QUERYINFO2 *pCmd);
     1418    int vhwaSurfaceDestroy(struct VBOXVHWACMD_SURF_DESTROY RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1419    int vhwaSurfaceLock(struct VBOXVHWACMD_SURF_LOCK RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1420    int vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1421    int vhwaSurfaceBlt(struct VBOXVHWACMD_SURF_BLT RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1422    int vhwaSurfaceFlip(struct VBOXVHWACMD_SURF_FLIP RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1423    int vhwaSurfaceColorFill(struct VBOXVHWACMD_SURF_COLORFILL RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1424    int vhwaSurfaceOverlayUpdate(struct VBOXVHWACMD_SURF_OVERLAY_UPDATE RT_UNTRUSTED_VOLATILE_GUEST *pCmf);
     1425    int vhwaSurfaceOverlaySetPosition(struct VBOXVHWACMD_SURF_OVERLAY_SETPOSITION RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1426    int vhwaSurfaceColorkeySet(struct VBOXVHWACMD_SURF_COLORKEY_SET RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1427    int vhwaQueryInfo1(struct VBOXVHWACMD_QUERYINFO1 RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
     1428    int vhwaQueryInfo2(struct VBOXVHWACMD_QUERYINFO2 RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
    14291429    int vhwaConstruct(struct VBOXVHWACMD_HH_CONSTRUCT *pCmd);
    14301430
    … …  
    15301530    static int vhwaLoadVHWAEnable(VHWACommandList * pCmdList);
    15311531
    1532     void vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd);
     1532    void vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf,
     1533                                    struct VBOXVHWACMD_SURF_OVERLAY_UPDATE RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
    15331534#endif
    15341535
    … …  
    17541755    void vhwaSaveExec (struct SSMHANDLE * pSSM);
    17551756private:
    1756     int vhwaSurfaceUnlock (struct VBOXVHWACMD_SURF_UNLOCK *pCmd);
     1757    int vhwaSurfaceUnlock (struct VBOXVHWACMD_SURF_UNLOCK RT_UNTRUSTED_VOLATILE_GUEST *pCmd);
    17571758
    17581759    void repaintMain();
Note: See TracChangeset for help on using the changeset viewer.

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