Add MIXERCONTROL_CONTROLTYPE_BASS_BOOST and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT

[reactos.git] / reactos / include / psdk / mmsystem.h

diff --git a/reactos/include/psdk/mmsystem.h b/reactos/include/psdk/mmsystem.h
index cc8c79d..c2c2377 100644 (file)
--- a/reactos/include/psdk/mmsystem.h
+++ b/reactos/include/psdk/mmsystem.h
@@ -1,3 +1,6 @@
+/*
+ * Multimedia declarations
+ */
 
 #ifndef _MMSYSTEM_H
 #define _MMSYSTEM_H
@@ -6,6 +9,12 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4201)
+#endif
+
 #define        WINMMAPI        DECLSPEC_IMPORT
 #define _loadds
 #define _huge
@@ -197,7 +206,11 @@ extern "C" {
 #define WAVE_FORMAT_96S08           131072
 #define WAVE_FORMAT_96M16           262144
 #define WAVE_FORMAT_96S16           524288
+
+#ifndef WAVE_FORMAT_PCM
 #define WAVE_FORMAT_PCM             1
+#endif
+
 #define MIDIERR_UNPREPARED          MIDIERR_BASE
 #define MIDIERR_STILLPLAYING        (MIDIERR_BASE+1)
 #define MIDIERR_NOMAP               (MIDIERR_BASE+2)
@@ -355,6 +368,7 @@ extern "C" {
 #define MIXERCONTROL_CONTROLTYPE_MONO          (MIXERCONTROL_CONTROLTYPE_BOOLEAN+3)
 #define MIXERCONTROL_CONTROLTYPE_LOUDNESS      (MIXERCONTROL_CONTROLTYPE_BOOLEAN+4)
 #define MIXERCONTROL_CONTROLTYPE_STEREOENH     (MIXERCONTROL_CONTROLTYPE_BOOLEAN+5)
+#define MIXERCONTROL_CONTROLTYPE_BASS_BOOST    (MIXERCONTROL_CONTROLTYPE_BOOLEAN + 0x00002277)
 #define MIXERCONTROL_CONTROLTYPE_BUTTON        (MIXERCONTROL_CT_CLASS_SWITCH|MIXERCONTROL_CT_SC_SWITCH_BUTTON|MIXERCONTROL_CT_UNITS_BOOLEAN)
 #define MIXERCONTROL_CONTROLTYPE_DECIBELS      (MIXERCONTROL_CT_CLASS_NUMBER|MIXERCONTROL_CT_UNITS_DECIBELS)
 #define MIXERCONTROL_CONTROLTYPE_SIGNED        (MIXERCONTROL_CT_CLASS_NUMBER|MIXERCONTROL_CT_UNITS_SIGNED)
@@ -1041,7 +1055,7 @@ typedef struct tWAVEFORMATEX {
        WORD cbSize;
 } WAVEFORMATEX,*PWAVEFORMATEX,*LPWAVEFORMATEX;
 
-typedef const WAVEFORMATEX *LPCWAVEFORMATEX;
+typedef const struct tWAVEFORMATEX *LPCWAVEFORMATEX;
 #endif
 
 DECLARE_HANDLE(HMIDI);
@@ -2049,6 +2063,11 @@ typedef MCI_OVLY_SAVE_PARMSA MCI_OVLY_SAVE_PARMS,*PMCI_OVLY_SAVE_PARMS,*LPMCI_OV
 #define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDA
 #define mciGetErrorString mciGetErrorStringA
 #endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif