VirtualBox

Ignore:
Timestamp:
Jun 12, 2011 6:37:56 PM (14 years ago)
Author:
vboxsync
Message:

Ran the source code massager (scm).

Location:
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.h

    r36867 r37423  
    102102    HANDLE hDriver;                          /* Display device handle which was passed to VBoxDispDrvEnablePDEV */
    103103    HDEV   hDevGDI;                          /* GDI's handle for PDEV created in VBoxDispDrvEnablePDEV */
    104    
     104
    105105    VBOXDISPCURRENTMODE mode;                /* Current device mode */
    106106    ULONG iDevice;                           /* Miniport's device index */
    … …  
    152152VOID APIENTRY VBoxDispDrvDisableSurface(DHPDEV dhpdev);
    153153
    154 BOOL APIENTRY VBoxDispDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 
     154BOOL APIENTRY VBoxDispDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo,
    155155                                LONG x1, LONG y1, LONG x2, LONG y2, RECTL *prclBounds, MIX mix);
    156156BOOL APIENTRY VBoxDispDrvStrokePath(SURFOBJ *pso, PATHOBJ *ppo, CLIPOBJ *pco, XFORMOBJ *pxo,
    … …  
    171171                                    COLORADJUSTMENT *pca, POINTL *pptlHTOrg, RECTL *prclDest, RECTL *prclSrc,
    172172                                    POINTL *pptlMask, ULONG iMode);
    173 BOOL APIENTRY VBoxDispDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 
     173BOOL APIENTRY VBoxDispDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo,
    174174                                  RECTL *prclDest, POINTL *pptlSrc);
    175175
    … …  
    192192
    193193#ifdef VBOX_WITH_DDRAW
    194 BOOL APIENTRY VBoxDispDrvGetDirectDrawInfo(DHPDEV dhpdev, DD_HALINFO *pHalInfo, DWORD *pdwNumHeaps, 
     194BOOL APIENTRY VBoxDispDrvGetDirectDrawInfo(DHPDEV dhpdev, DD_HALINFO *pHalInfo, DWORD *pdwNumHeaps,
    195195                                           VIDEOMEMORY *pvmList, DWORD *pdwNumFourCCCodes, DWORD *pdwFourCC);
    196 BOOL APIENTRY VBoxDispDrvEnableDirectDraw(DHPDEV dhpdev, DD_CALLBACKS *pCallBacks, 
     196BOOL APIENTRY VBoxDispDrvEnableDirectDraw(DHPDEV dhpdev, DD_CALLBACKS *pCallBacks,
    197197                                          DD_SURFACECALLBACKS *pSurfaceCallBacks,
    198198                                          DD_PALETTECALLBACKS *pPaletteCallBacks);
    … …  
    217217    return pso;
    218218}
    219                                                        
     219
    220220#endif /*VBOXDISP_H*/

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDDraw.cpp

    r36867 r37423  
    248248}
    249249
    250 /* Called to destroy DirectDraw surface, 
     250/* Called to destroy DirectDraw surface,
    251251 * in particular we should free vhwa resources allocated on VBoxDispDDCreateSurface.
    252252 * Note: we're always returning DDHAL_DRIVER_NOTHANDLED because we rely on DirectDraw memory manager.
    … …  
    499499            VBoxVBVABufferEndUpdate(&pDev->vbvaCtx);
    500500        }
    501         else if ((pSurf->ddsCaps.dwCaps & DDSCAPS_VISIBLE) 
     501        else if ((pSurf->ddsCaps.dwCaps & DDSCAPS_VISIBLE)
    502502                 || ((pSurf->ddsCaps.dwCaps & DDSCAPS_OVERLAY) && pDesc->bVisible))
    503503        {

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDDrawVHWA.cpp

    r36867 r37423  
    5959    if (VBOXVHWA_CAP(pDev, VBOXVHWA_CAPS_BLT))
    6060    {
    61         /* we only support simple dst=src copy 
     61        /* we only support simple dst=src copy
    6262         * Note: search "ternary raster operations" on msdn for more info
    6363         */
    … …  
    540540            {
    541541                PVBOXVHWASURFDESC pDstDesc = (PVBOXVHWASURFDESC) pDstSurf->lpGbl->dwReserved1;
    542    
     542
    543543                if (!pDstDesc)
    544544                {

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDrawCmd.cpp

    r36867 r37423  
    285285 */
    286286
    287 BOOL APIENTRY 
     287BOOL APIENTRY
    288288VBoxDispDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, LONG x1, LONG y1, LONG x2, LONG y2,
    289289                  RECTL *prclBounds, MIX mix)
    … …  
    300300}
    301301
    302 BOOL APIENTRY 
     302BOOL APIENTRY
    303303VBoxDispDrvStrokePath(SURFOBJ *pso, PATHOBJ *ppo, CLIPOBJ *pco, XFORMOBJ *pxo,
    304304                      BRUSHOBJ  *pbo, POINTL *pptlBrushOrg, LINEATTRS *plineattrs, MIX mix)
    … …  
    315315}
    316316
    317 BOOL APIENTRY 
     317BOOL APIENTRY
    318318VBoxDispDrvFillPath(SURFOBJ *pso, PATHOBJ *ppo, CLIPOBJ *pco, BRUSHOBJ *pbo, POINTL *pptlBrushOrg,
    319319                    MIX mix, FLONG flOptions)
    … …  
    343343}
    344344
    345 BOOL APIENTRY 
     345BOOL APIENTRY
    346346VBoxDispDrvTextOut(SURFOBJ *pso, STROBJ *pstro, FONTOBJ *pfo, CLIPOBJ *pco,
    347347                   RECTL *prclExtra, RECTL *prclOpaque, BRUSHOBJ *pboFore,
    … …  
    498498}
    499499
    500 BOOL APIENTRY 
     500BOOL APIENTRY
    501501VBoxDispDrvBitBlt(SURFOBJ *psoTrg, SURFOBJ *psoSrc, SURFOBJ *psoMask, CLIPOBJ *pco, XLATEOBJ *pxlo,
    502502                  RECTL *prclTrg, POINTL *pptlSrc, POINTL *pptlMask, BRUSHOBJ *pbo, POINTL *pptlBrush, ROP4 rop4)
    … …  
    509509         "pptlMask = %p, pbo = %p, pptlBrush = %p, rop4 = %08X",
    510510         psoTrg, psoSrc, psoMask, pco, pxlo, prclTrg, pptlSrc, pptlMask, pbo, pptlBrush, rop4));
    511    
     511
    512512    bRc = EngBitBlt(getSurfObj(psoTrg), getSurfObj(psoSrc), psoMask, pco, pxlo, prclTrg, pptlSrc, pptlMask, pbo, pptlBrush, rop4);
    513513    VBVA_OPERATION(psoTrg, BitBlt,
    … …  
    537537
    538538BOOL APIENTRY
    539 VBoxDispDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 
     539VBoxDispDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo,
    540540                    RECTL *prclDest, POINTL *pptlSrc)
    541541{

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriverDDraw.cpp

    r36867 r37423  
    6363/* Called to get supported DirectDraw caps */
    6464BOOL APIENTRY
    65 VBoxDispDrvGetDirectDrawInfo(DHPDEV dhpdev, DD_HALINFO *pHalInfo, DWORD *pdwNumHeaps, 
     65VBoxDispDrvGetDirectDrawInfo(DHPDEV dhpdev, DD_HALINFO *pHalInfo, DWORD *pdwNumHeaps,
    6666                             VIDEOMEMORY *pvmList, DWORD *pdwNumFourCCCodes, DWORD *pdwFourCC)
    6767{
    … …  
    181181            pSurfaceCallBacks->dwFlags |= DDHAL_SURFCB32_UPDATEOVERLAY|DDHAL_SURFCB32_SETOVERLAYPOSITION;
    182182        }
    183     }   
     183    }
    184184#endif
    185185

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispMini.cpp

    r36867 r37423  
    5858
    5959    /* Allocate temp buffer */
    60     pMiniportModes = (PVIDEO_MODE_INFORMATION) 
     60    pMiniportModes = (PVIDEO_MODE_INFORMATION)
    6161                     EngAllocMem(0, numModes.NumModes*numModes.ModeInformationLength, MEM_ALLOC_TAG);
    6262
    … …  
    7575        VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR);
    7676    }
    77    
     77
    7878    /* Check which of miniport modes are supprted by display driver.
    7979     * Note: size of VIDEO_MODE_INFORMATION is returned by miniport driver in numModes.ModeInformationLength,
    … …  
    111111
    112112    /* Allocate and zero output buffer */
    113     *ppModesTable = (PVIDEO_MODE_INFORMATION) 
     113    *ppModesTable = (PVIDEO_MODE_INFORMATION)
    114114                    EngAllocMem(FL_ZERO_MEMORY, cSupportedModes*sizeof(VIDEO_MODE_INFORMATION), MEM_ALLOC_TAG);
    115115
    … …  
    121121    }
    122122
    123     /* Copy supported modes to output buffer */   
     123    /* Copy supported modes to output buffer */
    124124    pMode = pMiniportModes;
    125125    for (j=0, i=0; i<numModes.NumModes; ++i)
    … …  
    238238
    239239    memset(pInfo, 0, sizeof(QUERYHGSMIRESULT));
    240     dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_QUERY_HGSMI_INFO, NULL, 0, 
     240    dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_QUERY_HGSMI_INFO, NULL, 0,
    241241                              pInfo, sizeof(QUERYHGSMIRESULT), &cbReturned);
    242242    VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR);
    … …  
    343343    Assert(pDev->pointer.pAttrs);
    344344
    345     dwrc = EngDeviceIoControl(pDev->hDriver, IOCTL_VIDEO_SET_POINTER_ATTR, pDev->pointer.pAttrs, pDev->pointer.cbAttrs, 
     345    dwrc = EngDeviceIoControl(pDev->hDriver, IOCTL_VIDEO_SET_POINTER_ATTR, pDev->pointer.pAttrs, pDev->pointer.cbAttrs,
    346346                              NULL, 0, &cbReturned);
    347347    VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR);
    … …  
    384384    LOGF_ENTER();
    385385
    386     dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_SHARE_VIDEO_MEMORY, pSMem, sizeof(VIDEO_SHARE_MEMORY), 
     386    dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_SHARE_VIDEO_MEMORY, pSMem, sizeof(VIDEO_SHARE_MEMORY),
    387387                              pSMemInfo, sizeof(VIDEO_SHARE_MEMORY_INFORMATION), &cbReturned);
    388388    VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR);
    389     VBOX_WARN_IOCTLCB_RETRC("IOCTL_VIDEO_SHARE_VIDEO_MEMORY", cbReturned, 
     389    VBOX_WARN_IOCTLCB_RETRC("IOCTL_VIDEO_SHARE_VIDEO_MEMORY", cbReturned,
    390390                            sizeof(VIDEO_SHARE_MEMORY_INFORMATION), VERR_DEV_IO_ERROR);
    391391
    … …  
    400400    LOGF_ENTER();
    401401
    402     dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY, pSMem, sizeof(VIDEO_SHARE_MEMORY), 
     402    dwrc = EngDeviceIoControl(hDriver, IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY, pSMem, sizeof(VIDEO_SHARE_MEMORY),
    403403                              NULL, 0, &cbReturned);
    404404    VBOX_CHECK_WINERR_RETRC(dwrc, VERR_DEV_IO_ERROR);

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispMouse.cpp

    r36867 r37423  
    206206    {
    207207        LOG(("BMF_32BPP"));
    208         memcpy(psoRes->pvBits, psoBitmap->pvBits, min(psoRes->cjBits, psoBitmap->cjBits)); 
     208        memcpy(psoRes->pvBits, psoBitmap->pvBits, min(psoRes->cjBits, psoBitmap->cjBits));
    209209    }
    210210    else
    … …  
    495495        pDev->pointer.pAttrs->Enable |= VBOX_MOUSE_POINTER_VISIBLE;
    496496    }
    497    
     497
    498498    if (fl & SPS_ALPHA)
    499499    {

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp

    r36867 r37423  
    323323    {
    324324        pDev->hgsmi.bSupported = TRUE;
    325    
     325
    326326        pDev->hgsmi.mp = callbacks;
    327327        pDev->vpAPI = portProcs;
    … …  
    398398    }
    399399
    400     /* Setup HGSMI heap in the display information area. 
     400    /* Setup HGSMI heap in the display information area.
    401401     * The area has some space reserved for HGSMI event flags in the beginning.
    402402     */
    … …  
    561561 */
    562562
    563 void vbvaDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 
     563void vbvaDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo,
    564564                   LONG x1, LONG y1, LONG x2, LONG y2, RECTL *prclBounds, MIX mix)
    565565{
    … …  
    620620}
    621621
    622 void vbvaDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo, 
     622void vbvaDrvCopyBits(SURFOBJ *psoDest, SURFOBJ *psoSrc, CLIPOBJ *pco, XLATEOBJ *pxlo,
    623623                     RECTL *prclDest, POINTL *pptlSrc)
    624624{

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVRDP.cpp

    r36867 r37423  
    929929 */
    930930
    931 void vrdpDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, 
     931void vrdpDrvLineTo(SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo,
    932932                   LONG x1, LONG y1, LONG x2, LONG y2, RECTL *prclBounds, MIX mix)
    933933{
    … …  
    12311231        WARN(("unsupported: pstro->pwszOrg=%p, prclExtra=%p, pfo->flFontType & FO_TYPE_RASTER = 0x%08X, "
    12321232              "pstro->cGlyphs = %d, pboOpaque->iSolidColor %p, pfo->iUniq = %p",
    1233               pstro->pwszOrg, prclExtra, pfo->flFontType & FO_TYPE_RASTER, pstro->cGlyphs, 
     1233              pstro->pwszOrg, prclExtra, pfo->flFontType & FO_TYPE_RASTER, pstro->cGlyphs,
    12341234              pboOpaque? pboOpaque->iSolidColor: 0, pfo->iUniq));
    12351235        vrdpReportDirtyRects(pDev, &clipRects);
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