VirtualBox

Changeset 57088 in vbox for trunk/include/VBox


Ignore:
Timestamp:
Jul 26, 2015 11:36:29 PM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
101810
Message:

DisplayImpl.cpp: Free the screen shot data in the correct way. pu8Data -> pbData and other cleanups.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/pdmifs.h

    r56439 r57088  
    563563     *
    564564     * @param   pInterface          Pointer to this interface.
    565      * @param   ppu8Data            Where to store the pointer to the allocated buffer.
     565     * @param   ppbData             Where to store the pointer to the allocated
     566     *                              buffer.
    566567     * @param   pcbData             Where to store the actual size of the bitmap.
    567568     * @param   pcx                 Where to store the width of the bitmap.
    … …  
    569570     * @thread  The emulation thread.
    570571     */
    571     DECLR3CALLBACKMEMBER(int, pfnTakeScreenshot,(PPDMIDISPLAYPORT pInterface, uint8_t **ppu8Data, size_t *pcbData, uint32_t *pcx, uint32_t *pcy));
     572    DECLR3CALLBACKMEMBER(int, pfnTakeScreenshot,(PPDMIDISPLAYPORT pInterface, uint8_t **ppbData, size_t *pcbData, uint32_t *pcx, uint32_t *pcy));
    572573
    573574    /**
    … …  
    577578     *
    578579     * @param   pInterface          Pointer to this interface.
    579      * @param   ppu8Data            Pointer to the buffer returned by pfnTakeScreenshot.
     580     * @param   pbData              Pointer to the buffer returned by
     581     *                              pfnTakeScreenshot.
    580582     * @thread  Any.
    581583     */
    582     DECLR3CALLBACKMEMBER(void, pfnFreeScreenshot,(PPDMIDISPLAYPORT pInterface, uint8_t *pu8Data));
     584    DECLR3CALLBACKMEMBER(void, pfnFreeScreenshot,(PPDMIDISPLAYPORT pInterface, uint8_t *pbData));
    583585
    584586    /**
    … …  
    678680     * @thread  Schedules on the emulation thread.
    679681     */
    680     DECLR3CALLBACKMEMBER(int, pfnSendModeHint,
    681                          (PPDMIDISPLAYPORT pInterface, uint32_t cx, uint32_t cy,
    682                           uint32_t cBPP, uint32_t iDisplay, uint32_t dx,
    683                           uint32_t dy, uint32_t fEnabled, uint32_t fNotifyGuest));
     682    DECLR3CALLBACKMEMBER(int, pfnSendModeHint, (PPDMIDISPLAYPORT pInterface, uint32_t cx, uint32_t cy,
     683                                                uint32_t cBPP, uint32_t iDisplay, uint32_t dx,
     684                                                uint32_t dy, uint32_t fEnabled, uint32_t fNotifyGuest));
    684685
    685686    /**
    … …  
    748749     * @thread  The emulation thread.
    749750     */
    750     DECLR3CALLBACKMEMBER(int, pfnResize,(PPDMIDISPLAYCONNECTOR pInterface, uint32_t cBits, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy));
     751    DECLR3CALLBACKMEMBER(int, pfnResize,(PPDMIDISPLAYCONNECTOR pInterface, uint32_t cBits, void *pvVRAM, uint32_t cbLine,
     752                                         uint32_t cx, uint32_t cy));
    751753
    752754    /**
    … …  
    797799     * @thread  The emulation thread.
    798800     */
    799     DECLR3CALLBACKMEMBER(void, pfnLFBModeChange, (PPDMIDISPLAYCONNECTOR pInterface, bool fEnabled));
     801    DECLR3CALLBACKMEMBER(void, pfnLFBModeChange,(PPDMIDISPLAYCONNECTOR pInterface, bool fEnabled));
    800802
    801803    /**
    … …  
    809811     * @thread  The emulation thread.
    810812     */
    811     DECLR3CALLBACKMEMBER(void, pfnProcessAdapterData, (PPDMIDISPLAYCONNECTOR pInterface, void *pvVRAM, uint32_t u32VRAMSize));
     813    DECLR3CALLBACKMEMBER(void, pfnProcessAdapterData,(PPDMIDISPLAYCONNECTOR pInterface, void *pvVRAM, uint32_t u32VRAMSize));
    812814
    813815    /**
    … …  
    821823     * @thread  The emulation thread.
    822824     */
    823     DECLR3CALLBACKMEMBER(void, pfnProcessDisplayData, (PPDMIDISPLAYCONNECTOR pInterface, void *pvVRAM, unsigned uScreenId));
     825    DECLR3CALLBACKMEMBER(void, pfnProcessDisplayData,(PPDMIDISPLAYCONNECTOR pInterface, void *pvVRAM, unsigned uScreenId));
    824826
    825827    /**
    … …  
    833835     * @thread  The emulation thread.
    834836     */
    835     DECLR3CALLBACKMEMBER(int, pfnVHWACommandProcess, (PPDMIDISPLAYCONNECTOR pInterface, PVBOXVHWACMD pCmd));
     837    DECLR3CALLBACKMEMBER(int, pfnVHWACommandProcess,(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVHWACMD pCmd));
    836838
    837839    /**
    … …  
    842844     * @thread  The emulation thread.
    843845     */
    844     DECLR3CALLBACKMEMBER(void, pfnCrHgsmiCommandProcess, (PPDMIDISPLAYCONNECTOR pInterface, struct VBOXVDMACMD_CHROMIUM_CMD* pCmd, uint32_t cbCmd));
     846    DECLR3CALLBACKMEMBER(void, pfnCrHgsmiCommandProcess,(PPDMIDISPLAYCONNECTOR pInterface, struct VBOXVDMACMD_CHROMIUM_CMD* pCmd, uint32_t cbCmd));
    845847
    846848    /**
    … …  
    851853     * @thread  The emulation thread.
    852854     */
    853     DECLR3CALLBACKMEMBER(void, pfnCrHgsmiControlProcess, (PPDMIDISPLAYCONNECTOR pInterface, struct VBOXVDMACMD_CHROMIUM_CTL* pCtl, uint32_t cbCtl));
     855    DECLR3CALLBACKMEMBER(void, pfnCrHgsmiControlProcess,(PPDMIDISPLAYCONNECTOR pInterface, struct VBOXVDMACMD_CHROMIUM_CTL* pCtl, uint32_t cbCtl));
    854856
    855857    /**
    … …  
    858860     * @param   pInterface          Pointer to this interface.
    859861     * @param   pCmd                Video HW Acceleration Command to be processed.
    860      * @thread  The emulation thread.
    861      */
    862     DECLR3CALLBACKMEMBER(int, pfnCrHgcmCtlSubmit, (PPDMIDISPLAYCONNECTOR pInterface,
    863                                             struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd,
    864                                             PFNCRCTLCOMPLETION pfnCompletion,
    865                                             void *pvCompletion));
     862     * @param   cbCmd               Undocumented!
     863     * @param   pfnCompletion       Undocumented!
     864     * @param   pvCompletion        Undocumented!
     865     * @thread  The emulation thread.
     866     */
     867    DECLR3CALLBACKMEMBER(int, pfnCrHgcmCtlSubmit,(PPDMIDISPLAYCONNECTOR pInterface, struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd,
     868                                                  PFNCRCTLCOMPLETION pfnCompletion, void *pvCompletion));
    866869
    867870    /**
    … …  
    870873     * @param   pInterface          Pointer to this interface.
    871874     * @param   uScreenId           The screen updates are for.
     875     * @param   pHostFlags          Undocumented!
    872876     * @param   fRenderThreadMode   if true - the graphics device has a separate thread that does all rendering.
    873877     *                              This means that:
    … …  
    879883     * @thread  if fRenderThreadMode is TRUE - the render thread, otherwise - the emulation thread.
    880884     */
    881     DECLR3CALLBACKMEMBER(int, pfnVBVAEnable,(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId, PVBVAHOSTFLAGS pHostFlags, bool fRenderThreadMode));
     885    DECLR3CALLBACKMEMBER(int, pfnVBVAEnable,(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId,
     886                                             PVBVAHOSTFLAGS pHostFlags, bool fRenderThreadMode));
    882887
    883888    /**
    … …  
    905910     *
    906911     * @param   pInterface          Pointer to this interface.
     912     * @param   uScreenId           The screen updates are for.
    907913     * @param   pCmd                Video HW Acceleration Command to be processed.
     914     * @param   cbCmd               Undocumented!
    908915     * @thread  if render thread mode is on (fRenderThreadMode that was passed to pfnVBVAEnable is TRUE) - the render thread pfnVBVAEnable was called in,
    909916     *          otherwise - the emulation thread.
    910917     */
    911     DECLR3CALLBACKMEMBER(void, pfnVBVAUpdateProcess,(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId, const PVBVACMDHDR pCmd, size_t cbCmd));
     918    DECLR3CALLBACKMEMBER(void, pfnVBVAUpdateProcess,(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId,
     919                                                     const PVBVACMDHDR pCmd, size_t cbCmd));
    912920
    913921    /**
    … …  
    964972     */
    965973    DECLR3CALLBACKMEMBER(int, pfnVBVAMousePointerShape,(PPDMIDISPLAYCONNECTOR pInterface, bool fVisible, bool fAlpha,
    966                                                         uint32_t xHot, uint32_t yHot,
    967                                                         uint32_t cx, uint32_t cy,
     974                                                        uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy,
    968975                                                        const void *pvShape));
    969976
    … …  
    983990     */
    984991    /** Pointer to the display data buffer. */
    985     uint8_t        *pu8Data;
     992    uint8_t        *pbData;
    986993    /** Size of a scanline in the data buffer. */
    987994    uint32_t        cbScanline;
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