VirtualBox

Changeset 37423 in vbox for trunk/src/VBox/Additions


Ignore:
Timestamp:
Jun 12, 2011 6:37:56 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
72222
Message:

Ran the source code massager (scm).

Location:
trunk/src/VBox/Additions
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoPortAPI.h

    r36867 r37423  
    7878
    7979    PFNQUEUEDPC pfnQueueDpc;
    80    
     80
    8181    PFNCREATESECONDARYDISPLAY pfnCreateSecondaryDisplay;
    8282} VBOXVIDEOPORTPROCS;

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

    r37216 r37423  
    49554955             * for some reason we're getting pSurf->SysMemPitch as if took 4x1 column from this block,
    49564956             * which leads us to having 4x times bigger pitch than actual line takes.
    4957              * Simply trying to read here provided pointer 
     4957             * Simply trying to read here provided pointer
    49584958             * at (byte*)pSurf->pSysMem + pSurf->pSurf->SysMemPitch*pSurf->Height - 1 causes access violation.
    49594959             */

  • 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);

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp

    r37207 r37423  
    3838
    3939/* Fills given video mode BPP related fields */
    40 static void 
    41 VBoxFillVidModeBPP(VIDEO_MODE_INFORMATION *pMode, ULONG bitsR, ULONG bitsG, ULONG bitsB, 
     40static void
     41VBoxFillVidModeBPP(VIDEO_MODE_INFORMATION *pMode, ULONG bitsR, ULONG bitsG, ULONG bitsB,
    4242                   ULONG maskR, ULONG maskG, ULONG maskB)
    4343{
    … …  
    5151
    5252/* Fills given video mode structure */
    53 static void 
     53static void
    5454VBoxFillVidModeInfo(VIDEO_MODE_INFORMATION *pMode, ULONG xres, ULONG yres, ULONG bpp, ULONG index, ULONG yoffset)
    5555{
    … …  
    327327    }
    328328
    329     /* Check registry for manually added modes, up to 128 entries is supported 
     329    /* Check registry for manually added modes, up to 128 entries is supported
    330330     * Give up on the first error encountered.
    331331     */
    … …  
    537537    uint32_t xres=0, yres=0, bpp=0, display=0;
    538538
    539     /* Check if there's a pending display change request for this display */   
     539    /* Check if there's a pending display change request for this display */
    540540    if (VBoxQueryDisplayRequest(&xres, &yres, &bpp, &display) && (xres || yres || bpp))
    541541    {
    … …  
    720720
    721721        /* Add special mode to the table
    722          * Note: Y offset isn't used for a host-supplied modes 
     722         * Note: Y offset isn't used for a host-supplied modes
    723723         */
    724724        specialMode.ModeIndex = g_NumVideoModes+1;
    … …  
    728728        /* Save special mode in the custom modes table */
    729729        memcpy(&g_CustomVideoModes[pExt->iDevice], &specialMode, sizeof(VIDEO_MODE_INFORMATION));
    730                    
    731        
     730
     731
    732732        /* Make sure we've added 2nd mode if necessary to maintain table size */
    733733        if (VBoxMPIsStartingUp(pExt, pExt->iDevice))
    … …  
    793793
    794794static void
    795 VBoxWddmBuildResolutionTable(PVIDEO_MODE_INFORMATION pModesTable, size_t tableSize, 
     795VBoxWddmBuildResolutionTable(PVIDEO_MODE_INFORMATION pModesTable, size_t tableSize,
    796796                             SIZE *pResolutions, uint32_t * pcResolutions)
    797797{
    … …  
    836836static void
    837837VBoxWddmBuildVideoModesInfo(PVBOXMP_DEVEXT pExt, D3DDDI_VIDEO_PRESENT_TARGET_ID VidPnTargetId,
    838                             PVBOXWDDM_VIDEOMODES_INFO pModes, VIDEO_MODE_INFORMATION *paAddlModes, 
     838                            PVBOXWDDM_VIDEOMODES_INFO pModes, VIDEO_MODE_INFORMATION *paAddlModes,
    839839                            UINT cAddlModes)
    840840{
    … …  
    897897        UINT bpp=8;
    898898#else
    899         UINT bpp=16;   
     899        UINT bpp=16;
    900900#endif
    901901            for (; bpp<=32; bpp+=8)

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

    r36867 r37423  
    8181    pMapInfo->VideoRamLength = pExt->pPrimary->u.primary.ulMaxFrameBufferSize;
    8282
    83     pStatus->Status = VideoPortMapMemory(pExt, framebuffer, &pMapInfo->VideoRamLength, 
     83    pStatus->Status = VideoPortMapMemory(pExt, framebuffer, &pMapInfo->VideoRamLength,
    8484                                         &inIoSpace, &pMapInfo->VideoRamBase);
    8585
    … …  
    157157        pStatus->Information = sizeof(VIDEO_SHARE_MEMORY_INFORMATION);
    158158    }
    159    
     159
    160160    VBOXMPIOCTL_UNHIDE();
    161161    LOGF_LEAVE();
    … …  
    200200    }
    201201
    202     LOG(("width %d, height %d, bpp %d", 
     202    LOG(("width %d, height %d, bpp %d",
    203203         pModeInfo->VisScreenWidth, pModeInfo->VisScreenHeight, pModeInfo->BitsPerPlane));
    204204
    … …  
    216216
    217217    /* Perform actual mode switch */
    218     VBoxVideoSetModeRegisters((USHORT)pModeInfo->VisScreenWidth, (USHORT)pModeInfo->VisScreenHeight, 
     218    VBoxVideoSetModeRegisters((USHORT)pModeInfo->VisScreenWidth, (USHORT)pModeInfo->VisScreenHeight,
    219219                              (USHORT)pModeInfo->VisScreenWidth, (USHORT)pModeInfo->BitsPerPlane, 0, 0, 0);
    220220
    … …  
    241241
    242242/* Called for IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES.
    243  * Returns count of supported video modes and structure size in bytes, 
     243 * Returns count of supported video modes and structure size in bytes,
    244244 * used by the following IOCTL_VIDEO_QUERY_AVAIL_MODES.
    245245 */
    … …  
    342342
    343343            /* Visible and No Shape means show the pointer, 0 means hide pointer.
    344              * It's enough to init only this field. 
     344             * It's enough to init only this field.
    345345             */
    346346            attrs.Enable = bEnable ? VBOX_MOUSE_POINTER_VISIBLE:0;
    … …  
    612612        bRC=FALSE;
    613613    }
    614    
     614
    615615    LOGF_LEAVE();
    616616    return bRC;

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.cpp

    r36867 r37423  
    112112{
    113113    LOGF_ENTER();
    114    
     114
    115115    PVBOXMP_COMMON pCommon = VBoxCommonFromDeviceExt(pExt);
    116116    VBOXVIDEOPORTPROCS *pAPI = &pExt->u.primary.VideoPortProcs;
    … …  
    315315        VbglGRFree(&req->header);
    316316    }
    317     else 
     317    else
    318318    {
    319319        WARN(("VbglGRAlloc(VMMDevVideoAccelEnable) rc = %#xrc", rc));
    … …  
    431431    }
    432432
    433     WARN(("Failed to allocate %d bytes", size));   
     433    WARN(("Failed to allocate %d bytes", size));
    434434    return VERR_GENERAL_FAILURE;
    435435}
    … …  
    445445    PVBOXMP_DEVEXT pExt = VBoxCommonToPrimaryExt(pCommon);
    446446    PEVENT pEvent = (PEVENT)pvEvent;
    447     pExt->u.primary.VideoPortProcs.pfnSetEvent(pExt, pEvent);   
     447    pExt->u.primary.VideoPortProcs.pfnSetEvent(pExt, pEvent);
    448448}
    449449

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPVideoPortAPI.cpp

    r36896 r37423  
    6464}
    6565
    66 static BOOLEAN 
     66static BOOLEAN
    6767vboxQueueDpcVoid(IN PVOID  HwDeviceExtension, IN PMINIPORT_DPC_ROUTINE  CallbackRoutine, IN PVOID  Context)
    6868{

  • trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h

    r37225 r37423  
    3636#define IOCTL_INTERNAL_MOUSE_CONNECT CTL_CODE(FILE_DEVICE_MOUSE, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS)
    3737
    38 typedef VOID (*PFNSERVICECB)(PDEVICE_OBJECT DeviceObject, PMOUSE_INPUT_DATA InputDataStart, 
     38typedef VOID (*PFNSERVICECB)(PDEVICE_OBJECT DeviceObject, PMOUSE_INPUT_DATA InputDataStart,
    3939                             PMOUSE_INPUT_DATA InputDataEnd, PULONG InputDataConsumed);
    4040

  • trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFDriver.cpp

    r37225 r37423  
    145145
    146146static void
    147 VBoxServiceCB(PDEVICE_OBJECT DeviceObject, PMOUSE_INPUT_DATA InputDataStart, 
     147VBoxServiceCB(PDEVICE_OBJECT DeviceObject, PMOUSE_INPUT_DATA InputDataStart,
    148148              PMOUSE_INPUT_DATA InputDataEnd, PULONG InputDataConsumed)
    149149{

  • trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp

    r37226 r37423  
    366366
    367367        LOG(("Number of descriptors: %d", pResourceList->Count));
    368        
     368
    369369        /* Check if device claims IO port 0x60 or int12 */
    370370        for (ULONG i=0; i<pResourceList->Count; ++i)
    … …  
    429429{
    430430    LOGF_ENTER();
    431    
     431
    432432    if (!vboxIsVBGLInited())
    433433    {
    … …  
    486486        }
    487487    }
    488    
     488
    489489    LOGF_LEAVE();
    490490}

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

    r37422 r37423  
    524524    if (ghSeamlessNotifyEvent)
    525525    {
    526         CloseHandle(ghSeamlessNotifyEvent);
     526        CloseHandle(ghSeamlessNotifyEvent);
    527527        ghSeamlessNotifyEvent = NULL;
    528528    }

  • trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp

    r37291 r37423  
    209209            VBOXGUEST_UPDATE_DEVSTATE(pDevExt, SURPRISEREMOVED);
    210210
    211             /* Do nothing here actually. Cleanup is done in IRP_MN_REMOVE_DEVICE. 
     211            /* Do nothing here actually. Cleanup is done in IRP_MN_REMOVE_DEVICE.
    212212             * This request is not expected for VBoxGuest.
    213213             */

  • trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

    r37372 r37423  
    5454    # VBox Xorg Video drivers
    5555    uncompress_file "$1" "vboxvideo_drv_13.so"
    56     uncompress_file "$1" "vboxvideo_drv_14.so" 
    57     uncompress_file "$1" "vboxvideo_drv_15.so" 
    58     uncompress_file "$1" "vboxvideo_drv_16.so" 
    59     uncompress_file "$1" "vboxvideo_drv_17.so" 
    60     uncompress_file "$1" "vboxvideo_drv_18.so" 
    61     uncompress_file "$1" "vboxvideo_drv_19.so" 
     56    uncompress_file "$1" "vboxvideo_drv_14.so"
     57    uncompress_file "$1" "vboxvideo_drv_15.so"
     58    uncompress_file "$1" "vboxvideo_drv_16.so"
     59    uncompress_file "$1" "vboxvideo_drv_17.so"
     60    uncompress_file "$1" "vboxvideo_drv_18.so"
     61    uncompress_file "$1" "vboxvideo_drv_19.so"
    6262    uncompress_file "$1" "vboxvideo_drv_110.so"
    63     uncompress_file "$1" "vboxvideo_drv_70.so" 
    64     uncompress_file "$1" "vboxvideo_drv_71.so" 
     63    uncompress_file "$1" "vboxvideo_drv_70.so"
     64    uncompress_file "$1" "vboxvideo_drv_71.so"
    6565
    6666    # VBox Xorg Mouse drivers
    67     uncompress_file "$1" "vboxmouse_drv_13.so" 
    68     uncompress_file "$1" "vboxmouse_drv_14.so" 
    69     uncompress_file "$1" "vboxmouse_drv_15.so" 
    70     uncompress_file "$1" "vboxmouse_drv_16.so" 
    71     uncompress_file "$1" "vboxmouse_drv_17.so" 
    72     uncompress_file "$1" "vboxmouse_drv_18.so" 
    73     uncompress_file "$1" "vboxmouse_drv_19.so" 
     67    uncompress_file "$1" "vboxmouse_drv_13.so"
     68    uncompress_file "$1" "vboxmouse_drv_14.so"
     69    uncompress_file "$1" "vboxmouse_drv_15.so"
     70    uncompress_file "$1" "vboxmouse_drv_16.so"
     71    uncompress_file "$1" "vboxmouse_drv_17.so"
     72    uncompress_file "$1" "vboxmouse_drv_18.so"
     73    uncompress_file "$1" "vboxmouse_drv_19.so"
    7474    uncompress_file "$1" "vboxmouse_drv_110.so"
    7575    uncompress_file "$1" "vboxmouse_drv_70.so"

  • trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk

    r36195 r37423  
    4646        vboxfs_prov.c
    4747vboxfs_LIBS          = \
    48         $(VBOX_LIB_VBGL_R0) 
     48        $(VBOX_LIB_VBGL_R0)
    4949vboxfs_LDFLAGS      += -N drv/vboxguest
    5050

  • trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

    r37173 r37423  
    453453        {
    454454            RTRECT *pRect;
    455            
     455
    456456            pRect = RectListPushBack(pRects);
    457457            if (!pRect)

  • trunk/src/VBox/Additions/x11/VBoxClient/vector.h

    r36805 r37423  
    3333 *   RTVEC_DECL(TopLevels, Window *)
    3434 * without a semi-colon.  This macro will define a structure (struct TopLevels)
    35  * which contains a dynamically resizeable array of Window * elements.  It 
     35 * which contains a dynamically resizeable array of Window * elements.  It
    3636 * will also define a number of inline methods for manipulating the structure,
    3737 * such as
    … …  
    3939 * which adds a new element to the end of the array and returns it, optionally
    4040 * reallocating the array if there is not enough space for the new element.
    41  * (This particular method prototype differs from the STL equivalent - 
     41 * (This particular method prototype differs from the STL equivalent -
    4242 * push_back - more than most of the other methods).
    43  * 
     43 *
    4444 * To create a vector, one simply needs to declare the structure, in this case
    4545 *   struct TopLevels = RTVEC_INITIALIZER;
    … …  
    5959 *       compiler makes its own decisions about whether to actually
    6060 *       inline a function.
    61  * @note since vector structures must be explicitly instanciated unlike the 
     61 * @note since vector structures must be explicitly instanciated unlike the
    6262 *       C++ vector template, care must be taken not to instanciate a
    6363 *       particular type twice, e.g. once in a header and once in a code file.
    … …  
    138138}
    139139
    140 /** 
     140/**
    141141 * Generic method - return a pointer to one past the last element in the
    142142 * vector.
    … …  
    196196}
    197197
    198 /** 
     198/**
    199199 * Generic method - reset a vector to empty.
    200200 * @note This function does not free any memory
    … …  
    226226}
    227227
    228 /** 
     228/**
    229229 * Generic method - detach the array contained inside a vector and reset the
    230230 * vector to empty.

  • trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c

    r35840 r37423  
    136136# if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
    137137                               , Absolute
    138 # endif                               
     138# endif
    139139                               );
    140140
    … …  
    147147# if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
    148148                               , Absolute
    149 # endif                               
     149# endif
    150150                               );
    151151#endif

  • trunk/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c

    r36020 r37423  
    7474}
    7575
    76 static struct 
     76static struct
    7777{
    7878    PHGSMIGUESTCOMMANDCONTEXT pCtx;
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