Changeset 62965 in vbox for trunk

Timestamp:

Aug 4, 2016 9:57:20 AM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

Location:

trunk

Files:

• include/VBox/VMMDev.h (modified) (1 diff)
• include/VBox/vmm/pdmaudioifs.h (modified) (1 diff)
• src/VBox/Devices/Audio/AudioMixBuffer.cpp (modified) (4 diffs)
• src/VBox/Devices/Audio/AudioMixer.cpp (modified) (7 diffs)
• src/VBox/Devices/Audio/DevSB16.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (4 diffs)
• src/VBox/Devices/EFI/DevEFI.cpp (modified) (10 diffs)
• src/VBox/Devices/Storage/DrvSCSI.cpp (modified) (7 diffs)

trunk/include/VBox/VMMDev.h

@@ -2111 +2111 @@
 #define VBVA_MAX_RECORDS (64)
 
-#define VBVA_F_MODE_ENABLED         (0x00000001)
-#define VBVA_F_MODE_VRDP            (0x00000002)
-#define VBVA_F_MODE_VRDP_RESET      (0x00000004)
-#define VBVA_F_MODE_VRDP_ORDER_MASK (0x00000008)
-
-#define VBVA_F_STATE_PROCESSING     (0x00010000)
-
-#define VBVA_F_RECORD_PARTIAL       (0x80000000)
+#define VBVA_F_MODE_ENABLED         UINT32_C(0x00000001)
+#define VBVA_F_MODE_VRDP            UINT32_C(0x00000002)
+#define VBVA_F_MODE_VRDP_RESET      UINT32_C(0x00000004)
+#define VBVA_F_MODE_VRDP_ORDER_MASK UINT32_C(0x00000008)
+
+#define VBVA_F_STATE_PROCESSING     UINT32_C(0x00010000)
+
+#define VBVA_F_RECORD_PARTIAL       UINT32_C(0x80000000)
 /** @} */
 

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -776 +776 @@
      * Adds a reference to the specified audio stream.
      *
-     * @returns New reference count.
+     * @returns New reference count. UINT32_MAX on error.
      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
      * @param   pStream         Pointer to audio stream adding the reference to.
      */
-    DECLR3CALLBACKMEMBER(uint32_t, pfnStreamAddRef, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream));
+    DECLR3CALLBACKMEMBER(uint32_t, pfnStreamRetain, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream));
 
     /**
      * Releases a reference from the specified stream.
      *
-     * @returns New reference count.
+     * @returns New reference count. UINT32_MAX on error.
      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
      * @param   pStream         Pointer to audio stream releasing a reference from.

trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp

@@ -583 +583 @@
 
 /** Dummy conversion used when the source is muted. */
-static DECLCALLBACK(uint32_t) audioMixBufConvFromSilence(PPDMAUDIOSAMPLE paDst, const void *pvSrc,
-                                                         uint32_t cbSrc, PCPDMAUDMIXBUFCONVOPTS pOpts)
-{
+static DECLCALLBACK(uint32_t)
+audioMixBufConvFromSilence(PPDMAUDIOSAMPLE paDst, const void *pvSrc, uint32_t cbSrc, PCPDMAUDMIXBUFCONVOPTS pOpts)
+{
+    RT_NOREF(cbSrc, pvSrc);
+
     /* Internally zero always corresponds to silence. */
     RT_BZERO(paDst, pOpts->cSamples * sizeof(paDst[0]));
@@ -648 +650 @@
         }
     }
-
-    return NULL;
+    /* not reached */
 }
 
@@ -709 +710 @@
         }
     }
-
-    return NULL;
+    /* not reached */
 }
 
@@ -1019 +1019 @@
 #endif
 
-    uint32_t cSrcToRead;
+    uint32_t cSrcToRead = 0;
     uint32_t cSrcRead;
 

trunk/src/VBox/Devices/Audio/AudioMixer.cpp

