[ros-diffs] [akhaldi] 68439: [PSDK] Update mm{reg, system}.h. CORE-9924

Author: akhaldi
Date: Sun Jul 19 13:33:09 2015
New Revision: 68439

URL: http://svn.reactos.org/svn/reactos?rev=68439&view=rev
Log:
[PSDK] Update mm{reg,system}.h. CORE-9924

Modified:
    trunk/reactos/include/psdk/mmreg.h
    trunk/reactos/include/psdk/mmsystem.h

Modified: trunk/reactos/include/psdk/mmreg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=6…
==============================================================================
--- trunk/reactos/include/psdk/mmreg.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/mmreg.h	[iso-8859-1] Sun Jul 19 13:33:09 2015
@@ -137,6 +137,18 @@
 #define   MM_UNMAPPED                   0xffff
 #define   MM_PID_UNMAPPED               MM_UNMAPPED
 
+#ifndef MM_MICROSOFT
+#define MM_MICROSOFT 0x01
+#endif
+#define MM_MSFT_ACM_MSADPCM 0x21
+#define MM_MSFT_ACM_IMAADPCM 0x22
+#define MM_MSFT_ACM_GSM610 0x24
+#define MM_MSFT_ACM_G711 0x25
+#define MM_MSFT_ACM_PCM 0x26
+
+#define MM_FRAUNHOFER_IIS 0xAC
+#define MM_FHGIIS_MPEGLAYER3_DECODE 0x09
+
 #if !defined(WAVE_FORMAT_EXTENSIBLE)
 #define  WAVE_FORMAT_EXTENSIBLE			0xFFFE  /* Microsoft */
 #endif

Modified: trunk/reactos/include/psdk/mmsystem.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re…
==============================================================================
--- trunk/reactos/include/psdk/mmsystem.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/mmsystem.h	[iso-8859-1] Sun Jul 19 13:33:09 2015
@@ -38,7 +38,10 @@
 #define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3)
 #endif
 
+#ifndef MM_MICROSOFT
 #define MM_MICROSOFT            1       /* Microsoft Corp. */
+#endif
+
 #define MM_CREATIVE             2       /* Creative labs   */
 
 #define MM_JOY1MOVE           0x3A0