Changeset 63240 in vbox for trunk/src/VBox/Main/src-client
- Timestamp:
- Aug 10, 2016 10:01:08 AM (8 years ago)
- Location:
- trunk/src/VBox/Main/src-client
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp
r63147 r63240 1038 1038 uint8_t u8Code, const void *pvRet, uint32_t cbRet) 1039 1039 { 1040 RT_NOREF(pvCallback); 1040 1041 #ifdef VBOX_WITH_USB 1041 1042 return USBClientResponseCallback(pvIntercept, u32ClientId, u8Code, pvRet, cbRet); … … 1049 1050 const void *pvData, uint32_t cbData) 1050 1051 { 1052 RT_NOREF(pvCallback); 1051 1053 return ClipboardCallback(pvIntercept, u32ClientId, u32Function, u32Format, pvData, cbData); 1052 1054 } … … 1284 1286 uint32_t cbData) 1285 1287 { 1288 RT_NOREF(u32ClientId); 1286 1289 ConsoleVRDPServer *pServer = static_cast<ConsoleVRDPServer*>(pvCallback); 1287 1290 AssertPtrReturnVoid(pServer); … … 2036 2039 void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) 2037 2040 { 2041 RT_NOREF(pvContext, pvBuffer); 2038 2042 int rc = VINF_SUCCESS; 2039 2043 … … 2143 2147 uint32_t cbData) 2144 2148 { 2149 RT_NOREF(hVideo); 2145 2150 H3DORLOG(("H3DOR: VRDEImageCbNotify: pvContext %p, pvUser %p, hVideo %p, u32Id %u, pvData %p, cbData %d\n", 2146 2151 pvContext, pvUser, hVideo, u32Id, pvData, cbData)); … … 2457 2462 uint32_t *pcbDataReturned) 2458 2463 { 2464 RT_NOREF(pvParm, cbParm, pvData, cbData); 2459 2465 LogFlowFunc(("u32Code %u\n", u32Code)); 2460 2466 … … 2541 2547 uint32_t cbParm) 2542 2548 { 2549 RT_NOREF(cbParm); 2543 2550 int rc = VINF_SUCCESS; 2544 2551 … … 3312 3319 uint32_t cbParms) 3313 3320 { 3321 RT_NOREF(cbParms); 3314 3322 LogFlowFunc(("pvExtension = %p, u32Function = %d, pvParms = %p, cbParms = %d\n", 3315 3323 pvExtension, u32Function, pvParms, cbParms)); … … 3381 3389 void ConsoleVRDPServer::ClipboardCreate(uint32_t u32ClientId) 3382 3390 { 3391 RT_NOREF(u32ClientId); 3383 3392 int rc = lockConsoleVRDPServer(); 3384 3393 … … 3401 3410 void ConsoleVRDPServer::ClipboardDelete(uint32_t u32ClientId) 3402 3411 { 3412 RT_NOREF(u32ClientId); 3403 3413 int rc = lockConsoleVRDPServer(); 3404 3414 … … 3763 3773 void ConsoleVRDPServer::SendAudioInputEnd(void *pvUserCtx) 3764 3774 { 3775 RT_NOREF(pvUserCtx); 3765 3776 if (mpEntryPoints && mhServer && mpEntryPoints->VRDEAudioInClose) 3766 3777 { -
trunk/src/VBox/Main/src-client/DisplayImpl.cpp
r63147 r63240 276 276 uint8_t *pu8BufferAddress, uint64_t u64TimeStamp) 277 277 { 278 RT_NOREF(uScreen, x, y, uBitsPerPixel,uBytesPerLine, u64TimeStamp); 278 279 VBOX_DISPLAY_SAVESCREENSHOT_DATA *pData = (VBOX_DISPLAY_SAVESCREENSHOT_DATA*)pvCtx; 279 280 displayMakeThumbnail(pu8BufferAddress, uGuestWidth, uGuestHeight, &pData->pu8Thumbnail, … … 469 470 Display::i_displaySSMLoadScreenshot(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPass) 470 471 { 472 RT_NOREF(pvUser); 471 473 if (uVersion != sSSMDisplayScreenshotVer) 472 474 return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION; … … 782 784 DECLCALLBACK(void) Display::i_displayCrCmdFree(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, int rc, void *pvCompletion) 783 785 { 786 RT_NOREF(pCmd, cbCmd, rc); 784 787 Assert(pvCompletion); 785 788 RTMemFree(pvCompletion); … … 838 841 int Display::i_notifyCroglResize(const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM) 839 842 { 843 RT_NOREF(pView); 840 844 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) 841 845 if (maFramebuffers[pScreen->u32ViewIndex].fRenderThreadMode) … … 1394 1398 } 1395 1399 1396 int Display::i_handleQueryVisibleRegion(uint32_t *pcRect, PRTRECT pRect) 1397 { 1398 // @todo Currently not used by the guest and is not implemented in framebuffers. Remove? 1400 int Display::i_handleQueryVisibleRegion(uint32_t *pcRects, PRTRECT paRects) 1401 { 1402 /// @todo Currently not used by the guest and is not implemented in 1403 /// framebuffers. Remove? 1404 RT_NOREF(pcRects, paRects); 1399 1405 return VERR_NOT_SUPPORTED; 1400 1406 } … … 3301 3307 if (hr == S_FALSE) 3302 3308 return VINF_SUCCESS; 3303 elseif (SUCCEEDED(hr))3309 if (SUCCEEDED(hr)) 3304 3310 return VINF_CALLBACK_RETURN; 3305 elseif (hr == E_ACCESSDENIED)3311 if (hr == E_ACCESSDENIED) 3306 3312 return VERR_INVALID_STATE; /* notify we can not handle request atm */ 3307 elseif (hr == E_NOTIMPL)3313 if (hr == E_NOTIMPL) 3308 3314 return VERR_NOT_IMPLEMENTED; 3309 3315 return VERR_GENERAL_FAILURE; … … 3321 3327 void Display::i_handleCrHgsmiCommandCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam) 3322 3328 { 3329 RT_NOREF(u32Function); 3323 3330 mpDrv->pVBVACallbacks->pfnCrHgsmiCommandCompleteAsync(mpDrv->pVBVACallbacks, 3324 3331 (PVBOXVDMACMD_CHROMIUM_CMD)pParam->u.pointer.addr, result); -
trunk/src/VBox/Main/src-client/VMMDevInterface.cpp
r62485 r63240 460 460 } 461 461 462 DECLCALLBACK(int) vmmdevQueryVisibleRegion(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pcRect , PRTRECT pRect)462 DECLCALLBACK(int) vmmdevQueryVisibleRegion(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pcRects, PRTRECT paRects) 463 463 { 464 464 PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector); … … 466 466 467 467 /* Forward to Display, which calls corresponding framebuffers. */ 468 pConsole->i_getDisplay()->i_handleQueryVisibleRegion(pcRect , pRect);468 pConsole->i_getDisplay()->i_handleQueryVisibleRegion(pcRects, paRects); 469 469 470 470 return VINF_SUCCESS;
Note:
See TracChangeset
for help on using the changeset viewer.