Browse Source

Merge pull request #5192 from Badaxis/badaxis/Windows-Audio&Winmm

COM & Audio bindings
gingerBill 3 months ago
parent
commit
4f7ed35435
3 changed files with 343 additions and 20 deletions
  1. 2 0
      core/sys/windows/ole32.odin
  2. 8 0
      core/sys/windows/winerror.odin
  3. 333 20
      core/sys/windows/winmm.odin

+ 2 - 0
core/sys/windows/ole32.odin

@@ -52,6 +52,8 @@ foreign Ole32 {
 		ppv: ^LPVOID,
 		ppv: ^LPVOID,
 	) -> HRESULT ---
 	) -> HRESULT ---
 
 
+	CoTaskMemAlloc :: proc(cb: SIZE_T) -> rawptr ---
+	CoTaskMemRealloc :: proc(pv: rawptr, cb: SIZE_T) -> rawptr ---
 	CoTaskMemFree :: proc(pv: rawptr) ---
 	CoTaskMemFree :: proc(pv: rawptr) ---
 
 
 	CLSIDFromProgID :: proc(lpszProgID: LPCOLESTR, lpclsid: LPCLSID) -> HRESULT ---
 	CLSIDFromProgID :: proc(lpszProgID: LPCOLESTR, lpclsid: LPCLSID) -> HRESULT ---

+ 8 - 0
core/sys/windows/winerror.odin

@@ -173,6 +173,9 @@ FACILITY :: enum DWORD {
 	EAS                                      = 85,
 	EAS                                      = 85,
 	WEB                                      = 885,
 	WEB                                      = 885,
 	WEB_SOCKET                               = 886,
 	WEB_SOCKET                               = 886,
+	XAUDIO2                                  = 896,
+	XAPO                                     = 897,
+	GAMEINPUT                                = 906,
 	MOBILE                                   = 1793,
 	MOBILE                                   = 1793,
 	SQLITE                                   = 1967,
 	SQLITE                                   = 1967,
 	SERVICE_FABRIC                           = 1968,
 	SERVICE_FABRIC                           = 1968,
@@ -231,6 +234,7 @@ ERROR_PIPE_BUSY              : DWORD : 231
 
 
 // https://learn.microsoft.com/en-us/windows/win32/seccrypto/common-hresult-values
 // https://learn.microsoft.com/en-us/windows/win32/seccrypto/common-hresult-values
 S_OK           :: 0x00000000 // Operation successful
 S_OK           :: 0x00000000 // Operation successful
+S_FALSE        :: 0x00000001
 E_NOTIMPL      :: 0x80004001 // Not implemented
 E_NOTIMPL      :: 0x80004001 // Not implemented
 E_NOINTERFACE  :: 0x80004002 // No such interface supported
 E_NOINTERFACE  :: 0x80004002 // No such interface supported
 E_POINTER      :: 0x80004003 // Pointer that is not valid
 E_POINTER      :: 0x80004003 // Pointer that is not valid
@@ -270,6 +274,10 @@ MAKE_HRESULT :: #force_inline proc "contextless" (#any_int sev: int, #any_int fa
 	return HRESULT((uint(sev)<<31) | (uint(fac)<<16) | (uint(code)))
 	return HRESULT((uint(sev)<<31) | (uint(fac)<<16) | (uint(code)))
 }
 }
 
 
+HRESULT_FROM_WIN32 :: #force_inline proc "contextless" (#any_int code: int) -> HRESULT {
+	return HRESULT(code) <= 0 ? HRESULT(code) : HRESULT(uint(code & 0x0000FFFF) | (uint(FACILITY.WIN32) << 16) | 0x80000000)
+}
+
 DECODE_HRESULT :: #force_inline proc "contextless" (#any_int hr: int) -> (SEVERITY, FACILITY, int) {
 DECODE_HRESULT :: #force_inline proc "contextless" (#any_int hr: int) -> (SEVERITY, FACILITY, int) {
 	return HRESULT_SEVERITY(hr), HRESULT_FACILITY(hr), HRESULT_CODE(hr)
 	return HRESULT_SEVERITY(hr), HRESULT_FACILITY(hr), HRESULT_CODE(hr)
 }
 }

+ 333 - 20
core/sys/windows/winmm.odin

@@ -265,7 +265,7 @@ HWAVE    :: distinct HANDLE
 HWAVEIN  :: distinct HANDLE
 HWAVEIN  :: distinct HANDLE
 HWAVEOUT :: distinct HANDLE
 HWAVEOUT :: distinct HANDLE
 
 
-LPHWAVEIN :: ^HWAVEIN
+LPHWAVEIN  :: ^HWAVEIN
 LPHWAVEOUT :: ^HWAVEOUT
 LPHWAVEOUT :: ^HWAVEOUT
 
 
 // https://learn.microsoft.com/en-us/windows/win32/multimedia/multimedia-timer-structures
 // https://learn.microsoft.com/en-us/windows/win32/multimedia/multimedia-timer-structures
@@ -311,9 +311,284 @@ MAXPNAMELEN :: 32
 MAXERRORLENGTH :: 256
 MAXERRORLENGTH :: 256
 MMVERSION :: UINT
 MMVERSION :: UINT
 
 
