- Timestamp:
- Mar 31, 2018 9:32:29 PM (7 years ago)
- Location:
- trunk/src/VBox/Main
- Files:
-
- 2 edited
-
include/DisplayImpl.h (modified) (5 diffs)
-
src-client/DisplayImpl.cpp (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/DisplayImpl.h
r71590 r71597 174 174 void i_handleCrHgsmiCommandCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam); 175 175 void i_handleCrHgsmiControlCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam); 176 void i_handleCrHgsmiCommandProcess( PVBOXVDMACMD_CHROMIUM_CMDpCmd, uint32_t cbCmd);177 void i_handleCrHgsmiControlProcess( PVBOXVDMACMD_CHROMIUM_CTLpCtl, uint32_t cbCtl);176 void i_handleCrHgsmiCommandProcess(VBOXVDMACMD_CHROMIUM_CMD RT_UNTRUSTED_VOLATILE_GUEST *pCmd, uint32_t cbCmd); 177 void i_handleCrHgsmiControlProcess(VBOXVDMACMD_CHROMIUM_CTL RT_UNTRUSTED_VOLATILE_GUEST *pCtl, uint32_t cbCtl); 178 178 #endif 179 179 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) 180 int i_handleCrHgcmCtlSubmit(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, 181 PFNCRCTLCOMPLETION pfnCompletion, 182 void *pvCompletion); 180 int i_handleCrHgcmCtlSubmit(struct VBOXCRCMDCTL RT_UNTRUSTED_VOLATILE_GUEST *pCmd, uint32_t cbCmd, 181 PFNCRCTLCOMPLETION pfnCompletion, void *pvCompletion); 183 182 void i_handleCrVRecScreenshotPerform(uint32_t uScreen, 184 183 uint32_t x, uint32_t y, uint32_t uPixelFormat, uint32_t uBitsPerPixel, … … 345 344 #ifdef VBOX_WITH_CRHGSMI 346 345 static DECLCALLBACK(void) i_displayCrHgsmiCommandProcess(PPDMIDISPLAYCONNECTOR pInterface, 347 PVBOXVDMACMD_CHROMIUM_CMD pCmd, uint32_t cbCmd); 348 static DECLCALLBACK(void) i_displayCrHgsmiControlProcess(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVDMACMD_CHROMIUM_CTL pCtl, 346 VBOXVDMACMD_CHROMIUM_CMD RT_UNTRUSTED_VOLATILE_GUEST *pCmd, 347 uint32_t cbCmd); 348 static DECLCALLBACK(void) i_displayCrHgsmiControlProcess(PPDMIDISPLAYCONNECTOR pInterface, 349 VBOXVDMACMD_CHROMIUM_CTL RT_UNTRUSTED_VOLATILE_GUEST *pCtl, 349 350 uint32_t cbCtl); 350 351 … … 355 356 #endif 356 357 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) 357 static DECLCALLBACK(int) i_displayCrHgcmCtlSubmit(PPDMIDISPLAYCONNECTOR pInterface, 358 struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, 359 PFNCRCTLCOMPLETION pfnCompletion, 360 void *pvCompletion); 358 static DECLCALLBACK(int) i_displayCrHgcmCtlSubmit(PPDMIDISPLAYCONNECTOR pInterface, struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd, 359 PFNCRCTLCOMPLETION pfnCompletion, void *pvCompletion); 361 360 static DECLCALLBACK(void) i_displayCrHgcmCtlSubmitCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, 362 361 void *pvContext); … … 395 394 static DECLCALLBACK(void) i_displayVRecCompletion(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, int rc, void *pvCompletion); 396 395 #endif 397 static DECLCALLBACK(void) i_displayCrCmdFree(struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd, int rc, void *pvCompletion);396 static DECLCALLBACK(void) i_displayCrCmdFree(struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd, int rc, void *pvCompletion); 398 397 399 398 static DECLCALLBACK(void) i_displaySSMSaveScreenshot(PSSMHANDLE pSSM, void *pvUser); … … 491 490 static BOOL i_displayCheckTakeScreenshotCrOgl(Display *pDisplay, ULONG aScreenId, uint8_t *pbData, 492 491 uint32_t u32Width, uint32_t u32Height); 493 int i_crCtlSubmit(struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd, PFNCRCTLCOMPLETION pfnCompletion, void *pvCompletion);494 int i_crCtlSubmitSync(struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd);492 int i_crCtlSubmit(struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd, PFNCRCTLCOMPLETION pfnCompletion, void *pvCompletion); 493 int i_crCtlSubmitSync(struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd); 495 494 /* copies the given command and submits it asynchronously, 496 495 * i.e. the pCmd data may be discarded right after the call returns */ -
trunk/src/VBox/Main/src-client/DisplayImpl.cpp
r71590 r71597 795 795 } 796 796 797 DECLCALLBACK(void) Display::i_displayCrCmdFree(struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd, int rc, void *pvCompletion)797 DECLCALLBACK(void) Display::i_displayCrCmdFree(struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd, int rc, void *pvCompletion) 798 798 { 799 799 RT_NOREF(pCmd, cbCmd, rc); 800 800 Assert(pvCompletion); 801 RTMemFree( pvCompletion);801 RTMemFree((void *)pvCompletion); 802 802 } 803 803 … … 3583 3583 } 3584 3584 3585 void Display::i_handleCrHgsmiCommandProcess( PVBOXVDMACMD_CHROMIUM_CMDpCmd, uint32_t cbCmd)3585 void Display::i_handleCrHgsmiCommandProcess(VBOXVDMACMD_CHROMIUM_CMD RT_UNTRUSTED_VOLATILE_GUEST *pCmd, uint32_t cbCmd) 3586 3586 { 3587 3587 int rc = VERR_NOT_SUPPORTED; 3588 3588 VBOXHGCMSVCPARM parm; 3589 3589 parm.type = VBOX_HGCM_SVC_PARM_PTR; 3590 parm.u.pointer.addr = pCmd;3590 parm.u.pointer.addr = (void *)pCmd; 3591 3591 parm.u.pointer.size = cbCmd; 3592 3592 … … 3611 3611 } 3612 3612 3613 void Display::i_handleCrHgsmiControlProcess( PVBOXVDMACMD_CHROMIUM_CTLpCtl, uint32_t cbCtl)3613 void Display::i_handleCrHgsmiControlProcess(VBOXVDMACMD_CHROMIUM_CTL RT_UNTRUSTED_VOLATILE_GUEST *pCtl, uint32_t cbCtl) 3614 3614 { 3615 3615 int rc = VERR_NOT_SUPPORTED; 3616 3616 VBOXHGCMSVCPARM parm; 3617 3617 parm.type = VBOX_HGCM_SVC_PARM_PTR; 3618 parm.u.pointer.addr = pCtl;3618 parm.u.pointer.addr = (void *)pCtl; 3619 3619 parm.u.pointer.size = cbCtl; 3620 3620 … … 3661 3661 } 3662 3662 3663 DECLCALLBACK(void) Display::i_displayCrHgsmiCommandProcess(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVDMACMD_CHROMIUM_CMD pCmd, 3663 DECLCALLBACK(void) Display::i_displayCrHgsmiCommandProcess(PPDMIDISPLAYCONNECTOR pInterface, 3664 VBOXVDMACMD_CHROMIUM_CMD RT_UNTRUSTED_VOLATILE_GUEST *pCmd, 3664 3665 uint32_t cbCmd) 3665 3666 { … … 3669 3670 } 3670 3671 3671 DECLCALLBACK(void) Display::i_displayCrHgsmiControlProcess(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVDMACMD_CHROMIUM_CTL pCmd, 3672 DECLCALLBACK(void) Display::i_displayCrHgsmiControlProcess(PPDMIDISPLAYCONNECTOR pInterface, 3673 VBOXVDMACMD_CHROMIUM_CTL RT_UNTRUSTED_VOLATILE_GUEST *pCmd, 3672 3674 uint32_t cbCmd) 3673 3675 { … … 3704 3706 } 3705 3707 3706 int Display::i_handleCrHgcmCtlSubmit(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, 3707 PFNCRCTLCOMPLETION pfnCompletion, 3708 void *pvCompletion) 3708 int Display::i_handleCrHgcmCtlSubmit(struct VBOXCRCMDCTL RT_UNTRUSTED_VOLATILE_GUEST *pCmd, uint32_t cbCmd, 3709 PFNCRCTLCOMPLETION pfnCompletion, void *pvCompletion) 3709 3710 { 3710 3711 VMMDev *pVMMDev = mParent ? mParent->i_getVMMDev() : NULL; … … 3718 3719 VBOXHGCMSVCPARM parm; 3719 3720 parm.type = VBOX_HGCM_SVC_PARM_PTR; 3720 parm.u.pointer.addr = pCmd;3721 parm.u.pointer.addr = (void *)pCmd; 3721 3722 parm.u.pointer.size = cbCmd; 3722 3723 … … 3730 3731 } 3731 3732 3732 DECLCALLBACK(int) Display::i_displayCrHgcmCtlSubmit(PPDMIDISPLAYCONNECTOR pInterface, 3733 struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, 3734 PFNCRCTLCOMPLETION pfnCompletion, 3735 void *pvCompletion) 3733 DECLCALLBACK(int) Display::i_displayCrHgcmCtlSubmit(PPDMIDISPLAYCONNECTOR pInterface, struct VBOXCRCMDCTL *pCmd, uint32_t cbCmd, 3734 PFNCRCTLCOMPLETION pfnCompletion, void *pvCompletion) 3736 3735 { 3737 3736 PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
Note:
See TracChangeset
for help on using the changeset viewer.
