Changeset 83812 in vbox for trunk

Timestamp:

Apr 19, 2020 12:21:56 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137339

Message:

Devices/Audio: VC++ 14.1 warnings. bugref:8498

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• DrvHostDSound.cpp (modified) (2 diffs)
• VBoxMMNotificationClient.cpp (modified) (2 diffs)

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

@@ -3269 +3269 @@
                 u64Value  |= pThis->au32Regs[idxRegMem] & g_afMasks[cbBefore];
                 Log4Func(("\tWithin register, supplied %u leading bits: %#llx -> %#llx ...\n",
-                          cbBefore * 8, ~g_afMasks[cbBefore] & u64Value, u64Value));
+                          cbBefore * 8, ~(uint64_t)g_afMasks[cbBefore] & u64Value, u64Value));
                 STAM_COUNTER_INC(&pThis->CTX_SUFF_Z(StatRegMultiWrites));
             }

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

@@ -2682 +2682 @@
             pThis->m_pNotificationClient = new VBoxMMNotificationClient();
 
-            HRESULT hr = pThis->m_pNotificationClient->Initialize();
+            hr = pThis->m_pNotificationClient->Initialize();
             if (SUCCEEDED(hr))
                 hr = pThis->m_pNotificationClient->Register();
@@ -2689 +2689 @@
                 rc = VERR_AUDIO_BACKEND_INIT_FAILED;
         }
-        catch (std::bad_alloc &ex)
-        {
-            RT_NOREF(ex);
+        catch (std::bad_alloc &)
+        {
             rc = VERR_NO_MEMORY;
         }

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

@@ -23 +23 @@
 #pragma warning(push)
 #pragma warning(disable: 4201)
+#ifndef DOXYGEN_RUNNING
+# if RT_MSC_PREREQ(RT_MSC_VER_VC141)
+#  pragma warning(disable: 4091) /* v7.1\include\ksmedia.h(4356): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-KSEVENT_DYNAMIC_FORMAT_CHANGE>' when no variable is declared */
+# endif
+#endif
 #include <mmdeviceapi.h>
 #include <endpointvolume.h>
@@ -237 +242 @@
 STDMETHODIMP VBoxMMNotificationClient::QueryInterface(REFIID interfaceID, void **ppvInterface)
 {
-    const IID IID_IMMNotificationClient = __uuidof(IMMNotificationClient);
+    const IID MY_IID_IMMNotificationClient = __uuidof(IMMNotificationClient);
 
     if (   IsEqualIID(interfaceID, IID_IUnknown)
-        || IsEqualIID(interfaceID, IID_IMMNotificationClient))
+        || IsEqualIID(interfaceID, MY_IID_IMMNotificationClient))
     {
         *ppvInterface = static_cast<IMMNotificationClient*>(this);