Changeset 63240 in vbox

Timestamp:

Aug 10, 2016 10:01:08 AM (8 years ago)

Author:

vboxsync

Message:

Main: warnings

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• src-client/ConsoleVRDPServer.cpp (modified) (11 diffs)
• src-client/DisplayImpl.cpp (modified) (7 diffs)
• src-client/VMMDevInterface.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -188 +188 @@
     int  i_saveVisibleRegion(uint32_t cRect, PRTRECT pRect);
     int  i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect);
-    int  i_handleQueryVisibleRegion(uint32_t *pcRect, PRTRECT pRect);
+    int  i_handleQueryVisibleRegion(uint32_t *pcRects, PRTRECT paRects);
 
     void i_VideoAccelVRDP(bool fEnable);

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -1038 +1038 @@
                                                      uint8_t u8Code, const void *pvRet, uint32_t cbRet)
 {
+    RT_NOREF(pvCallback);
 #ifdef VBOX_WITH_USB
     return USBClientResponseCallback(pvIntercept, u32ClientId, u8Code, pvRet, cbRet);
@@ -1049 +1050 @@
                                                            const void *pvData, uint32_t cbData)
 {
+    RT_NOREF(pvCallback);
     return ClipboardCallback(pvIntercept, u32ClientId, u32Function, u32Format, pvData, cbData);
 }
@@ -1284 +1286 @@
                                                           uint32_t cbData)
 {
+    RT_NOREF(u32ClientId);
     ConsoleVRDPServer *pServer = static_cast<ConsoleVRDPServer*>(pvCallback);
     AssertPtrReturnVoid(pServer);
@@ -2036 +2039 @@
                                                                        void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut)
 {
+    RT_NOREF(pvContext, pvBuffer);
     int rc = VINF_SUCCESS;
 
@@ -2143 +2147 @@
                                                                      uint32_t cbData)
 {
+    RT_NOREF(hVideo);
     H3DORLOG(("H3DOR: VRDEImageCbNotify: pvContext %p, pvUser %p, hVideo %p, u32Id %u, pvData %p, cbData %d\n",
               pvContext, pvUser, hVideo, u32Id, pvData, cbData));
@@ -2457 +2462 @@
                                                                          uint32_t *pcbDataReturned)
 {
+    RT_NOREF(pvParm, cbParm, pvData, cbData);
     LogFlowFunc(("u32Code %u\n", u32Code));
 
@@ -2541 +2547 @@
                                                                     uint32_t cbParm)
 {
+    RT_NOREF(cbParm);
     int rc = VINF_SUCCESS;
 
@@ -3312 +3319 @@
                                                                uint32_t cbParms)
 {
+    RT_NOREF(cbParms);
     LogFlowFunc(("pvExtension = %p, u32Function = %d, pvParms = %p, cbParms = %d\n",
                  pvExtension, u32Function, pvParms, cbParms));
@@ -3381 +3389 @@
 void ConsoleVRDPServer::ClipboardCreate(uint32_t u32ClientId)
 {
+    RT_NOREF(u32ClientId);
     int rc = lockConsoleVRDPServer();
 
@@ -3401 +3410 @@
 void ConsoleVRDPServer::ClipboardDelete(uint32_t u32ClientId)
 {
+    RT_NOREF(u32ClientId);
     int rc = lockConsoleVRDPServer();
 
@@ -3763 +3773 @@
 void ConsoleVRDPServer::SendAudioInputEnd(void *pvUserCtx)
 {
+    RT_NOREF(pvUserCtx);
     if (mpEntryPoints && mhServer && mpEntryPoints->VRDEAudioInClose)
     {

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -276 +276 @@
                                                       uint8_t *pu8BufferAddress, uint64_t u64TimeStamp)
 {
+    RT_NOREF(uScreen, x, y, uBitsPerPixel,uBytesPerLine, u64TimeStamp);
     VBOX_DISPLAY_SAVESCREENSHOT_DATA *pData = (VBOX_DISPLAY_SAVESCREENSHOT_DATA*)pvCtx;
     displayMakeThumbnail(pu8BufferAddress, uGuestWidth, uGuestHeight, &pData->pu8Thumbnail,
@@ -469 +470 @@
 Display::i_displaySSMLoadScreenshot(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPass)
 {
+    RT_NOREF(pvUser);
     if (uVersion != sSSMDisplayScreenshotVer)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
@@ -782 +784 @@
 DECLCALLBACK(void) Display::i_displayCrCmdFree(struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd, int rc, void *pvCompletion)
 {
+    RT_NOREF(pCmd, cbCmd, rc);
     Assert(pvCompletion);
     RTMemFree(pvCompletion);
@@ -838 +841 @@
 int Display::i_notifyCroglResize(const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM)
 {
+    RT_NOREF(pView);
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
     if (maFramebuffers[pScreen->u32ViewIndex].fRenderThreadMode)
@@ -1394 +1398 @@
 }
 
-int Display::i_handleQueryVisibleRegion(uint32_t *pcRect, PRTRECT pRect)
-{
-    // @todo Currently not used by the guest and is not implemented in framebuffers. Remove?
+int Display::i_handleQueryVisibleRegion(uint32_t *pcRects, PRTRECT paRects)
+{
+    /// @todo Currently not used by the guest and is not implemented in
+    /// framebuffers. Remove?
+    RT_NOREF(pcRects, paRects);
     return VERR_NOT_SUPPORTED;
 }
@@ -3301 +3307 @@
     if (hr == S_FALSE)
         return VINF_SUCCESS;
-    else if (SUCCEEDED(hr))
+    if (SUCCEEDED(hr))
         return VINF_CALLBACK_RETURN;
-    else if (hr == E_ACCESSDENIED)
+    if (hr == E_ACCESSDENIED)
         return VERR_INVALID_STATE; /* notify we can not handle request atm */
-    else if (hr == E_NOTIMPL)
+    if (hr == E_NOTIMPL)
         return VERR_NOT_IMPLEMENTED;
     return VERR_GENERAL_FAILURE;
@@ -3321 +3327 @@
 void Display::i_handleCrHgsmiCommandCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam)
 {
+    RT_NOREF(u32Function);
     mpDrv->pVBVACallbacks->pfnCrHgsmiCommandCompleteAsync(mpDrv->pVBVACallbacks,
                                                           (PVBOXVDMACMD_CHROMIUM_CMD)pParam->u.pointer.addr, result);

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -460 +460 @@
 }
 
-DECLCALLBACK(int) vmmdevQueryVisibleRegion(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pcRect, PRTRECT pRect)
+DECLCALLBACK(int) vmmdevQueryVisibleRegion(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pcRects, PRTRECT paRects)
 {
     PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
@@ -466 +466 @@
 
     /* Forward to Display, which calls corresponding framebuffers. */
-    pConsole->i_getDisplay()->i_handleQueryVisibleRegion(pcRect, pRect);
+    pConsole->i_getDisplay()->i_handleQueryVisibleRegion(pcRects, paRects);
 
     return VINF_SUCCESS;