@@ -129 +129 @@
 int AudioMixerCreate(const char *pszName, uint32_t fFlags, PAUDIOMIXER *ppMixer)
 {
+    RT_NOREF(fFlags);
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
     /** @todo Add fFlags validation. */
@@ -176 +177 @@
 void AudioMixerDebug(PAUDIOMIXER pMixer, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
+    RT_NOREF(pszArgs);
     PAUDMIXSINK pSink;
     unsigned    iSink = 0;
@@ -491 +493 @@
         /* Increase the stream's reference count to let others know
          * we're reyling on it to be around now. */
-        pConn->pfnStreamAddRef(pConn, pStream);
+        pConn->pfnStreamRetain(pConn, pStream);
     }
 
@@ -763 +765 @@
 int AudioMixerSinkRead(PAUDMIXSINK pSink, AUDMIXOP enmOp, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
+    RT_NOREF(enmOp);
     AssertPtrReturn(pSink, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
@@ -1080 +1083 @@
         AssertPtr(pConn);
 
-        uint32_t cPlayed   = 0;
         uint32_t cCaptured = 0;
 
@@ -1257 +1259 @@
 int AudioMixerSinkWrite(PAUDMIXSINK pSink, AUDMIXOP enmOp, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
+    RT_NOREF(enmOp);
     AssertPtrReturn(pSink, VERR_INVALID_POINTER);
     /* pcbWritten is optional. */
@@ -1320 +1323 @@
 int AudioMixerStreamCtl(PAUDMIXSTREAM pMixStream, PDMAUDIOSTREAMCMD enmCmd, uint32_t fCtl)
 {
+    RT_NOREF(fCtl);
     AssertPtrReturn(pMixStream, VERR_INVALID_POINTER);
     /** @todo Validate fCtl. */

trunk/src/VBox/Devices/Audio/DevSB16.cpp

@@ -2153 +2153 @@
             rc2 = pDrv->pConnector->pfnStreamCreate(pDrv->pConnector, &CfgHost, pCfg, &pDrv->Out.pStream);
             if (RT_SUCCESS(rc2))
-                pDrv->pConnector->pfnStreamAddRef(pDrv->pConnector, pDrv->Out.pStream);
+                pDrv->pConnector->pfnStreamRetain(pDrv->pConnector, pDrv->Out.pStream);
         }
 

trunk/src/VBox/Devices/Audio/DrvAudio.cpp

@@ -785 +785 @@
 
 /**
- * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamAddRef}
- */
-static DECLCALLBACK(uint32_t) drvAudioStreamAddRef(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
-{
-   AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-   AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+ * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamRetain}
+ */
+static DECLCALLBACK(uint32_t) drvAudioStreamRetain(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
+{
+   AssertPtrReturn(pInterface, UINT32_MAX);
+   AssertPtrReturn(pStream,    UINT32_MAX);
 
    NOREF(pInterface);
@@ -802 +802 @@
 static DECLCALLBACK(uint32_t) drvAudioStreamRelease(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
 {
-   AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-   AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+   AssertPtrReturn(pInterface, UINT32_MAX);
+   AssertPtrReturn(pStream,    UINT32_MAX);
 
    NOREF(pInterface);
@@ -1868 +1868 @@
     AssertPtrReturn(pVol,       VERR_INVALID_POINTER);
 
-    PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
-
     LogFlowFunc(("%s: volL=%RU32, volR=%RU32, fMute=%RTbool\n", pStream->szName, pVol->uLeft, pVol->uRight, pVol->fMuted));
 
@@ -2150 +2148 @@
     pThis->IAudioConnector.pfnStreamCreate      = drvAudioStreamCreate;
     pThis->IAudioConnector.pfnStreamDestroy     = drvAudioStreamDestroy;
-    pThis->IAudioConnector.pfnStreamAddRef      = drvAudioStreamAddRef;
+    pThis->IAudioConnector.pfnStreamRetain      = drvAudioStreamRetain;
     pThis->IAudioConnector.pfnStreamRelease     = drvAudioStreamRelease;
     pThis->IAudioConnector.pfnStreamControl     = drvAudioStreamControl;

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -54 +54 @@
 
 /* EFI includes */
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4668)
+#endif
 #include <ProcessorBind.h>
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
 #include <Common/UefiBaseTypes.h>
 #include <Common/PiFirmwareVolume.h>
@@ -1050 +1057 @@
 static DECLCALLBACK(void) efiInfoNvram(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
+    RT_NOREF(pszArgs);
     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
@@ -1213 +1221 @@
         RTStrmClose(pStrm);
     }
+# else
+    RT_NOREF(pThis, pszFormat);
 # endif
 }
@@ -1229 +1239 @@
 static int efiPortImageEventWrite(PDEVEFI pThis, uint32_t u32, unsigned cb)
 {
+    RT_NOREF(cb);
     switch (u32 & EFI_IMAGE_EVT_CMD_MASK)
     {
@@ -1342 +1353 @@
 static DECLCALLBACK(int) efiIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
+    RT_NOREF(pvUser);
     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     Log4(("EFI in: %x %x\n", Port, cb));
@@ -1427 +1439 @@
 static DECLCALLBACK(int) efiIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
+    RT_NOREF(pvUser);
     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     int     rc    = VINF_SUCCESS;
@@ -1769 +1782 @@
 static DECLCALLBACK(void) efiMemSetup(PPDMDEVINS pDevIns, PDMDEVMEMSETUPCTX enmCtx)
 {
+    RT_NOREF(enmCtx);
     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
 
@@ -1954 +1968 @@
     AssertLogRelMsgReturn(!(pThis->cbEfiRom & PAGE_OFFSET_MASK), ("%RX64\n", pThis->cbEfiRom), VERR_INVALID_PARAMETER);
 
-    uint8_t const * const pbFwVolEnd = pThis->pu8EfiRom + pFwVolHdr->FvLength;
     pThis->GCLoadAddress = UINT32_C(0xfffff000) - pThis->cbEfiRom + PAGE_SIZE;
 
@@ -1969 +1982 @@
 static int efiLoadRom(PDEVEFI pThis, PCFGMNODE pCfg)
 {
+    RT_NOREF(pCfg);
+
     /*
      * Read the entire firmware volume into memory.
@@ -2104 +2119 @@
 static DECLCALLBACK(int)  efiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    RT_NOREF(iInstance);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     PDEVEFI     pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     int         rc;
-    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     Assert(iInstance == 0);

trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

@@ -240 +240 @@
 static DECLCALLBACK(int) drvscsiGetSize(VSCSILUN hVScsiLun, void *pvScsiLunUser, uint64_t *pcbSize)
 {
+    RT_NOREF(hVScsiLun);
     PDRVSCSI pThis = (PDRVSCSI)pvScsiLunUser;
 
@@ -250 +251 @@
 static DECLCALLBACK(int) drvscsiGetSectorSize(VSCSILUN hVScsiLun, void *pvScsiLunUser, uint32_t *pcbSectorSize)
 {
+    RT_NOREF(hVScsiLun);
     PDRVSCSI pThis = (PDRVSCSI)pvScsiLunUser;
 
@@ -258 +260 @@
 static DECLCALLBACK(int) drvscsiSetLock(VSCSILUN hVScsiLun, void *pvScsiLunUser, bool fLocked)
 {
+    RT_NOREF(hVScsiLun);
     PDRVSCSI pThis = (PDRVSCSI)pvScsiLunUser;
 
@@ -324 +327 @@
 }
 
-static DECLCALLBACK(int) drvscsiReqTransferEnqueue(VSCSILUN hVScsiLun,
-                                                   void *pvScsiLunUser,
-                                                   VSCSIIOREQ hVScsiIoReq)
-{
+static DECLCALLBACK(int) drvscsiReqTransferEnqueue(VSCSILUN hVScsiLun, void *pvScsiLunUser, VSCSIIOREQ hVScsiIoReq)
+{
+    RT_NOREF(hVScsiLun);
     int rc = VINF_SUCCESS;
     PDRVSCSI pThis = (PDRVSCSI)pvScsiLunUser;
@@ -454 +456 @@
 }
 
-static DECLCALLBACK(int) drvscsiGetFeatureFlags(VSCSILUN hVScsiLun,
-                                                void *pvScsiLunUser,
-                                                uint64_t *pfFeatures)
-{
-    int rc = VINF_SUCCESS;
+static DECLCALLBACK(int) drvscsiGetFeatureFlags(VSCSILUN hVScsiLun, void *pvScsiLunUser, uint64_t *pfFeatures)
+{
+    RT_NOREF(hVScsiLun);
     PDRVSCSI pThis = (PDRVSCSI)pvScsiLunUser;
 
@@ -478 +478 @@
 
 static DECLCALLBACK(void) drvscsiVScsiReqCompleted(VSCSIDEVICE hVScsiDevice, void *pVScsiDeviceUser,
-                                                   void *pVScsiReqUser, int rcScsiCode, bool fRedoPossible,
-                                                   int rcReq)
-{
+                                                   void *pVScsiReqUser, int rcScsiCode, bool fRedoPossible, int rcReq)
+{
+    RT_NOREF(hVScsiDevice);
     PDRVSCSI pThis = (PDRVSCSI)pVScsiDeviceUser;
 
@@ -567 +567 @@
 static DECLCALLBACK(int) drvscsiAsyncIOLoopWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
 {
+    RT_NOREF(pThread);
     PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
     PRTREQ pReq;