2010-08-24 LRN <lrn1986@gmail.com>

        * include/mmreg.h (MPEGLAYER3WAVEFORMAT, WAVE_FORMAT_UNKNOWN,
        WAVE_FORMAT_PCM, WAVE_FORMAT_ADPCM, WAVE_FORMAT_IEEE_FLOAT,
        WAVE_FORMAT_VSELP, WAVE_FORMAT_IBM_CVSD, WAVE_FORMAT_ALAW,
        WAVE_FORMAT_MULAW, WAVE_FORMAT_OKI_ADPCM, WAVE_FORMAT_DVI_ADPCM,
        WAVE_FORMAT_MEDIASPACE_ADPCM, WAVE_FORMAT_SIERRA_ADPCM,
        WAVE_FORMAT_G723_ADPCM, WAVE_FORMAT_DIGIFIX, WAVE_FORMAT_DIALOGIC_OKI_ADPCM,
        WAVE_FORMAT_MEDIAVISION_ADPCM, WAVE_FORMAT_CU_CODEC,
        WAVE_FORMAT_YAMAHA_ADPCM, WAVE_FORMAT_SONARC,
        WAVE_FORMAT_DSPGROUP_TRUESPEECH, WAVE_FORMAT_ECHOSC1,
        WAVE_FORMAT_AUDIOFILE_AF36, WAVE_FORMAT_APTX, WAVE_FORMAT_AUDIOFILE_AF10,
        WAVE_FORMAT_PROSODY_1612, WAVE_FORMAT_LRC, WAVE_FORMAT_DOLBY_AC2,
        WAVE_FORMAT_GSM610, WAVE_FORMAT_MSNAUDIO, WAVE_FORMAT_ANTEX_ADPCME,
        WAVE_FORMAT_CONTROL_RES_VQLPC, WAVE_FORMAT_DIGIREAL, WAVE_FORMAT_DIGIADPCM,
        WAVE_FORMAT_CONTROL_RES_CR10, WAVE_FORMAT_NMS_VBXADPCM,
        WAVE_FORMAT_ROLAND_RDAC, WAVE_FORMAT_ECHOSC3, WAVE_FORMAT_ROCKWELL_ADPCM,
        WAVE_FORMAT_ROCKWELL_DIGITALK, WAVE_FORMAT_XEBEC, WAVE_FORMAT_G721_ADPCM,
        WAVE_FORMAT_G728_CELP, WAVE_FORMAT_MSG723, WAVE_FORMAT_MPEG,
        WAVE_FORMAT_RT24, WAVE_FORMAT_PAC, WAVE_FORMAT_MPEGLAYER3,
        WAVE_FORMAT_LUCENT_G723, WAVE_FORMAT_CIRRUS, WAVE_FORMAT_ESPCM,
        WAVE_FORMAT_VOXWARE, WAVE_FORMAT_CANOPUS_ATRAC, WAVE_FORMAT_G726_ADPCM,
        WAVE_FORMAT_G722_ADPCM, WAVE_FORMAT_DSAT, WAVE_FORMAT_DSAT_DISPLAY,
        WAVE_FORMAT_VOXWARE_BYTE_ALIGNED, WAVE_FORMAT_VOXWARE_AC8,
        WAVE_FORMAT_VOXWARE_AC10, WAVE_FORMAT_VOXWARE_AC16,
        WAVE_FORMAT_VOXWARE_AC20, WAVE_FORMAT_VOXWARE_RT24,
        WAVE_FORMAT_VOXWARE_RT29, WAVE_FORMAT_VOXWARE_RT29HW,
        WAVE_FORMAT_VOXWARE_VR12, WAVE_FORMAT_VOXWARE_VR18,
        WAVE_FORMAT_VOXWARE_TQ40, WAVE_FORMAT_SOFTSOUND, WAVE_FORMAT_VOXWARE_TQ60,
        WAVE_FORMAT_MSRT24, WAVE_FORMAT_G729A, WAVE_FORMAT_MVI_MV12,
        WAVE_FORMAT_DF_G726, WAVE_FORMAT_DF_GSM610, WAVE_FORMAT_ISIAUDIO,
        WAVE_FORMAT_ONLIVE, WAVE_FORMAT_SBC24, WAVE_FORMAT_DOLBY_AC3_SPDIF,
        WAVE_FORMAT_ZYXEL_ADPCM, WAVE_FORMAT_PHILIPS_LPCBB, WAVE_FORMAT_PACKED,
        WAVE_FORMAT_RHETOREX_ADPCM, WAVE_FORMAT_IRAT, WAVE_FORMAT_VIVO_G723,
        WAVE_FORMAT_VIVO_SIREN, WAVE_FORMAT_DIGITAL_G723,
        WAVE_FORMAT_CREATIVE_ADPCM, WAVE_FORMAT_CREATIVE_FASTSPEECH8,
        WAVE_FORMAT_CREATIVE_FASTSPEECH10, WAVE_FORMAT_QUARTERDECK,
        WAVE_FORMAT_FM_TOWNS_SND, WAVE_FORMAT_BTV_DIGITAL, WAVE_FORMAT_VME_VMPCM,
        WAVE_FORMAT_OLIGSM, WAVE_FORMAT_OLIADPCM, WAVE_FORMAT_OLICELP,
        WAVE_FORMAT_OLISBC, WAVE_FORMAT_OLIOPR, WAVE_FORMAT_LH_CODEC,
        WAVE_FORMAT_NORRIS, WAVE_FORMAT_ISIAUDIO,
        WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS, WAVE_FORMAT_DVM, WAVE_FORMAT_RAW_AAC1,
        WAVE_FORMAT_MPEG_HEAAC, WAVE_FORMAT_MPEG_ADTS_AAC, WAVE_FORMAT_DRM,
        WAVE_FORMAT_DTS, WAVE_FORMAT_WMAVOICE9, WAVE_FORMAT_WMASPDIF,
        WAVE_FORMAT_WMAUDIO_LOSSLESS, WAVE_FORMAT_WMAUDIO2, WAVE_FORMAT_WMAUDIO3,
        WAVE_FORMAT_MPEG_LOAS, WAVE_FORMAT_RAW_SPORT, WAVE_FORMAT_ESST_AC3,
        WAVE_FORMAT_DTS2): Define.
        * include/msacm.h (HACMDRIVERID, HACMDRIVER, HACMSTREAM, HACMOBJ,
        ACMSTREAMHEADER, WAVEFILTER, acmDriverAddA, acmDriverAddW, acmDriverRemove,
        acmMetrics, acmStreamOpen, acmStreamSize, acmStreamPrepareHeader,
        acmStreamUnprepareHeader, acmStreamReset, acmStreamClose, acmStreamConvert):
        Define.