+// Input is four characters string
+// Output is little-endian u32 representation
+MAKEFOURCC :: #force_inline proc "contextless" (s: [4]BYTE) -> DWORD {
+	return (DWORD(s[0])) | (DWORD(s[1]) << 8) | (DWORD(s[2]) << 16) | (DWORD(s[3]) << 24 )
+}
+
 /* flags for wFormatTag field of WAVEFORMAT */
 /* flags for wFormatTag field of WAVEFORMAT */
 WAVE_FORMAT_PCM :: 1
 WAVE_FORMAT_PCM :: 1
 
 
+WAVE_FORMAT_UNKNOWN                    :: 0x0000 /* Microsoft Corporation */
+WAVE_FORMAT_ADPCM                      :: 0x0002 /* Microsoft Corporation */
+WAVE_FORMAT_IEEE_FLOAT                 :: 0x0003 /* Microsoft Corporation */
+WAVE_FORMAT_VSELP                      :: 0x0004 /* Compaq Computer Corp. */
+WAVE_FORMAT_IBM_CVSD                   :: 0x0005 /* IBM Corporation */
+WAVE_FORMAT_ALAW                       :: 0x0006 /* Microsoft Corporation */
+WAVE_FORMAT_MULAW                      :: 0x0007 /* Microsoft Corporation */
+WAVE_FORMAT_DTS                        :: 0x0008 /* Microsoft Corporation */
+WAVE_FORMAT_DRM                        :: 0x0009 /* Microsoft Corporation */
+WAVE_FORMAT_WMAVOICE9                  :: 0x000A /* Microsoft Corporation */
+WAVE_FORMAT_WMAVOICE10                 :: 0x000B /* Microsoft Corporation */
+WAVE_FORMAT_OKI_ADPCM                  :: 0x0010 /* OKI */
+WAVE_FORMAT_DVI_ADPCM                  :: 0x0011 /* Intel Corporation */
+WAVE_FORMAT_IMA_ADPCM                  :: WAVE_FORMAT_DVI_ADPCM /*  Intel Corporation */
+WAVE_FORMAT_MEDIASPACE_ADPCM           :: 0x0012 /* Videologic */
+WAVE_FORMAT_SIERRA_ADPCM               :: 0x0013 /* Sierra Semiconductor Corp */
+WAVE_FORMAT_G723_ADPCM                 :: 0x0014 /* Antex Electronics Corporation */
+WAVE_FORMAT_DIGISTD                    :: 0x0015 /* DSP Solutions, Inc. */
+WAVE_FORMAT_DIGIFIX                    :: 0x0016 /* DSP Solutions, Inc. */
+WAVE_FORMAT_DIALOGIC_OKI_ADPCM         :: 0x0017 /* Dialogic Corporation */
+WAVE_FORMAT_MEDIAVISION_ADPCM          :: 0x0018 /* Media Vision, Inc. */
+WAVE_FORMAT_CU_CODEC                   :: 0x0019 /* Hewlett-Packard Company */
+WAVE_FORMAT_HP_DYN_VOICE               :: 0x001A /* Hewlett-Packard Company */
+WAVE_FORMAT_YAMAHA_ADPCM               :: 0x0020 /* Yamaha Corporation of America */
+WAVE_FORMAT_SONARC                     :: 0x0021 /* Speech Compression */
+WAVE_FORMAT_DSPGROUP_TRUESPEECH        :: 0x0022 /* DSP Group, Inc */
+WAVE_FORMAT_ECHOSC1                    :: 0x0023 /* Echo Speech Corporation */
+WAVE_FORMAT_AUDIOFILE_AF36             :: 0x0024 /* Virtual Music, Inc. */
+WAVE_FORMAT_APTX                       :: 0x0025 /* Audio Processing Technology */
+WAVE_FORMAT_AUDIOFILE_AF10             :: 0x0026 /* Virtual Music, Inc. */
+WAVE_FORMAT_PROSODY_1612               :: 0x0027 /* Aculab plc */
+WAVE_FORMAT_LRC                        :: 0x0028 /* Merging Technologies S.A. */
+WAVE_FORMAT_DOLBY_AC2                  :: 0x0030 /* Dolby Laboratories */
+WAVE_FORMAT_GSM610                     :: 0x0031 /* Microsoft Corporation */
+WAVE_FORMAT_MSNAUDIO                   :: 0x0032 /* Microsoft Corporation */
+WAVE_FORMAT_ANTEX_ADPCME               :: 0x0033 /* Antex Electronics Corporation */
+WAVE_FORMAT_CONTROL_RES_VQLPC          :: 0x0034 /* Control Resources Limited */
+WAVE_FORMAT_DIGIREAL                   :: 0x0035 /* DSP Solutions, Inc. */
+WAVE_FORMAT_DIGIADPCM                  :: 0x0036 /* DSP Solutions, Inc. */
+WAVE_FORMAT_CONTROL_RES_CR10           :: 0x0037 /* Control Resources Limited */
+WAVE_FORMAT_NMS_VBXADPCM               :: 0x0038 /* Natural MicroSystems */
+WAVE_FORMAT_CS_IMAADPCM                :: 0x0039 /* Crystal Semiconductor IMA ADPCM */
+WAVE_FORMAT_ECHOSC3                    :: 0x003A /* Echo Speech Corporation */
+WAVE_FORMAT_ROCKWELL_ADPCM             :: 0x003B /* Rockwell International */
+WAVE_FORMAT_ROCKWELL_DIGITALK          :: 0x003C /* Rockwell International */
+WAVE_FORMAT_XEBEC                      :: 0x003D /* Xebec Multimedia Solutions Limited */
+WAVE_FORMAT_G721_ADPCM                 :: 0x0040 /* Antex Electronics Corporation */
+WAVE_FORMAT_G728_CELP                  :: 0x0041 /* Antex Electronics Corporation */
+WAVE_FORMAT_MSG723                     :: 0x0042 /* Microsoft Corporation */
+WAVE_FORMAT_INTEL_G723_1               :: 0x0043 /* Intel Corp. */
+WAVE_FORMAT_INTEL_G729                 :: 0x0044 /* Intel Corp. */
+WAVE_FORMAT_SHARP_G726                 :: 0x0045 /* Sharp */
+WAVE_FORMAT_MPEG                       :: 0x0050 /* Microsoft Corporation */
+WAVE_FORMAT_RT24                       :: 0x0052 /* InSoft, Inc. */
+WAVE_FORMAT_PAC                        :: 0x0053 /* InSoft, Inc. */
+WAVE_FORMAT_MPEGLAYER3                 :: 0x0055 /* ISO/MPEG Layer3 Format Tag */
+WAVE_FORMAT_LUCENT_G723                :: 0x0059 /* Lucent Technologies */
+WAVE_FORMAT_CIRRUS                     :: 0x0060 /* Cirrus Logic */
+WAVE_FORMAT_ESPCM                      :: 0x0061 /* ESS Technology */
+WAVE_FORMAT_VOXWARE                    :: 0x0062 /* Voxware Inc */
+WAVE_FORMAT_CANOPUS_ATRAC              :: 0x0063 /* Canopus, co., Ltd. */
+WAVE_FORMAT_G726_ADPCM                 :: 0x0064 /* APICOM */
+WAVE_FORMAT_G722_ADPCM                 :: 0x0065 /* APICOM */
+WAVE_FORMAT_DSAT                       :: 0x0066 /* Microsoft Corporation */
+WAVE_FORMAT_DSAT_DISPLAY               :: 0x0067 /* Microsoft Corporation */
+WAVE_FORMAT_VOXWARE_BYTE_ALIGNED       :: 0x0069 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_AC8                :: 0x0070 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_AC10               :: 0x0071 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_AC16               :: 0x0072 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_AC20               :: 0x0073 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_RT24               :: 0x0074 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_RT29               :: 0x0075 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_RT29HW             :: 0x0076 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_VR12               :: 0x0077 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_VR18               :: 0x0078 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_TQ40               :: 0x0079 /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_SC3                :: 0x007A /* Voxware Inc */
+WAVE_FORMAT_VOXWARE_SC3_1              :: 0x007B /* Voxware Inc */
+WAVE_FORMAT_SOFTSOUND                  :: 0x0080 /* Softsound, Ltd. */
+WAVE_FORMAT_VOXWARE_TQ60               :: 0x0081 /* Voxware Inc */
+WAVE_FORMAT_MSRT24                     :: 0x0082 /* Microsoft Corporation */
+WAVE_FORMAT_G729A                      :: 0x0083 /* AT&T Labs, Inc. */
+WAVE_FORMAT_MVI_MVI2                   :: 0x0084 /* Motion Pixels */
+WAVE_FORMAT_DF_G726                    :: 0x0085 /* DataFusion Systems (Pty) (Ltd) */
+WAVE_FORMAT_DF_GSM610                  :: 0x0086 /* DataFusion Systems (Pty) (Ltd) */
+WAVE_FORMAT_ISIAUDIO                   :: 0x0088 /* Iterated Systems, Inc. */
+WAVE_FORMAT_ONLIVE                     :: 0x0089 /* OnLive! Technologies, Inc. */
+WAVE_FORMAT_MULTITUDE_FT_SX20          :: 0x008A /* Multitude Inc. */
+WAVE_FORMAT_INFOCOM_ITS_G721_ADPCM     :: 0x008B /* Infocom */
+WAVE_FORMAT_CONVEDIA_G729              :: 0x008C /* Convedia Corp. */
+WAVE_FORMAT_CONGRUENCY                 :: 0x008D /* Congruency Inc. */
+WAVE_FORMAT_SBC24                      :: 0x0091 /* Siemens Business Communications Sys */
+WAVE_FORMAT_DOLBY_AC3_SPDIF            :: 0x0092 /* Sonic Foundry */
+WAVE_FORMAT_MEDIASONIC_G723            :: 0x0093 /* MediaSonic */
+WAVE_FORMAT_PROSODY_8KBPS              :: 0x0094 /* Aculab plc */
+WAVE_FORMAT_ZYXEL_ADPCM                :: 0x0097 /* ZyXEL Communications, Inc. */
+WAVE_FORMAT_PHILIPS_LPCBB              :: 0x0098 /* Philips Speech Processing */
+WAVE_FORMAT_PACKED                     :: 0x0099 /* Studer Professional Audio AG */
+WAVE_FORMAT_MALDEN_PHONYTALK           :: 0x00A0 /* Malden Electronics Ltd. */
+WAVE_FORMAT_RACAL_RECORDER_GSM         :: 0x00A1 /* Racal recorders */
+WAVE_FORMAT_RACAL_RECORDER_G720_A      :: 0x00A2 /* Racal recorders */
+WAVE_FORMAT_RACAL_RECORDER_G723_1      :: 0x00A3 /* Racal recorders */
+WAVE_FORMAT_RACAL_RECORDER_TETRA_ACELP :: 0x00A4 /* Racal recorders */
+WAVE_FORMAT_NEC_AAC                    :: 0x00B0 /* NEC Corp. */
+WAVE_FORMAT_RAW_AAC1                   :: 0x00FF /* For Raw AAC, with format block AudioSpecificConfig() (as defined by MPEG-4), that follows WAVEFORMATEX */
+WAVE_FORMAT_RHETOREX_ADPCM             :: 0x0100 /* Rhetorex Inc. */
+WAVE_FORMAT_IRAT                       :: 0x0101 /* BeCubed Software Inc. */
+WAVE_FORMAT_VIVO_G723                  :: 0x0111 /* Vivo Software */
+WAVE_FORMAT_VIVO_SIREN                 :: 0x0112 /* Vivo Software */
+WAVE_FORMAT_PHILIPS_CELP               :: 0x0120 /* Philips Speech Processing */
+WAVE_FORMAT_PHILIPS_GRUNDIG            :: 0x0121 /* Philips Speech Processing */
+WAVE_FORMAT_DIGITAL_G723               :: 0x0123 /* Digital Equipment Corporation */
+WAVE_FORMAT_SANYO_LD_ADPCM             :: 0x0125 /* Sanyo Electric Co., Ltd. */
+WAVE_FORMAT_SIPROLAB_ACEPLNET          :: 0x0130 /* Sipro Lab Telecom Inc. */
+WAVE_FORMAT_SIPROLAB_ACELP4800         :: 0x0131 /* Sipro Lab Telecom Inc. */
+WAVE_FORMAT_SIPROLAB_ACELP8V3          :: 0x0132 /* Sipro Lab Telecom Inc. */
+WAVE_FORMAT_SIPROLAB_G729              :: 0x0133 /* Sipro Lab Telecom Inc. */
+WAVE_FORMAT_SIPROLAB_G729A             :: 0x0134 /* Sipro Lab Telecom Inc. */
+WAVE_FORMAT_SIPROLAB_KELVIN            :: 0x0135 /* Sipro Lab Telecom Inc. */
+WAVE_FORMAT_VOICEAGE_AMR               :: 0x0136 /* VoiceAge Corp. */
+WAVE_FORMAT_G726ADPCM                  :: 0x0140 /* Dictaphone Corporation */
+WAVE_FORMAT_DICTAPHONE_CELP68          :: 0x0141 /* Dictaphone Corporation */
+WAVE_FORMAT_DICTAPHONE_CELP54          :: 0x0142 /* Dictaphone Corporation */
+WAVE_FORMAT_QUALCOMM_PUREVOICE         :: 0x0150 /* Qualcomm, Inc. */
+WAVE_FORMAT_QUALCOMM_HALFRATE          :: 0x0151 /* Qualcomm, Inc. */
+WAVE_FORMAT_TUBGSM                     :: 0x0155 /* Ring Zero Systems, Inc. */
+WAVE_FORMAT_MSAUDIO1                   :: 0x0160 /* Microsoft Corporation */
+WAVE_FORMAT_WMAUDIO2                   :: 0x0161 /* Microsoft Corporation */
+WAVE_FORMAT_WMAUDIO3                   :: 0x0162 /* Microsoft Corporation */
+WAVE_FORMAT_WMAUDIO_LOSSLESS           :: 0x0163 /* Microsoft Corporation */
+WAVE_FORMAT_WMASPDIF                   :: 0x0164 /* Microsoft Corporation */
+WAVE_FORMAT_UNISYS_NAP_ADPCM           :: 0x0170 /* Unisys Corp. */
+WAVE_FORMAT_UNISYS_NAP_ULAW            :: 0x0171 /* Unisys Corp. */
+WAVE_FORMAT_UNISYS_NAP_ALAW            :: 0x0172 /* Unisys Corp. */
+WAVE_FORMAT_UNISYS_NAP_16K             :: 0x0173 /* Unisys Corp. */
+WAVE_FORMAT_SYCOM_ACM_SYC008           :: 0x0174 /* SyCom Technologies */
+WAVE_FORMAT_SYCOM_ACM_SYC701_G726L     :: 0x0175 /* SyCom Technologies */
+WAVE_FORMAT_SYCOM_ACM_SYC701_CELP54    :: 0x0176 /* SyCom Technologies */
+WAVE_FORMAT_SYCOM_ACM_SYC701_CELP68    :: 0x0177 /* SyCom Technologies */
+WAVE_FORMAT_KNOWLEDGE_ADVENTURE_ADPCM  :: 0x0178 /* Knowledge Adventure, Inc. */
+WAVE_FORMAT_FRAUNHOFER_IIS_MPEG2_AAC   :: 0x0180 /* Fraunhofer IIS */
+WAVE_FORMAT_DTS_DS                     :: 0x0190 /* Digital Theatre Systems, Inc. */
+WAVE_FORMAT_CREATIVE_ADPCM             :: 0x0200 /* Creative Labs, Inc */
+WAVE_FORMAT_CREATIVE_FASTSPEECH8       :: 0x0202 /* Creative Labs, Inc */
+WAVE_FORMAT_CREATIVE_FASTSPEECH10      :: 0x0203 /* Creative Labs, Inc */
+WAVE_FORMAT_UHER_ADPCM                 :: 0x0210 /* UHER informatic GmbH */
+WAVE_FORMAT_ULEAD_DV_AUDIO             :: 0x0215 /* Ulead Systems, Inc. */
+WAVE_FORMAT_ULEAD_DV_AUDIO_1           :: 0x0216 /* Ulead Systems, Inc. */
+WAVE_FORMAT_QUARTERDECK                :: 0x0220 /* Quarterdeck Corporation */
+WAVE_FORMAT_ILINK_VC                   :: 0x0230 /* I-link Worldwide */
+WAVE_FORMAT_RAW_SPORT                  :: 0x0240 /* Aureal Semiconductor */
+WAVE_FORMAT_ESST_AC3                   :: 0x0241 /* ESS Technology, Inc. */
+WAVE_FORMAT_GENERIC_PASSTHRU           :: 0x0249
+WAVE_FORMAT_IPI_HSX                    :: 0x0250 /* Interactive Products, Inc. */
+WAVE_FORMAT_IPI_RPELP                  :: 0x0251 /* Interactive Products, Inc. */
+WAVE_FORMAT_CS2                        :: 0x0260 /* Consistent Software */
+WAVE_FORMAT_SONY_SCX                   :: 0x0270 /* Sony Corp. */
+WAVE_FORMAT_SONY_SCY                   :: 0x0271 /* Sony Corp. */
+WAVE_FORMAT_SONY_ATRAC3                :: 0x0272 /* Sony Corp. */
+WAVE_FORMAT_SONY_SPC                   :: 0x0273 /* Sony Corp. */
+WAVE_FORMAT_TELUM_AUDIO                :: 0x0280 /* Telum Inc. */
+WAVE_FORMAT_TELUM_IA_AUDIO             :: 0x0281 /* Telum Inc. */
+WAVE_FORMAT_NORCOM_VOICE_SYSTEMS_ADPCM :: 0x0285 /* Norcom Electronics Corp. */
+WAVE_FORMAT_FM_TOWNS_SND               :: 0x0300 /* Fujitsu Corp. */
+WAVE_FORMAT_MICRONAS                   :: 0x0350 /* Micronas Semiconductors, Inc. */
+WAVE_FORMAT_MICRONAS_CELP833           :: 0x0351 /* Micronas Semiconductors, Inc. */
+WAVE_FORMAT_BTV_DIGITAL                :: 0x0400 /* Brooktree Corporation */
+WAVE_FORMAT_INTEL_MUSIC_CODER          :: 0x0401 /* Intel Corp. */
+WAVE_FORMAT_INDEO_AUDIO                :: 0x0402 /* Ligos */
+WAVE_FORMAT_QDESIGN_MUSIC              :: 0x0450 /* QDesign Corporation */
+WAVE_FORMAT_ON2_VP7_AUDIO              :: 0x0500 /* On2 Technologies */
+WAVE_FORMAT_ON2_VP6_AUDIO              :: 0x0501 /* On2 Technologies */
+WAVE_FORMAT_VME_VMPCM                  :: 0x0680 /* AT&T Labs, Inc. */
+WAVE_FORMAT_TPC                        :: 0x0681 /* AT&T Labs, Inc. */
+WAVE_FORMAT_LIGHTWAVE_LOSSLESS         :: 0x08AE /* Clearjump */
+WAVE_FORMAT_OLIGSM                     :: 0x1000 /* Ing C. Olivetti & C., S.p.A. */
+WAVE_FORMAT_OLIADPCM                   :: 0x1001 /* Ing C. Olivetti & C., S.p.A. */
+WAVE_FORMAT_OLICELP                    :: 0x1002 /* Ing C. Olivetti & C., S.p.A. */
+WAVE_FORMAT_OLISBC                     :: 0x1003 /* Ing C. Olivetti & C., S.p.A. */
+WAVE_FORMAT_OLIOPR                     :: 0x1004 /* Ing C. Olivetti & C., S.p.A. */
+WAVE_FORMAT_LH_CODEC                   :: 0x1100 /* Lernout & Hauspie */
+WAVE_FORMAT_LH_CODEC_CELP              :: 0x1101 /* Lernout & Hauspie */
+WAVE_FORMAT_LH_CODEC_SBC8              :: 0x1102 /* Lernout & Hauspie */
+WAVE_FORMAT_LH_CODEC_SBC12             :: 0x1103 /* Lernout & Hauspie */
+WAVE_FORMAT_LH_CODEC_SBC16             :: 0x1104 /* Lernout & Hauspie */
+WAVE_FORMAT_NORRIS                     :: 0x1400 /* Norris Communications, Inc. */
+WAVE_FORMAT_ISIAUDIO_2                 :: 0x1401 /* ISIAudio */
+WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS    :: 0x1500 /* AT&T Labs, Inc. */
+WAVE_FORMAT_MPEG_ADTS_AAC              :: 0x1600 /* Microsoft Corporation */
+WAVE_FORMAT_MPEG_RAW_AAC               :: 0x1601 /* Microsoft Corporation */
+WAVE_FORMAT_MPEG_LOAS                  :: 0x1602 /* Microsoft Corporation (MPEG-4 Audio Transport Streams (LOAS/LATM) */
+WAVE_FORMAT_NOKIA_MPEG_ADTS_AAC        :: 0x1608 /* Microsoft Corporation */
+WAVE_FORMAT_NOKIA_MPEG_RAW_AAC         :: 0x1609 /* Microsoft Corporation */
+WAVE_FORMAT_VODAFONE_MPEG_ADTS_AAC     :: 0x160A /* Microsoft Corporation */
+WAVE_FORMAT_VODAFONE_MPEG_RAW_AAC      :: 0x160B /* Microsoft Corporation */
+WAVE_FORMAT_MPEG_HEAAC                 :: 0x1610 /* Microsoft Corporation (MPEG-2 AAC or MPEG-4 HE-AAC v1/v2 streams with any payload (ADTS, ADIF, LOAS/LATM, RAW). Format block includes MP4 AudioSpecificConfig() -- see HEAACWAVEFORMAT below */
+WAVE_FORMAT_VOXWARE_RT24_SPEECH        :: 0x181C /* Voxware Inc. */
+WAVE_FORMAT_SONICFOUNDRY_LOSSLESS      :: 0x1971 /* Sonic Foundry */
+WAVE_FORMAT_INNINGS_TELECOM_ADPCM      :: 0x1979 /* Innings Telecom Inc. */
+WAVE_FORMAT_LUCENT_SX8300P             :: 0x1C07 /* Lucent Technologies */
+WAVE_FORMAT_LUCENT_SX5363S             :: 0x1C0C /* Lucent Technologies */
+WAVE_FORMAT_CUSEEME                    :: 0x1F03 /* CUSeeMe */
+WAVE_FORMAT_NTCSOFT_ALF2CM_ACM         :: 0x1FC4 /* NTCSoft */
+WAVE_FORMAT_DVM                        :: 0x2000 /* FAST Multimedia AG */
+WAVE_FORMAT_DTS2                       :: 0x2001
+WAVE_FORMAT_MAKEAVIS                   :: 0x3313
+WAVE_FORMAT_DIVIO_MPEG4_AAC            :: 0x4143 /* Divio, Inc. */
+WAVE_FORMAT_NOKIA_ADAPTIVE_MULTIRATE   :: 0x4201 /* Nokia */
+WAVE_FORMAT_DIVIO_G726                 :: 0x4243 /* Divio, Inc. */
+WAVE_FORMAT_LEAD_SPEECH                :: 0x434C /* LEAD Technologies */
+WAVE_FORMAT_LEAD_VORBIS                :: 0x564C /* LEAD Technologies */
+WAVE_FORMAT_WAVPACK_AUDIO              :: 0x5756 /* xiph.org */
+WAVE_FORMAT_ALAC                       :: 0x6C61 /* Apple Lossless */
+WAVE_FORMAT_OGG_VORBIS_MODE_1          :: 0x674F /* Ogg Vorbis */
+WAVE_FORMAT_OGG_VORBIS_MODE_2          :: 0x6750 /* Ogg Vorbis */
+WAVE_FORMAT_OGG_VORBIS_MODE_3          :: 0x6751 /* Ogg Vorbis */
+WAVE_FORMAT_OGG_VORBIS_MODE_1_PLUS     :: 0x676F /* Ogg Vorbis */
+WAVE_FORMAT_OGG_VORBIS_MODE_2_PLUS     :: 0x6770 /* Ogg Vorbis */
+WAVE_FORMAT_OGG_VORBIS_MODE_3_PLUS     :: 0x6771 /* Ogg Vorbis */
+WAVE_FORMAT_3COM_NBX                   :: 0x7000 /* 3COM Corp. */
+WAVE_FORMAT_OPUS                       :: 0x704F /* Opus */
+WAVE_FORMAT_FAAD_AAC                   :: 0x706D
+WAVE_FORMAT_AMR_NB                     :: 0x7361 /* AMR Narrowband */
+WAVE_FORMAT_AMR_WB                     :: 0x7362 /* AMR Wideband */
+WAVE_FORMAT_AMR_WP                     :: 0x7363 /* AMR Wideband Plus */
+WAVE_FORMAT_GSM_AMR_CBR                :: 0x7A21 /* GSMA/3GPP */
+WAVE_FORMAT_GSM_AMR_VBR_SID            :: 0x7A22 /* GSMA/3GPP */
+WAVE_FORMAT_COMVERSE_INFOSYS_G723_1    :: 0xA100 /* Comverse Infosys */
+WAVE_FORMAT_COMVERSE_INFOSYS_AVQSBC    :: 0xA101 /* Comverse Infosys */
+WAVE_FORMAT_COMVERSE_INFOSYS_SBC       :: 0xA102 /* Comverse Infosys */
+WAVE_FORMAT_SYMBOL_G729_A              :: 0xA103 /* Symbol Technologies */
+WAVE_FORMAT_VOICEAGE_AMR_WB            :: 0xA104 /* VoiceAge Corp. */
+WAVE_FORMAT_INGENIENT_G726             :: 0xA105 /* Ingenient Technologies, Inc. */
+WAVE_FORMAT_MPEG4_AAC                  :: 0xA106 /* ISO/MPEG-4 */
+WAVE_FORMAT_ENCORE_G726                :: 0xA107 /* Encore Software */
+WAVE_FORMAT_ZOLL_ASAO                  :: 0xA108 /* ZOLL Medical Corp. */
+WAVE_FORMAT_SPEEX_VOICE                :: 0xA109 /* xiph.org */
+WAVE_FORMAT_VIANIX_MASC                :: 0xA10A /* Vianix LLC */
+WAVE_FORMAT_WM9_SPECTRUM_ANALYZER      :: 0xA10B /* Microsoft */
+WAVE_FORMAT_WMF_SPECTRUM_ANAYZER       :: 0xA10C /* Microsoft */
+WAVE_FORMAT_GSM_610                    :: 0xA10D
+WAVE_FORMAT_GSM_620                    :: 0xA10E
+WAVE_FORMAT_GSM_660                    :: 0xA10F
+WAVE_FORMAT_GSM_690                    :: 0xA110
+WAVE_FORMAT_GSM_ADAPTIVE_MULTIRATE_WB  :: 0xA111
+WAVE_FORMAT_POLYCOM_G722               :: 0xA112 /* Polycom */
+WAVE_FORMAT_POLYCOM_G728               :: 0xA113 /* Polycom */
+WAVE_FORMAT_POLYCOM_G729_A             :: 0xA114 /* Polycom */
+WAVE_FORMAT_POLYCOM_SIREN              :: 0xA115 /* Polycom */
+WAVE_FORMAT_GLOBAL_IP_ILBC             :: 0xA116 /* Global IP */
+WAVE_FORMAT_RADIOTIME_TIME_SHIFT_RADIO :: 0xA117 /* RadioTime */
+WAVE_FORMAT_NICE_ACA                   :: 0xA118 /* Nice Systems */
+WAVE_FORMAT_NICE_ADPCM                 :: 0xA119 /* Nice Systems */
+WAVE_FORMAT_VOCORD_G721                :: 0xA11A /* Vocord Telecom */
+WAVE_FORMAT_VOCORD_G726                :: 0xA11B /* Vocord Telecom */
+WAVE_FORMAT_VOCORD_G722_1              :: 0xA11C /* Vocord Telecom */
+WAVE_FORMAT_VOCORD_G728                :: 0xA11D /* Vocord Telecom */
+WAVE_FORMAT_VOCORD_G729                :: 0xA11E /* Vocord Telecom */
+WAVE_FORMAT_VOCORD_G729_A              :: 0xA11F /* Vocord Telecom */
+WAVE_FORMAT_VOCORD_G723_1              :: 0xA120 /* Vocord Telecom */
+WAVE_FORMAT_VOCORD_LBC                 :: 0xA121 /* Vocord Telecom */
+WAVE_FORMAT_NICE_G728                  :: 0xA122 /* Nice Systems */
+WAVE_FORMAT_FRACE_TELECOM_G729         :: 0xA123 /* France Telecom */
+WAVE_FORMAT_CODIAN                     :: 0xA124 /* CODIAN */
+WAVE_FORMAT_DOLBY_AC4                  :: 0xAC40 /* Dolby AC-4 */
+WAVE_FORMAT_FLAC                       :: 0xF1AC /* flac.sourceforge.net */
+WAVE_FORMAT_EXTENSIBLE                 :: 0xFFFE /* Microsoft */
+
+
 WAVEFORMATEX :: struct {
 WAVEFORMATEX :: struct {
 	wFormatTag:      WORD,
 	wFormatTag:      WORD,
 	nChannels:       WORD,
 	nChannels:       WORD,
@@ -325,6 +600,20 @@ WAVEFORMATEX :: struct {
 }
 }
 LPCWAVEFORMATEX :: ^WAVEFORMATEX
 LPCWAVEFORMATEX :: ^WAVEFORMATEX
 
 
+//  New wave format development should be based on the WAVEFORMATEXTENSIBLE structure.
+//  WAVEFORMATEXTENSIBLE allows you to avoid having to register a new format tag with Microsoft.
+//  Simply define a new GUID value for the WAVEFORMATEXTENSIBLE.SubFormat field and use WAVE_FORMAT_EXTENSIBLE in the WAVEFORMATEXTENSIBLE.Format.wFormatTag field.
+WAVEFORMATEXTENSIBLE :: struct {
+	using Format: WAVEFORMATEX,
+	Samples: struct #raw_union {
+		wValidBitsPerSample: WORD,      /* bits of precision  */
+		wSamplesPerBlock:    WORD,      /* valid if wBitsPerSample==0 */
+		wReserved:           WORD,      /* If neither applies, set to zero. */
+	},
+	dwChannelMask: SPEAKER_FLAGS,       /* which channels are present in stream  */
+	SubFormat:     GUID,
+}
+
 WAVEHDR :: struct {
 WAVEHDR :: struct {
 	lpData:          LPSTR, /* pointer to locked data buffer */
 	lpData:          LPSTR, /* pointer to locked data buffer */
 	dwBufferLength:  DWORD, /* length of data buffer */
 	dwBufferLength:  DWORD, /* length of data buffer */
@@ -360,26 +649,50 @@ WAVEOUTCAPSW :: struct {
 }
 }
 LPWAVEOUTCAPSW :: ^WAVEOUTCAPSW
 LPWAVEOUTCAPSW :: ^WAVEOUTCAPSW
 
 
+SPEAKER_FLAGS :: distinct bit_set[SPEAKER_FLAG; DWORD]
+SPEAKER_FLAG :: enum DWORD {
+	FRONT_LEFT            = 0,
+	FRONT_RIGHT           = 1,
+	FRONT_CENTER          = 2,
+	LOW_FREQUENCY         = 3,
+	BACK_LEFT             = 4,
+	BACK_RIGHT            = 5,
+	FRONT_LEFT_OF_CENTER  = 6,
+	FRONT_RIGHT_OF_CENTER = 7,
+	BACK_CENTER           = 8,
+	SIDE_LEFT             = 9,
+	SIDE_RIGHT            = 10,
+	TOP_CENTER            = 11,
+	TOP_FRONT_LEFT        = 12,
+	TOP_FRONT_CENTER      = 13,
+	TOP_FRONT_RIGHT       = 14,
+	TOP_BACK_LEFT         = 15,
+	TOP_BACK_CENTER       = 16,
+	TOP_BACK_RIGHT        = 17,
+	//RESERVED            = 0x7FFC0000, // bit mask locations reserved for future use
+	ALL                   = 31,         // used to specify that any possible permutation of speaker configurations
+}
+
 // flag values for PlaySound
 // flag values for PlaySound
-SND_SYNC		:: 0x0000  /* play synchronously (default) */
-SND_ASYNC		:: 0x0001  /* play asynchronously */
-SND_NODEFAULT	:: 0x0002  /* silence (!default) if sound not found */
-SND_MEMORY		:: 0x0004  /* pszSound points to a memory file */
-SND_LOOP		:: 0x0008  /* loop the sound until next sndPlaySound */
-SND_NOSTOP		:: 0x0010  /* don't stop any currently playing sound */
-
-SND_NOWAIT		:: 0x00002000 /* don't wait if the driver is busy */
-SND_ALIAS		:: 0x00010000 /* name is a registry alias */
-SND_ALIAS_ID	:: 0x00110000 /* alias is a predefined ID */
-SND_FILENAME	:: 0x00020000 /* name is file name */
-SND_RESOURCE	:: 0x00040004 /* name is resource name or atom */
-
-SND_PURGE		:: 0x0040  /* purge non-static events for task */
-SND_APPLICATION	:: 0x0080  /* look for application specific association */
-
-SND_SENTRY		:: 0x00080000 /* Generate a SoundSentry event with this sound */
-SND_RING		:: 0x00100000 /* Treat this as a "ring" from a communications app - don't duck me */
-SND_SYSTEM		:: 0x00200000 /* Treat this as a system sound */
+SND_SYNC        :: 0x0000  /* play synchronously (default) */
+SND_ASYNC       :: 0x0001  /* play asynchronously */
+SND_NODEFAULT   :: 0x0002  /* silence (!default) if sound not found */
+SND_MEMORY      :: 0x0004  /* pszSound points to a memory file */
+SND_LOOP        :: 0x0008  /* loop the sound until next sndPlaySound */
+SND_NOSTOP      :: 0x0010  /* don't stop any currently playing sound */
+
+SND_NOWAIT      :: 0x00002000 /* don't wait if the driver is busy */
+SND_ALIAS       :: 0x00010000 /* name is a registry alias */
+SND_ALIAS_ID    :: 0x00110000 /* alias is a predefined ID */
+SND_FILENAME    :: 0x00020000 /* name is file name */
+SND_RESOURCE    :: 0x00040004 /* name is resource name or atom */
+
+SND_PURGE       :: 0x0040  /* purge non-static events for task */
+SND_APPLICATION :: 0x0080  /* look for application specific association */
+
+SND_SENTRY      :: 0x00080000 /* Generate a SoundSentry event with this sound */
+SND_RING        :: 0x00100000 /* Treat this as a "ring" from a communications app - don't duck me */
+SND_SYSTEM      :: 0x00200000 /* Treat this as a system sound */
 
 
 
 
 CALLBACK_TYPEMASK :: 0x00070000    /* callback type mask */
 CALLBACK_TYPEMASK :: 0x00070000    /* callback type mask */