Changeset 89089 in vbox

Timestamp:

May 17, 2021 10:43:13 AM (4 years ago)

Author:

vboxsync

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

144429

Message:

Audio: 32-bit windows build fixes. bugref:9890

Location:

trunk

Files:

• include/iprt/win/audioclient.h (modified) (1 diff)
• include/iprt/win/endpointvolume.h (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostAudioDSound.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostAudioDSoundMMNotifClient.h (modified) (2 diffs)
• src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp (modified) (2 diffs)

trunk/include/iprt/win/audioclient.h

@@ -32 +32 @@
 #ifdef _MSC_VER
 # pragma warning(push)
+# pragma warning(disable:4668) /* ks.h(1978): warning C4668: '_WIN64' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'  [SDK 7.1] */
 # if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
 #  ifdef __cplusplus

trunk/include/iprt/win/endpointvolume.h

@@ -32 +32 @@
 #ifdef _MSC_VER
 # pragma warning(push)
-# pragma warning(disable: 4201)
+# pragma warning(disable:4201)
+# pragma warning(disable:4668) /* ks.h(1978): warning C4668: '_WIN64' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'  [SDK 7.1] */
 # if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
 #  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 */

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

@@ -25 +25 @@
 #include <iprt/win/windows.h>
 #include <dsound.h>
-#include <Mmdeviceapi.h>
+#include <mmdeviceapi.h>
 #include <functiondiscoverykeys_devpkey.h>
 

trunk/src/VBox/Devices/Audio/DrvHostAudioDSoundMMNotifClient.h

@@ -24 +24 @@
 #include <iprt/critsect.h>
 #include <iprt/win/windows.h>
-
-/* Should fix warning in include\ks.h. */
-#ifndef _WIN64
-# ifdef RT_ARCH_X86
-#  define _WIN64 1
-# else
-#  define _WIN64 0
-# endif
-#endif
-
-#include <Mmdeviceapi.h>
+#include <mmdeviceapi.h>
 
 #include <VBox/vmm/pdmaudioifs.h>
@@ -83 +73 @@
     /** @} */
 };
+
 #endif /* !VBOX_INCLUDED_SRC_Audio_DrvHostAudioDSoundMMNotifClient_h */
 

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

@@ -23 +23 @@
 /*#define INITGUID - defined in VBoxhostAudioDSound.cpp already */
 #include <VBox/log.h>
-
-/* Should fix warning in include\ks.h. */
-#ifndef _WIN64
-# ifdef RT_ARCH_X86
-#  define _WIN64 1
-# else
-#  define _WIN64 0
-# endif
-#endif
-
 #include <iprt/win/windows.h>
 #include <Mmdeviceapi.h>
@@ -3159 +3149 @@
     PDM_DRVREG_VERSION
 };
+