3 files changed, 278 insertions, 1 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 18feccf56..029846208 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,56 @@
+2010-08-24  LRN  <lrn1986@gmail.com>
+
+	* include/mmreg.h (MPEGLAYER3WAVEFORMAT, WAVE_FORMAT_UNKNOWN,
+	WAVE_FORMAT_PCM, WAVE_FORMAT_ADPCM, WAVE_FORMAT_IEEE_FLOAT,
+	WAVE_FORMAT_VSELP, WAVE_FORMAT_IBM_CVSD, WAVE_FORMAT_ALAW,
+	WAVE_FORMAT_MULAW, WAVE_FORMAT_OKI_ADPCM, WAVE_FORMAT_DVI_ADPCM,
+	WAVE_FORMAT_MEDIASPACE_ADPCM, WAVE_FORMAT_SIERRA_ADPCM,
+	WAVE_FORMAT_G723_ADPCM, WAVE_FORMAT_DIGIFIX, WAVE_FORMAT_DIALOGIC_OKI_ADPCM,
+	WAVE_FORMAT_MEDIAVISION_ADPCM, WAVE_FORMAT_CU_CODEC,
+	WAVE_FORMAT_YAMAHA_ADPCM, WAVE_FORMAT_SONARC,
+	WAVE_FORMAT_DSPGROUP_TRUESPEECH, WAVE_FORMAT_ECHOSC1,
+	WAVE_FORMAT_AUDIOFILE_AF36, WAVE_FORMAT_APTX, WAVE_FORMAT_AUDIOFILE_AF10,
+	WAVE_FORMAT_PROSODY_1612, WAVE_FORMAT_LRC, WAVE_FORMAT_DOLBY_AC2,
+	WAVE_FORMAT_GSM610, WAVE_FORMAT_MSNAUDIO, WAVE_FORMAT_ANTEX_ADPCME,
+	WAVE_FORMAT_CONTROL_RES_VQLPC, WAVE_FORMAT_DIGIREAL, WAVE_FORMAT_DIGIADPCM,
+	WAVE_FORMAT_CONTROL_RES_CR10, WAVE_FORMAT_NMS_VBXADPCM,
+	WAVE_FORMAT_ROLAND_RDAC, WAVE_FORMAT_ECHOSC3, WAVE_FORMAT_ROCKWELL_ADPCM,
+	WAVE_FORMAT_ROCKWELL_DIGITALK, WAVE_FORMAT_XEBEC, WAVE_FORMAT_G721_ADPCM,
+	WAVE_FORMAT_G728_CELP, WAVE_FORMAT_MSG723, WAVE_FORMAT_MPEG,
+	WAVE_FORMAT_RT24, WAVE_FORMAT_PAC, WAVE_FORMAT_MPEGLAYER3,
+	WAVE_FORMAT_LUCENT_G723, WAVE_FORMAT_CIRRUS, WAVE_FORMAT_ESPCM,
+	WAVE_FORMAT_VOXWARE, WAVE_FORMAT_CANOPUS_ATRAC, WAVE_FORMAT_G726_ADPCM,
+	WAVE_FORMAT_G722_ADPCM, WAVE_FORMAT_DSAT, WAVE_FORMAT_DSAT_DISPLAY,
+	WAVE_FORMAT_VOXWARE_BYTE_ALIGNED, WAVE_FORMAT_VOXWARE_AC8,
+	WAVE_FORMAT_VOXWARE_AC10, WAVE_FORMAT_VOXWARE_AC16,
+	WAVE_FORMAT_VOXWARE_AC20, WAVE_FORMAT_VOXWARE_RT24,
+	WAVE_FORMAT_VOXWARE_RT29, WAVE_FORMAT_VOXWARE_RT29HW,
+	WAVE_FORMAT_VOXWARE_VR12, WAVE_FORMAT_VOXWARE_VR18,
+	WAVE_FORMAT_VOXWARE_TQ40, WAVE_FORMAT_SOFTSOUND, WAVE_FORMAT_VOXWARE_TQ60,
+	WAVE_FORMAT_MSRT24, WAVE_FORMAT_G729A, WAVE_FORMAT_MVI_MV12,
+	WAVE_FORMAT_DF_G726, WAVE_FORMAT_DF_GSM610, WAVE_FORMAT_ISIAUDIO,
+	WAVE_FORMAT_ONLIVE, WAVE_FORMAT_SBC24, WAVE_FORMAT_DOLBY_AC3_SPDIF,
+	WAVE_FORMAT_ZYXEL_ADPCM, WAVE_FORMAT_PHILIPS_LPCBB, WAVE_FORMAT_PACKED,
+	WAVE_FORMAT_RHETOREX_ADPCM, WAVE_FORMAT_IRAT, WAVE_FORMAT_VIVO_G723,
+	WAVE_FORMAT_VIVO_SIREN, WAVE_FORMAT_DIGITAL_G723,
+	WAVE_FORMAT_CREATIVE_ADPCM, WAVE_FORMAT_CREATIVE_FASTSPEECH8,
+	WAVE_FORMAT_CREATIVE_FASTSPEECH10, WAVE_FORMAT_QUARTERDECK,
+	WAVE_FORMAT_FM_TOWNS_SND, WAVE_FORMAT_BTV_DIGITAL, WAVE_FORMAT_VME_VMPCM,
+	WAVE_FORMAT_OLIGSM, WAVE_FORMAT_OLIADPCM, WAVE_FORMAT_OLICELP,
+	WAVE_FORMAT_OLISBC, WAVE_FORMAT_OLIOPR, WAVE_FORMAT_LH_CODEC,
+	WAVE_FORMAT_NORRIS, WAVE_FORMAT_ISIAUDIO,
+	WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS, WAVE_FORMAT_DVM, WAVE_FORMAT_RAW_AAC1,
+	WAVE_FORMAT_MPEG_HEAAC, WAVE_FORMAT_MPEG_ADTS_AAC, WAVE_FORMAT_DRM,
+	WAVE_FORMAT_DTS, WAVE_FORMAT_WMAVOICE9, WAVE_FORMAT_WMASPDIF,
+	WAVE_FORMAT_WMAUDIO_LOSSLESS, WAVE_FORMAT_WMAUDIO2, WAVE_FORMAT_WMAUDIO3,
+	WAVE_FORMAT_MPEG_LOAS, WAVE_FORMAT_RAW_SPORT, WAVE_FORMAT_ESST_AC3,
+	WAVE_FORMAT_DTS2): Define.
+	* include/msacm.h (HACMDRIVERID, HACMDRIVER, HACMSTREAM, HACMOBJ,
+	ACMSTREAMHEADER, WAVEFILTER, acmDriverAddA, acmDriverAddW, acmDriverRemove,
+	acmMetrics, acmStreamOpen, acmStreamSize, acmStreamPrepareHeader,
+	acmStreamUnprepareHeader, acmStreamReset, acmStreamClose, acmStreamConvert):
+	Define.
+
 2010-08-23  LRN  <lrn1986@gmail.com>
 
 	* include/winbase.h (SYMBOLIC_LINK_FLAG_DIRECTORY, FILE_NAME_NORMALIZED,
diff --git a/winsup/w32api/include/mmreg.h b/winsup/w32api/include/mmreg.h
index 9867db00c..0cc1b9fbe 100644
--- a/winsup/w32api/include/mmreg.h
+++ b/winsup/w32api/include/mmreg.h
@@ -65,6 +65,161 @@ typedef struct {
 #define SPEAKER_TOP_BACK_CENTER 0x10000
 #define SPEAKER_TOP_BACK_RIGHT 0x20000
 
+/*msdn.microsoft.com/en-us/library/dd390710%28VS.85%29.aspx*/
+typedef struct mpeglayer3waveformat_tag {
+  WAVEFORMATEX wfx;
+  WORD         wID;
+  DWORD        fdwFlags;
+  WORD         nBlockSize;
+  WORD         nFramesPerBlock;
+  WORD         nCodecDelay;
+} MPEGLAYER3WAVEFORMAT, *LPMPEGLAYER3WAVEFORMAT;
+
+/* http://www.ietf.org/rfc/rfc2361.txt */
+#define WAVE_FORMAT_UNKNOWN                 0x0000
+#define WAVE_FORMAT_PCM                     0x0001
+#define WAVE_FORMAT_ADPCM                   0x0002
+#define WAVE_FORMAT_IEEE_FLOAT              0x0003
+#define WAVE_FORMAT_VSELP                   0x0004
+#define WAVE_FORMAT_IBM_CVSD                0x0005
+#define WAVE_FORMAT_ALAW                    0x0006
+#define WAVE_FORMAT_MULAW                   0x0007
+
+#define WAVE_FORMAT_OKI_ADPCM               0x0010
+#define WAVE_FORMAT_DVI_ADPCM               0x0011
+#define WAVE_FORMAT_MEDIASPACE_ADPCM        0x0012
+#define WAVE_FORMAT_SIERRA_ADPCM            0x0013
+#define WAVE_FORMAT_G723_ADPCM              0x0014
+#define WAVE_FORMAT_DIGIFIX                 0x0016
+#define WAVE_FORMAT_DIALOGIC_OKI_ADPCM      0x0017
+#define WAVE_FORMAT_MEDIAVISION_ADPCM       0x0018
+#define WAVE_FORMAT_CU_CODEC                0x0019
+#define WAVE_FORMAT_YAMAHA_ADPCM            0x0020
+#define WAVE_FORMAT_SONARC                  0x0021
+#define WAVE_FORMAT_DSPGROUP_TRUESPEECH     0x0022
+#define WAVE_FORMAT_ECHOSC1                 0x0023
+#define WAVE_FORMAT_AUDIOFILE_AF36          0x0024
+#define WAVE_FORMAT_APTX                    0x0025
+#define WAVE_FORMAT_AUDIOFILE_AF10          0x0026
+#define WAVE_FORMAT_PROSODY_1612            0x0027
+#define WAVE_FORMAT_LRC                     0x0028
+
+#define WAVE_FORMAT_DOLBY_AC2               0x0030
+#define WAVE_FORMAT_GSM610                  0x0031
+#define WAVE_FORMAT_MSNAUDIO                0x0032
+#define WAVE_FORMAT_ANTEX_ADPCME            0x0033
+#define WAVE_FORMAT_CONTROL_RES_VQLPC       0x0034
+#define WAVE_FORMAT_DIGIREAL                0x0035
+#define WAVE_FORMAT_DIGIADPCM               0x0036
+#define WAVE_FORMAT_CONTROL_RES_CR10        0x0037
+#define WAVE_FORMAT_NMS_VBXADPCM            0x0038
+#define WAVE_FORMAT_ROLAND_RDAC             0x0039
+#define WAVE_FORMAT_ECHOSC3                 0x003A
+#define WAVE_FORMAT_ROCKWELL_ADPCM          0x003B
+#define WAVE_FORMAT_ROCKWELL_DIGITALK       0x003C
+#define WAVE_FORMAT_XEBEC                   0x003D
+
+#define WAVE_FORMAT_G721_ADPCM              0x0040
+#define WAVE_FORMAT_G728_CELP               0x0041
+#define WAVE_FORMAT_MSG723                  0x0042
+
+#define WAVE_FORMAT_MPEG                    0x0050
+
+#define WAVE_FORMAT_RT24                    0x0052
+#define WAVE_FORMAT_PAC                     0x0053
+
+#define WAVE_FORMAT_MPEGLAYER3              0x0055
+
+#define WAVE_FORMAT_LUCENT_G723             0x0059
+#define WAVE_FORMAT_CIRRUS                  0x0060
+#define WAVE_FORMAT_ESPCM                   0x0061
+#define WAVE_FORMAT_VOXWARE                 0x0062
+#define WAVE_FORMAT_CANOPUS_ATRAC           0x0063
+#define WAVE_FORMAT_G726_ADPCM              0x0064
+#define WAVE_FORMAT_G722_ADPCM              0x0065
+#define WAVE_FORMAT_DSAT                    0x0066
+#define WAVE_FORMAT_DSAT_DISPLAY            0x0067
+
+#define WAVE_FORMAT_VOXWARE_BYTE_ALIGNED    0x0069
+#define WAVE_FORMAT_VOXWARE_AC8             0x0070
+#define WAVE_FORMAT_VOXWARE_AC10            0x0071
+#define WAVE_FORMAT_VOXWARE_AC16            0x0072
+#define WAVE_FORMAT_VOXWARE_AC20            0x0073
+#define WAVE_FORMAT_VOXWARE_RT24            0x0074
+#define WAVE_FORMAT_VOXWARE_RT29            0x0075
+#define WAVE_FORMAT_VOXWARE_RT29HW          0x0076
+#define WAVE_FORMAT_VOXWARE_VR12            0x0077
+#define WAVE_FORMAT_VOXWARE_VR18            0x0078
+#define WAVE_FORMAT_VOXWARE_TQ40            0x0079
+#define WAVE_FORMAT_SOFTSOUND               0x0080
+#define WAVE_FORMAT_VOXWARE_TQ60            0x0081
+#define WAVE_FORMAT_MSRT24                  0x0082
+#define WAVE_FORMAT_G729A                   0x0083
+#define WAVE_FORMAT_MVI_MV12                0x0084
+#define WAVE_FORMAT_DF_G726                 0x0085
+#define WAVE_FORMAT_DF_GSM610               0x0086
+
+#define WAVE_FORMAT_ISIAUDIO                0x0088
+#define WAVE_FORMAT_ONLIVE                  0x0089
+
+#define WAVE_FORMAT_SBC24                   0x0091
+#define WAVE_FORMAT_DOLBY_AC3_SPDIF         0x0092
+
+#define WAVE_FORMAT_ZYXEL_ADPCM             0x0097
+#define WAVE_FORMAT_PHILIPS_LPCBB           0x0098
+#define WAVE_FORMAT_PACKED                  0x0099
+#define WAVE_FORMAT_RHETOREX_ADPCM          0x0100
+#define WAVE_FORMAT_IRAT                    0x0101
+#define WAVE_FORMAT_VIVO_G723               0x0111
+#define WAVE_FORMAT_VIVO_SIREN              0x0112
+#define WAVE_FORMAT_DIGITAL_G723            0x0113
+
+#define WAVE_FORMAT_CREATIVE_ADPCM          0x0200
+
+#define WAVE_FORMAT_CREATIVE_FASTSPEECH8    0x0202
+#define WAVE_FORMAT_CREATIVE_FASTSPEECH10   0x0203
+
+#define WAVE_FORMAT_QUARTERDECK             0x0220
+
+#define WAVE_FORMAT_FM_TOWNS_SND            0x0300
+
+#define WAVE_FORMAT_BTV_DIGITAL             0x0400
+
+#define WAVE_FORMAT_VME_VMPCM               0x0680
+
+#define WAVE_FORMAT_OLIGSM                  0x1000
+#define WAVE_FORMAT_OLIADPCM                0x1001
+#define WAVE_FORMAT_OLICELP                 0x1002
+#define WAVE_FORMAT_OLISBC                  0x1003
+#define WAVE_FORMAT_OLIOPR                  0x1004
+
+#define WAVE_FORMAT_LH_CODEC                0x1100
+
+#define WAVE_FORMAT_NORRIS                  0x1400
+#define WAVE_FORMAT_ISIAUDIO                0x1401
+
+#define WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS 0x1500
+
+#define WAVE_FORMAT_DVM                     0x2000
+
+/* http://msdn.microsoft.com/en-us/library/aa372553%28VS.85%29.aspx */
+#define WAVE_FORMAT_RAW_AAC1                0x00FF
+#define WAVE_FORMAT_MPEG_HEAAC              0x1610
+#define WAVE_FORMAT_MPEG_ADTS_AAC           0x1600
+#define WAVE_FORMAT_DRM                     0x0009
+#define WAVE_FORMAT_DTS                     0x0008
+#define WAVE_FORMAT_WMAVOICE9               0x000A
+#define WAVE_FORMAT_WMASPDIF                0x0164
+#define WAVE_FORMAT_WMAUDIO_LOSSLESS        0x0163
+#define WAVE_FORMAT_WMAUDIO2                0x0161
+#define WAVE_FORMAT_WMAUDIO3                0x0162
+
+/* http://msdn.microsoft.com/en-us/library/dd317599%28VS.85%29.aspx */
+#define WAVE_FORMAT_MPEG_LOAS               0x1602
+#define WAVE_FORMAT_RAW_SPORT               0x0240
+#define WAVE_FORMAT_ESST_AC3                0x0241
+#define WAVE_FORMAT_DTS2                    0x2001
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/w32api/include/msacm.h b/winsup/w32api/include/msacm.h
index 4f215367e..fe1b51757 100644
--- a/winsup/w32api/include/msacm.h
+++ b/winsup/w32api/include/msacm.h
@@ -11,7 +11,18 @@
 extern "C" {
 #endif
 
-typedef HANDLE HACMDRIVERID, HACMDRIVER, *LPHACMDRIVER; /*they're handles, right?*/
+DECLARE_HANDLE(HACMDRIVERID);
+typedef HACMDRIVERID *PHACMDRIVERID;
+typedef HACMDRIVERID *LPHACMDRIVERID;
+DECLARE_HANDLE(HACMDRIVER);
+typedef HACMDRIVER *PHACMDRIVER;
+typedef HACMDRIVER *LPHACMDRIVER;
+DECLARE_HANDLE(HACMSTREAM);
+typedef HACMSTREAM *PHACMSTREAM;
+typedef HACMSTREAM *LPHACMSTREAM;
+DECLARE_HANDLE(HACMOBJ);
+typedef HACMOBJ *PHACMOBJ;
+typedef HACMOBJ *LPHACMOBJ;
 
 /*found through experimentation*/
 #define ACMDRIVERDETAILS_SHORTNAME_CHARS 32
@@ -44,6 +55,30 @@ typedef struct {
 	WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILSW, *LPACMFORMATDETAILSW;
 
+/*msdn.microsoft.com/en-us/library/dd742926%28VS.85%29.aspx*/
+typedef struct {
+  DWORD     cbStruct;
+  DWORD     fdwStatus;
+  DWORD_PTR dwUser;
+  LPBYTE    pbSrc;
+  DWORD     cbSrcLength;
+  DWORD     cbSrcLengthUsed;
+  DWORD_PTR dwSrcUser;
+  LPBYTE    pbDst;
+  DWORD     cbDstLength;
+  DWORD     cbDstLengthUsed;
+  DWORD_PTR dwDstUser;
+  DWORD     dwReservedDriver[10];
+} ACMSTREAMHEADER, *LPACMSTREAMHEADER;
+
+/*msdn.microsoft.com/en-us/library/dd757711%28v=VS.85%29.aspx*/
+typedef struct {
+  DWORD cbStruct;
+  DWORD dwFilterTag;
+  DWORD fdwFilter;
+  DWORD dwReserved[5];
+} WAVEFILTER, *LPWAVEFILTER;
+
 /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformattagdetails_str.asp*/
 typedef struct {
 	DWORD cbStruct;
@@ -146,6 +181,14 @@ MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance,
 /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformatenum.asp*/
 MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, LPACMFORMATDETAILSA pafd, ACMFORMATENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
 MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, LPACMFORMATDETAILSW pafd, ACMFORMATENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
+
+/*msdn.microsoft.com/en-us/library/dd742885%28VS.85%29.aspx*/
+MMRESULT WINAPI acmDriverAddA(LPHACMDRIVERID phadid, HINSTANCE hinstModule, LPARAM lParam, DWORD dwPriority, DWORD fdwAdd);
+MMRESULT WINAPI acmDriverAddW(LPHACMDRIVERID phadid, HINSTANCE hinstModule, LPARAM lParam, DWORD dwPriority, DWORD fdwAdd);
+
+/*msdn.microsoft.com/en-us/library/dd742897%28v=VS.85%29.aspx*/
+MMRESULT WINAPI acmDriverRemove(HACMDRIVERID hadid, DWORD fdwRemove);
+
 /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverclose.asp*/
 MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose);
 /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverdetails.asp*/
@@ -155,6 +198,30 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, LPACMDRIVERDETAILSW padd,
 MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, LPACMFORMATTAGDETAILSA paftd, ACMFORMATTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
 MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, LPACMFORMATTAGDETAILSW paftd, ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
 
+/*msdn.microsoft.com/en-us/library/dd742922(VS.85).aspx*/
+MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric);
+
+/*msdn.microsoft.com/en-us/library/dd742928%28VS.85%29.aspx*/
+MMRESULT WINAPI acmStreamOpen(LPHACMSTREAM phas, HACMDRIVER had, LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, LPWAVEFILTER pwfltr, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen);
+
+/*msdn.microsoft.com/en-us/library/dd742931%28VS.85%29.aspx*/
+MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput, LPDWORD pdwOutputBytes, DWORD fdwSize);
+
+/*msdn.microsoft.com/en-us/library/dd742929%28VS.85%29.aspx*/
+MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, LPACMSTREAMHEADER pash, DWORD fdwPrepare);
+
+/*msdn.microsoft.com/en-us/library/dd742932%28VS.85%29.aspx*/
+MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, LPACMSTREAMHEADER pash, DWORD fdwUnprepare);
+
+/*msdn.microsoft.com/en-us/library/dd742930%28VS.85%29.aspx*/
+MMRESULT WINAPI acmStreamReset(HACMSTREAM has, DWORD fdwReset);
+
+/*msdn.microsoft.com/en-us/library/dd742923%28VS.85%29.aspx*/
+MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose);
+
+/*msdn.microsoft.com/en-us/library/dd742924%28VS.85%29.aspx*/
+MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, LPACMSTREAMHEADER pash, DWORD fdwConvert);
+
 #ifdef UNICODE
 
 typedef ACMFORMATDETAILSW ACMFORMATDETAILS, *LPACMFORMATDETAILS;
@@ -165,6 +232,7 @@ typedef ACMFORMATTAGENUMCBW ACMFORMATTAGENUMCB;
 #define acmFormatEnum acmFormatEnumW
 #define acmDriverDetails acmDriverDetailsW
 #define acmFormatTagEnum acmFormatTagEnumW
+#define acmDriverAdd acmDriverAddW
 
 #else /*ifdef UNICODE*/
 
@@ -176,6 +244,7 @@ typedef ACMFORMATTAGENUMCBA ACMFORMATTAGENUMCB;
 #define acmFormatEnum acmFormatEnumA
 #define acmDriverDetails acmDriverDetailsA
 #define acmFormatTagEnum acmFormatTagEnumA
+#define acmDriverAdd acmDriverAddA
 
 #endif /*ifdef UNICODE*/