Commit d7f00c4389

@@ -818,7 +818,7 @@ typedef struct _SYMSRV_INDEX_INFOW {
   WINBOOL IMAGEAPI SymGetSearchPathW(HANDLE hProcess,PWSTR SearchPath,DWORD SearchPathLength);
   WINBOOL IMAGEAPI SymSetSearchPath(HANDLE hProcess,PCSTR SearchPath);
   WINBOOL IMAGEAPI SymSetSearchPathW(HANDLE hProcess,PCWSTR SearchPath);
-  DWORD64 IMAGEAPI SymLoadModule64(HANDLE hProcess,HANDLE hFile,PSTR ImageName,PSTR ModuleName,DWORD64 BaseOfDll,DWORD SizeOfDll);
+  DWORD64 IMAGEAPI SymLoadModule64(HANDLE hProcess,HANDLE hFile,PCSTR ImageName,PCSTR ModuleName,DWORD64 BaseOfDll,DWORD SizeOfDll);
 
 #define SLMFLAG_VIRTUAL 0x1
 

@@ -9,10 +9,4 @@
 
 #include <inaddr.h>
 
-struct ip_mreq {
-	struct in_addr	imr_multiaddr;
-	struct in_addr	imr_interface;
-};
-
 #endif	/* _MINGW_IP_MREQ1_H */
-

@@ -607,6 +607,54 @@ unsigned long _lrotr(unsigned long __X, int __C)
 #define __INTRINSIC_DEFINED__lrotr
 #endif /* __INTRINSIC_PROLOG */
 
+#if __INTRINSIC_PROLOG(_rotl8)
+unsigned char _rotl8(unsigned char __X, unsigned char __C);
+#if !__has_builtin(_rotl8)
+__INTRINSICS_USEINLINE
+unsigned char _rotl8(unsigned char __X, unsigned char __C)
+{
+  return (__X << __C) | (__X >> (8 - __C));
+}
+#endif
+#define __INTRINSIC_DEFINED__rotl8
+#endif /* __INTRINSIC_PROLOG */
+
+#if __INTRINSIC_PROLOG(_rotr8)
+unsigned char _rotr8(unsigned char __X, unsigned char __C);
+#if !__has_builtin(_rotr8)
+__INTRINSICS_USEINLINE
+unsigned char _rotr8(unsigned char __X, unsigned char __C)
+{
+  return (__X >> __C) | (__X << (8 - __C));
+}
+#endif
+#define __INTRINSIC_DEFINED__rotr8
+#endif /* __INTRINSIC_PROLOG */
+
+#if __INTRINSIC_PROLOG(_rotl16)
+unsigned short _rotl16(unsigned short __X, unsigned char __C);
+#if !__has_builtin(_rotl16)
+__INTRINSICS_USEINLINE
+unsigned short _rotl16(unsigned short __X, unsigned char __C)
+{
+  return (__X << __C) | (__X >> (16 - __C));
+}
+#endif
+#define __INTRINSIC_DEFINED__rotl16
+#endif /* __INTRINSIC_PROLOG */
+
+#if __INTRINSIC_PROLOG(_rotr16)
+unsigned short _rotr16(unsigned short __X, unsigned char __C);
+#if !__has_builtin(_rotr16)
+__INTRINSICS_USEINLINE
+unsigned short _rotr16(unsigned short __X, unsigned char __C)
+{
+  return (__X >> __C) | (__X << (16 - __C));
+}
+#endif
+#define __INTRINSIC_DEFINED__rotr16
+#endif /* __INTRINSIC_PROLOG */
+
 #if defined(__x86_64__) || defined(_AMD64_)
 
 #if __INTRINSIC_PROLOG(__faststorefence)

@@ -1,6 +1,6 @@
 #ifndef MINGW_DDK_H
 #define MINGW_DDK_H
-#if 0
+#if 1
 #define MINGW_HAS_DDK_H 1
 #endif
 #endif

@@ -864,7 +864,9 @@ extern "C" {
 #endif /* _WSTDIO_S_DEFINED */
 #endif /* _STDIO_S_DEFINED */
 
+#if __MSVCRT_VERSION__ >= 0x800
   _CRTIMP size_t __cdecl _fread_nolock_s(void *_DstBuf,size_t _DstSize,size_t _ElementSize,size_t _Count,FILE *_File);
+#endif
 
 #ifdef __cplusplus
 }

@@ -12,18 +12,28 @@
 extern "C" {
 #endif
 
+  _CRTIMP void * __cdecl bsearch_s(const void *_Key,const void *_Base,rsize_t _NumOfElements,rsize_t _SizeOfElements,int (__cdecl * _PtFuncCompare)(void *, const void *, const void *), void *_Context);
   _CRTIMP errno_t __cdecl _dupenv_s(char **_PBuffer,size_t *_PBufferSizeInBytes,const char *_VarName);
+  _CRTIMP errno_t __cdecl getenv_s(size_t *_ReturnSize,char *_DstBuf,rsize_t _DstSize,const char *_VarName);
+  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, getenv_s, size_t *, _ReturnSize, char, _Dest, const char *, _VarName)
   _CRTIMP errno_t __cdecl _itoa_s(int _Value,char *_DstBuf,size_t _Size,int _Radix);
   __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _itoa_s, int, _Value, char, _Dest, int, _Radix)
   _CRTIMP errno_t __cdecl _i64toa_s(__int64 _Val,char *_DstBuf,size_t _Size,int _Radix);
   _CRTIMP errno_t __cdecl _ui64toa_s(unsigned __int64 _Val,char *_DstBuf,size_t _Size,int _Radix);
   _CRTIMP errno_t __cdecl _ltoa_s(long _Val,char *_DstBuf,size_t _Size,int _Radix);
+  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _ltoa_s, long, _Value, char, _Dest, int, _Radix)
   _CRTIMP errno_t __cdecl mbstowcs_s(size_t *_PtNumOfCharConverted,wchar_t *_DstBuf,size_t _SizeInWords,const char *_SrcBuf,size_t _MaxCount);
+  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(errno_t, mbstowcs_s, size_t *, _PtNumOfCharConverted, wchar_t, _Dest, const char *, _Source, size_t, _MaxCount)
   _CRTIMP errno_t __cdecl _mbstowcs_s_l(size_t *_PtNumOfCharConverted,wchar_t *_DstBuf,size_t _SizeInWords,const char *_SrcBuf,size_t _MaxCount,_locale_t _Locale);
+  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(errno_t, _mbstowcs_s_l, size_t *, _PtNumOfCharConverted, wchar_t, _Dest, const char *, _Source, size_t, _MaxCount, _locale_t, _Locale)
   _CRTIMP errno_t __cdecl _ultoa_s(unsigned long _Val,char *_DstBuf,size_t _Size,int _Radix);
+  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, _ultoa_s, unsigned long, _Value, char, _Dest, int, _Radix)
+  _CRTIMP errno_t __cdecl wctomb_s(int *_SizeConverted,char *_MbCh,rsize_t _SizeInBytes,wchar_t _WCh);
   _CRTIMP errno_t __cdecl _wctomb_s_l(int *_SizeConverted,char *_MbCh,size_t _SizeInBytes,wchar_t _WCh,_locale_t _Locale);
   _CRTIMP errno_t __cdecl wcstombs_s(size_t *_PtNumOfCharConverted,char *_Dst,size_t _DstSizeInBytes,const wchar_t *_Src,size_t _MaxCountInBytes);
+  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(errno_t, wcstombs_s, size_t*, _PtNumOfCharConverted, char, _Dst, const wchar_t*, _Src, size_t, _MaxCountInBytes)
   _CRTIMP errno_t __cdecl _wcstombs_s_l(size_t *_PtNumOfCharConverted,char *_Dst,size_t _DstSizeInBytes,const wchar_t *_Src,size_t _MaxCountInBytes,_locale_t _Locale);
+  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(errno_t, _wcstombs_s_l, size_t*, _PtNumOfCharConverted, char, _Dst, const wchar_t*, _Src, size_t, _MaxCountInBytes, _locale_t, _Locale)
 
 #ifndef _POSIX_
   _CRTIMP errno_t __cdecl _ecvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDights,int *_PtDec,int *_PtSign);

@@ -43,6 +43,10 @@ extern "C" {
   _CRTIMP errno_t __cdecl strcat_s(char *_Dst, rsize_t _SizeInBytes, const char * _Src);
   __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, strcat_s, char, _Dest, const char *, _Source)
 
+  __forceinline size_t __cdecl strnlen_s(const char * _src, size_t _count) {
+    return _src ? strnlen(_src, _count) : 0;
+  }
+
   _SECIMP errno_t __cdecl memmove_s(void *_dest,size_t _numberOfElements,const void *_src,size_t _count);
 #ifndef _WSTRING_S_DEFINED
 #define _WSTRING_S_DEFINED

@@ -367,7 +367,7 @@ typedef int __int128 __attribute__ ((__mode__ (TI)));
 
 #ifndef __WIDL__
 
-#if defined (_WIN32) && !defined (_WIN64) && !defined (__MINGW_USE_VC2005_COMPAT)
+#if defined (_WIN32) && !defined (_WIN64) && !defined (__MINGW_USE_VC2005_COMPAT) && !defined (_UCRT)
 #ifndef _USE_32BIT_TIME_T
 #define _USE_32BIT_TIME_T
 #endif
@@ -378,7 +378,7 @@ typedef int __int128 __attribute__ ((__mode__ (TI)));
 #endif
 
 #ifndef UNALIGNED
-#if defined(_M_IA64) || defined(_M_AMD64)
+#if defined(__ia64__) || defined(__x86_64__)
 #define UNALIGNED __unaligned
 #else
 #define UNALIGNED
@@ -580,7 +580,15 @@ extern "C" {
 void __cdecl __debugbreak(void);
 __MINGW_INTRIN_INLINE void __cdecl __debugbreak(void)
 {
+#if defined(__i386__) || defined(__x86_64__)
   __asm__ __volatile__("int {$}3":);
+#elif defined(__arm__)
+  __asm__ __volatile__("udf #1");
+#elif defined(__aarch64__)
+  __asm__ __volatile__("brk #0xf000");
+#else
+  __asm__ __volatile__("unimplemented");
+#endif
 }
 #endif
 #endif

@@ -11,7 +11,7 @@
 #define __MINGW64_STRINGIFY(x) \
   __STRINGIFY(x)
 
-#define __MINGW64_VERSION_MAJOR 8
+#define __MINGW64_VERSION_MAJOR 9
 #define __MINGW64_VERSION_MINOR 0
 #define __MINGW64_VERSION_BUGFIX 0
 

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activation.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/activation.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activaut.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/activaut.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activdbg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/activdbg.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -9223,6 +9223,8 @@ static FORCEINLINE HRESULT IProvideExpressionContexts_EnumExpressionContexts(IPr
 
 #endif  /* __IProvideExpressionContexts_INTERFACE_DEFINED__ */
 
+#ifndef __ProcessDebugManagerLib_LIBRARY_DEFINED__
+#define __ProcessDebugManagerLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ProcessDebugManagerLib, 0x78a51821, 0x51f4, 0x11d0, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64);
 
@@ -9776,6 +9778,7 @@ __CRT_UUID_DECL(DefaultDebugSessionProvider, 0x834128a2, 0x51f4, 0x11d0, 0x8f,0x
 #endif
 #endif
 
+#endif /* __ProcessDebugManagerLib_LIBRARY_DEFINED__ */
 #endif
 #endif
 /* Begin additional prototypes for all interfaces */

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activdbg100.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/activdbg100.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activprof.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/activprof.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -105,14 +105,14 @@ DEFINE_GUID(IID_IActiveScriptProfilerHeapEnum, 0x32e4694e, 0xd37, 0x419b, 0xb9,
 DEFINE_GUID(IID_IActiveScriptProfilerControl3, 0xb403015, 0xf381, 0x4023, 0xa5, 0xd0, 0x6f, 0xed, 0x7, 0x6d, 0xe7, 0x16);
 #endif
 
-typedef enum __WIDL_activprof_generated_name_00000002 {
+typedef enum __WIDL_activprof_generated_name_0000000C {
     PROFILER_SCRIPT_TYPE_USER = 0,
     PROFILER_SCRIPT_TYPE_DYNAMIC = 1,
     PROFILER_SCRIPT_TYPE_NATIVE = 2,
     PROFILER_SCRIPT_TYPE_DOM = 3
 } PROFILER_SCRIPT_TYPE;
 
-typedef enum __WIDL_activprof_generated_name_00000003 {
+typedef enum __WIDL_activprof_generated_name_0000000D {
     PROFILER_EVENT_MASK_TRACE_SCRIPT_FUNCTION_CALL = 0x1,
     PROFILER_EVENT_MASK_TRACE_NATIVE_FUNCTION_CALL = 0x2,
     PROFILER_EVENT_MASK_TRACE_DOM_FUNCTION_CALL = 0x4,
@@ -346,7 +346,7 @@ typedef DWORD_PTR PROFILER_HEAP_OBJECT_ID;
 typedef UINT PROFILER_HEAP_OBJECT_NAME_ID;
 typedef void *PROFILER_EXTERNAL_OBJECT_ADDRESS;
 
-typedef enum __WIDL_activprof_generated_name_00000004 {
+typedef enum __WIDL_activprof_generated_name_0000000E {
     PROFILER_HEAP_OBJECT_FLAGS_NEW_OBJECT = 0x1,
     PROFILER_HEAP_OBJECT_FLAGS_IS_ROOT = 0x2,
     PROFILER_HEAP_OBJECT_FLAGS_SITE_CLOSED = 0x4,
@@ -362,7 +362,7 @@ typedef enum __WIDL_activprof_generated_name_00000004 {
     PROFILER_HEAP_OBJECT_FLAGS_WINRT_NAMESPACE = 0x1000
 } PROFILER_HEAP_OBJECT_FLAGS;
 
-typedef enum __WIDL_activprof_generated_name_00000005 {
+typedef enum __WIDL_activprof_generated_name_0000000F {
     PROFILER_HEAP_OBJECT_OPTIONAL_INFO_PROTOTYPE = 0x1,
     PROFILER_HEAP_OBJECT_OPTIONAL_INFO_FUNCTION_NAME = 0x2,
     PROFILER_HEAP_OBJECT_OPTIONAL_INFO_SCOPE_LIST = 0x3,
@@ -381,7 +381,7 @@ typedef struct _PROFILER_HEAP_OBJECT_SCOPE_LIST {
     PROFILER_HEAP_OBJECT_ID scopes[1];
 } PROFILER_HEAP_OBJECT_SCOPE_LIST;
 
-typedef enum __WIDL_activprof_generated_name_00000006 {
+typedef enum __WIDL_activprof_generated_name_00000010 {
     PROFILER_PROPERTY_TYPE_NUMBER = 0x1,
     PROFILER_PROPERTY_TYPE_STRING = 0x2,
     PROFILER_PROPERTY_TYPE_HEAP_OBJECT = 0x3,

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activscp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/activscp.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/adhoc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/adhoc.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -1438,6 +1438,8 @@ static FORCEINLINE HRESULT IDot11AdHocInterfaceNotificationSink_OnConnectionStat
 
 #endif  /* __IDot11AdHocInterfaceNotificationSink_INTERFACE_DEFINED__ */
 
+#ifndef __ADHOCLib_LIBRARY_DEFINED__
+#define __ADHOCLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ADHOCLib, 0x45357166, 0xff38, 0x4302, 0x8f,0x5c, 0xdf,0x5b,0x70,0x3a,0x6e,0x3d);
 
@@ -1454,6 +1456,7 @@ __CRT_UUID_DECL(Dot11AdHocManager, 0xdd06a84f, 0x83bd, 0x4d01, 0x8a,0xb9, 0x23,0
 #endif
 #endif
 
+#endif /* __ADHOCLib_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/alg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/alg.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -1477,6 +1477,8 @@ static FORCEINLINE HRESULT IApplicationGateway_Stop(IApplicationGateway* This) {
 
 #endif  /* __IApplicationGateway_INTERFACE_DEFINED__ */
 
+#ifndef __ALGLib_LIBRARY_DEFINED__
+#define __ALGLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ALGLib, 0xb6d1d098, 0xe235, 0x4b99, 0xba,0x98, 0x7c,0x62,0x4f,0xd8,0x75,0xdb);
 
@@ -1584,6 +1586,7 @@ __CRT_UUID_DECL(PersistentDataChannel, 0xbc9b54ab, 0x7883, 0x4c13, 0x90,0x9f, 0x
 #endif
 #endif
 
+#endif /* __ALGLib_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.16 from include/amstream.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/amstream.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -1,318 +0,0 @@
-/*
- * Copyright 2004 Christian Costa
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-import "unknwn.idl";
-import "mmstream.idl";
-import "strmif.idl";
-
-cpp_quote("#include <ddraw.h>")
-cpp_quote("#include <mmsystem.h>")
-cpp_quote("#include <mmstream.h>")
-cpp_quote("#include <ddstream.h>")
-cpp_quote("#include <austream.h>")
-
-cpp_quote("#if 0")
-interface IDirectDraw;
-interface IDirectDrawSurface;
-cpp_quote("#endif")
-
-interface IAMMultiMediaStream;
-interface IAMMediaStream;
-interface IMediaStreamFilter;
-interface IAMMediaTypeStream;
-interface IAMMediaTypeSample;
-
-enum {
-	AMMSF_NOGRAPHTHREAD      = 0x00000001
-};
-
-enum {
-	AMMSF_ADDDEFAULTRENDERER = 0x00000001,
-	AMMSF_CREATEPEER         = 0x00000002,
-	AMMSF_STOPIFNOSAMPLES	 = 0x00000004,
-	AMMSF_NOSTALL		 = 0x00000008
-};
-
-enum {
-	AMMSF_RENDERTYPEMASK     = 0x00000003,
-	AMMSF_RENDERTOEXISTING   = 0x00000000,
-	AMMSF_RENDERALLSTREAMS   = 0x00000001,
-	AMMSF_NORENDER           = 0x00000002,
-	AMMSF_NOCLOCK            = 0x00000004,
-	AMMSF_RUN                = 0x00000008
-};
-
-
-typedef [v1_enum] enum {
-	Disabled = 0,
-	ReadData = 1,
-	RenderData = 2
-} OUTPUT_STATE;
-
-[
-object,
-uuid(7DB01C96-C0C3-11d0-8FF1-00C04FD9189D),
-dual,
-helpstring("IDirectShowStream Interface"),
-pointer_default(unique)
-]
-interface IDirectShowStream : IDispatch
-{
-	[propget, id(1), helpstring("property FileName")] HRESULT FileName([out, retval] BSTR *pVal);
-	[propput, id(1), helpstring("property FileName")] HRESULT FileName([in] BSTR newVal);
-	[propget, id(2), helpstring("property Video")] HRESULT Video([out, retval] OUTPUT_STATE *pVal);
-	[propput, id(2), helpstring("property Video")] HRESULT Video([in] OUTPUT_STATE newVal);
-	[propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal);
-	[propput, id(3), helpstring("property Audio")] HRESULT Audio([in] OUTPUT_STATE newVal);
-}
-
-[
-object,
-uuid(BEBE595C-9A6F-11d0-8FDE-00C04FD9189D),
-pointer_default(unique)
-]
-interface IAMMultiMediaStream : IMultiMediaStream
-{
-	HRESULT Initialize(
-		[in] STREAM_TYPE StreamType,
-		[in] DWORD dwFlags,
-		[in] IGraphBuilder *pFilterGraph);
-
-	HRESULT GetFilterGraph(
-		[out] IGraphBuilder **ppGraphBuilder);
-
-	HRESULT GetFilter(
-		[out] IMediaStreamFilter **ppFilter);
-
-	HRESULT AddMediaStream(
-		[in] IUnknown *pStreamObject,
-		[in] const MSPID *PurposeId,
-		[in] DWORD dwFlags,
-		[out] IMediaStream **ppNewStream);
-
-	HRESULT OpenFile(
-		[in] LPCWSTR pszFileName,
-		[in] DWORD dwFlags);
-
-	HRESULT OpenMoniker(
-		[in] IBindCtx *pCtx,
-		[in] IMoniker *pMoniker,
-		[in] DWORD dwFlags);
-
-	HRESULT Render(
-		[in] DWORD dwFlags);
-}
-
-
-[
-object,
-uuid(BEBE595D-9A6F-11d0-8FDE-00C04FD9189D),
-pointer_default(unique)
-]
-interface IAMMediaStream : IMediaStream
-{
-	HRESULT Initialize(
-		[in] IUnknown *pSourceObject,
-		[in] DWORD dwFlags,
-		[in] REFMSPID PurposeId,
-		[in] const STREAM_TYPE StreamType);
-
-	HRESULT SetState(
-		[in] FILTER_STATE State);
-
-	HRESULT JoinAMMultiMediaStream(
-		[in] IAMMultiMediaStream *pAMMultiMediaStream);
-
-	HRESULT JoinFilter(
-		[in] IMediaStreamFilter *pMediaStreamFilter);
-
-	HRESULT JoinFilterGraph(
-		[in] IFilterGraph *pFilterGraph);
-}
-
-
-[
-object,
-local,
-uuid(BEBE595E-9A6F-11d0-8FDE-00C04FD9189D),
-pointer_default(unique)
-]
-interface IMediaStreamFilter : IBaseFilter
-{
-	HRESULT AddMediaStream(
-		[in] IAMMediaStream *pAMMediaStream);
-
-	HRESULT GetMediaStream(
-		[in] REFMSPID idPurpose,
-		[out] IMediaStream **ppMediaStream);
-
-	HRESULT EnumMediaStreams(
-		[in] long Index,
-		[out] IMediaStream **ppMediaStream);
-
-	HRESULT SupportSeeking(
-		[in] BOOL bRenderer);
-
-	HRESULT ReferenceTimeToStreamTime(
-		[in] [out] REFERENCE_TIME *pTime);
-
-	HRESULT GetCurrentStreamTime(
-		[out] REFERENCE_TIME *pCurrentStreamTime);
-
-	HRESULT WaitUntil(
-		[in]  REFERENCE_TIME WaitStreamTime);
-
-	HRESULT Flush(
-		[in] BOOL bCancelEOS);
-
-	HRESULT EndOfStream();
-}
-
-
-[
-object,
-local,
-uuid(AB6B4AFC-F6E4-11d0-900D-00C04FD9189D),
-pointer_default(unique)
-]
-interface IDirectDrawMediaSampleAllocator : IUnknown
-{
-	HRESULT GetDirectDraw(IDirectDraw **ppDirectDraw);
-}
-
-
-[
-object,
-local,
-uuid(AB6B4AFE-F6E4-11d0-900D-00C04FD9189D),
-pointer_default(unique)
-]
-interface IDirectDrawMediaSample : IUnknown
-{
-	HRESULT GetSurfaceAndReleaseLock(
-		[out] IDirectDrawSurface **ppDirectDrawSurface,
-		[out] RECT * pRect);
-
-	HRESULT LockMediaSamplePointer(void);
-}
-
-
-[
-object,
-local,
-uuid(AB6B4AFA-F6E4-11d0-900D-00C04FD9189D),
-pointer_default(unique)
-]
-
-interface IAMMediaTypeStream : IMediaStream
-{
-	HRESULT GetFormat(
-		[out] AM_MEDIA_TYPE * pMediaType,
-		[in] DWORD dwFlags);
-
-	HRESULT SetFormat(
-		[in] AM_MEDIA_TYPE * pMediaType,
-		[in] DWORD dwFlags);
-
-	HRESULT CreateSample(
-		[in] long lSampleSize,
-		[in] BYTE * pbBuffer,
-		[in] DWORD dwFlags,
-		[in] IUnknown *pUnkOuter,
-		[out] IAMMediaTypeSample ** ppAMMediaTypeSample);
-
-	HRESULT GetStreamAllocatorRequirements(
-		[out] ALLOCATOR_PROPERTIES *pProps);
-
-	HRESULT SetStreamAllocatorRequirements(
-		[in] ALLOCATOR_PROPERTIES *pProps);
-}
-
-
-[
-object,
-local,
-uuid(AB6B4AFB-F6E4-11d0-900D-00C04FD9189D),
-pointer_default(unique)
-]
-interface IAMMediaTypeSample : IStreamSample
-{
-	HRESULT SetPointer(
-		[in] BYTE *pBuffer,
-		[in] long lSize);
-
-	HRESULT GetPointer(
-		[out] BYTE ** ppBuffer);
-
-	long GetSize(void);
-
-	HRESULT GetTime(
-		[out] REFERENCE_TIME * pTimeStart,
-		[out] REFERENCE_TIME * pTimeEnd);
-
-	HRESULT SetTime(
-		[in] REFERENCE_TIME * pTimeStart,
-		[in] REFERENCE_TIME * pTimeEnd);
-
-	HRESULT IsSyncPoint(void);
-
-	HRESULT SetSyncPoint(
-		BOOL bIsSyncPoint);
-
-	HRESULT IsPreroll(void);
-
-	HRESULT SetPreroll(
-		BOOL bIsPreroll);
-
-	long GetActualDataLength(void);
-
-	HRESULT SetActualDataLength(long Len);
-
-	HRESULT GetMediaType(
-		AM_MEDIA_TYPE **ppMediaType);
-
-	HRESULT SetMediaType(
-		AM_MEDIA_TYPE *pMediaType);
-
-	HRESULT IsDiscontinuity(void);
-
-	HRESULT SetDiscontinuity(
-		BOOL bDiscontinuity);
-
-	HRESULT GetMediaTime(
-		[out] LONGLONG * pTimeStart,
-		[out] LONGLONG * pTimeEnd);
-
-	HRESULT SetMediaTime(
-		[in] LONGLONG * pTimeStart,
-		[in] LONGLONG * pTimeEnd);
-}
-
-[
-    uuid(49C47CE5-9BA4-11d0-8212-00C04FC32C45)
-]
-coclass AMMultiMediaStream
-{
-    [default] dispinterface IDirectShowStream;
-}
-
-cpp_quote("DEFINE_GUID(CLSID_AMDirectDrawStream,  0x49c47ce4, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);")
-cpp_quote("DEFINE_GUID(CLSID_AMAudioStream,       0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);")
-cpp_quote("DEFINE_GUID(CLSID_AMAudioData,         0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);")
-cpp_quote("DEFINE_GUID(CLSID_AMMediaTypeStream,   0xcf0f2f7c, 0xf7bf, 0x11d0, 0x90, 0x0d, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);")
-cpp_quote("DEFINE_GUID(CLSID_MediaStreamFilter,   0x49c47ce0, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);")

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.16 from include/amvideo.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/amvideo.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -1,241 +0,0 @@
-/*
- * Copyright (C) 2003 Robert Shearman
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-import "objidl.idl";
-
-/* trick widl into thinking that it knows the DirectDraw types 
- * as there is no IDL file for them (yet) */
-cpp_quote("#if 0")
-interface IDirectDraw;
-typedef void DDSURFACEDESC,DDCAPS;
-typedef DWORD RGBQUAD;
-typedef LONGLONG REFERENCE_TIME;
-typedef struct
-{
-    DWORD 	biSize;
-    LONG  	biWidth;
-    LONG  	biHeight;
-    WORD 	biPlanes;
-    WORD 	biBitCount;
-    DWORD 	biCompression;
-    DWORD 	biSizeImage;
-    LONG  	biXPelsPerMeter;
-    LONG  	biYPelsPerMeter;
-    DWORD 	biClrUsed;
-    DWORD 	biClrImportant;
-} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
-cpp_quote("#endif")
-
-cpp_quote("#include <ddraw.h>")
-
-cpp_quote("#define AMDDS_NONE 0x00")
-cpp_quote("#define AMDDS_DCIPS 0x01")
-cpp_quote("#define AMDDS_PS 0x02")
-cpp_quote("#define AMDDS_RGBOVR 0x04")
-cpp_quote("#define AMDDS_YUVOVR 0x08")
-cpp_quote("#define AMDDS_RGBOFF 0x10")
-cpp_quote("#define AMDDS_YUVOFF 0x20")
-cpp_quote("#define AMDDS_RGBFLP 0x40")
-cpp_quote("#define AMDDS_YUVFLP 0x80")
-cpp_quote("#define AMDDS_ALL 0xFF")
-cpp_quote("#define AMDDS_DEFAULT AMDDS_ALL")
-
-cpp_quote("#define AMDDS_YUV (AMDDS_YUVOFF | AMDDS_YUVOVR | AMDDS_YUVFLP)")
-cpp_quote("#define AMDDS_RGB (AMDDS_RGBOFF | AMDDS_RGBOVR | AMDDS_RGBFLP)")
-cpp_quote("#define AMDSS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)")
-
-[
-    object,
-    /* uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a)  conflicts with uuids.h */
-    pointer_default(unique),
-    local
-]
-interface IDirectDrawVideo : IUnknown
-{
-    HRESULT GetSwitches([out] DWORD * pSwitches);
-    HRESULT SetSwitches([in] DWORD Switches);
-    HRESULT GetCaps([out] DDCAPS * pCaps);
-    HRESULT GetEmulatedCaps([out] DDCAPS *pCaps);
-    HRESULT GetSurfaceDesc([out] DDSURFACEDESC * pSurfaceDesc);
-    HRESULT GetFourCCCodes([out] DWORD * pCount, [out] DWORD * pCodes);
-    HRESULT SetDirectDraw([in] IDirectDraw *ddraw);
-    HRESULT GetDirectDraw([out] IDirectDraw **ddraw);
-    HRESULT GetSurfaceType([out] DWORD * pSurfaceType);
-    HRESULT SetDefault();
-    HRESULT UseScanLine([in] long UseScanLine);
-    HRESULT CanUseScanLine([out] long * UseScanLine);
-    HRESULT UseOverlayStretch([in] long UseOverlayStretch);
-    HRESULT CanUseOverlayStretch([out] long * UseOverlayStretch);
-    HRESULT UseWhenFullScreen([in] long UseWhenFullScreen);
-    HRESULT WillUseFullScreen([out] long * UseWhenFullScreen);
-}
-
-[
-    object,
-    /* uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3)  conflicts with uuids.h */
-    pointer_default(unique),
-    local
-]
-interface IQualProp : IUnknown
-{
-    [propget] HRESULT FramesDroppedInRenderer([out] int * pcFrames);
-    [propget] HRESULT FramesDrawn([out] int * pcFramesDrawn);
-    [propget] HRESULT AvgFrameRate([out] int * piAvgFrameRate);
-    [propget] HRESULT Jitter([out] int * iJitter);
-    [propget] HRESULT AvgSyncOffset([out] int * piAvg);
-    [propget] HRESULT DevSyncOffset([out] int * piDev);
-}
-
-[
-    object,
-    /* uuid(dd1d7110-7836-11cf-bf47-00aa0055595a)  conflicts with uuids.h */
-    pointer_default(unique)
-]
-interface IFullScreenVideo : IUnknown
-{
-    HRESULT CountModes([out] long * pModes);
-    HRESULT GetModeInfo([in] long Mode, [out] long * pWidth, [out] long * pHeight, [out] long * pDepth);
-    HRESULT GetCurrentMode([out] long * pMode);
-    HRESULT IsModeAvailable([in] long Mode);
-    HRESULT IsModeEnabled([in] long Mode);
-    HRESULT SetEnabled([in] long Mode, [in] long bEnabled);
-    HRESULT GetClipFactor([out] long * pClipFactor);
-    HRESULT SetClipFactor([in] long ClipFactor);
-    HRESULT SetMessageDrain([in] HWND hwnd);
-    HRESULT GetMessageDrain([out] HWND * hwnd);
-    HRESULT SetMonitor([in] long Monitor);
-    HRESULT GetMonitor([out] long * Monitor);
-    HRESULT HideOnDeactivate([in] long Hide);
-    HRESULT IsHideOnDeactivate();
-    HRESULT SetCaption([in] BSTR strCaption);
-    HRESULT GetCaption([out] BSTR * pstrCaption);
-    HRESULT SetDefault();
-}
-
-[
-    object,
-    /* uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6)  conflicts with uuids.h */
-    pointer_default(unique),
-    local
-]
-interface IFullScreenVideoEx : IFullScreenVideo
-{
-    HRESULT SetAcceleratorTable([in] HWND hwnd, [in] HACCEL hAccel);
-    HRESULT GetAcceleratorTable([out] HWND * phwnd, [out] HACCEL * phAccel);
-    HRESULT KeepPixelAspectRatio([in] long KeepAspect);
-    /* FIXME: not sure is this next method is an [out] */
-    HRESULT IsKeepPixelAspectRatio([out] long * pKeepAspect);
-}
-
-[
-    object,
-    /* uuid(61ded640-e912-11ce-a099-00aa00479a58)  conflicts with uuids.h */
-    pointer_default(unique),
-    local
-]
-interface IBaseVideoMixer : IUnknown
-{
-    HRESULT SetLeadPin([in] int iPin);
-    HRESULT GetLeadPin([out] int * piPin);
-    HRESULT GetInputPinCount([out] int * piPinCount);
-    HRESULT IsUsingClock([out] int * pbValue);
-    HRESULT SetUsingClock([in] int bValue);
-    HRESULT GetClockPeriod([out] int * pbValue);
-    HRESULT SetClockPeriod([in] int bValue);
-}
-
-#define iPALETTE_COLORS 256
-#define iMASK_COLORS 3
-
-cpp_quote("#define iPALETTE_COLORS 256")
-cpp_quote("#define iEGA_COLORS 16")
-cpp_quote("#define iMASK_COLORS 3")
-cpp_quote("#define iTRUECOLOR 16")
-cpp_quote("#define iRED 0")
-cpp_quote("#define iGREEN 1")
-cpp_quote("#define iBLUE 2")
-cpp_quote("#define iPALETTE 8")
-cpp_quote("#define iMAXBITS 8")
-
-typedef struct tag_TRUECOLORINFO
-{
-    DWORD dwBitMasks[iMASK_COLORS];
-    RGBQUAD bmiColors[iPALETTE_COLORS];
-} TRUECOLORINFO;
-
-typedef struct tagVIDEOINFOHEADER
-{
-    RECT rcSource;
-    RECT rcTarget;
-    DWORD dwBitRate;
-    DWORD dwBitErrorRate;
-    REFERENCE_TIME AvgTimePerFrame;
-
-    BITMAPINFOHEADER bmiHeader;
-} VIDEOINFOHEADER;
-
-typedef struct tagVIDEOINFO
-{
-    RECT rcSource;
-    RECT rcTarget;
-    DWORD dwBitRate;
-    DWORD dwBitErrorRate;
-    REFERENCE_TIME AvgTimePerFrame;
-
-    BITMAPINFOHEADER bmiHeader;
-
-    union
-    {
-        RGBQUAD bmiColors[iPALETTE_COLORS];
-        DWORD dwBitMasks[iMASK_COLORS];
-        TRUECOLORINFO TrueColorInfo;
-    };
-} VIDEOINFO;
-
-typedef struct tagMPEG1VIDEOINFO
-{
-    VIDEOINFOHEADER hdr;
-    DWORD dwStartTimeCode;
-    DWORD cbSequenceHeader;
-    BYTE bSequenceHeader[1];
-} MPEG1VIDEOINFO;
-
-cpp_quote("#define MAX_SIZE_MPEG1_SEQUENCE_INFO 140")
-cpp_quote("#define MPEG1_SEQUENCE_INFO(pv) ((const BYTE *)(pv)->bSequenceHeader)")
-
-typedef struct tagAnalogVideoInfo
-{
-    RECT rcSource;
-    RECT rcTarget;
-    DWORD dwActiveWidth;
-    DWORD dwActiveHeight;
-    REFERENCE_TIME AvgTimePerFrame;
-} ANALOGVIDEOINFO;
-
-typedef enum
-{
-    AM_PROPERTY_FRAMESTEP_STEP = 0x01,
-    AM_PROPERTY_FRAMESTEP_CANCEL = 0x02,
-    AM_PROPERTY_FRAMESTEP_CANSTEP = 0x03,
-    AM_PROPERTY_FRAMESTEP_CANSTEPMULTIPLE = 0x04
-} AM_PROPERTY_FRAMESTEP;
-
-typedef struct _AM_FRAMESTEP_STEP
-{
-    DWORD dwFramesToStep;
-} AM_FRAMESTEP_STEP;

@@ -21,27 +21,6 @@
 extern "C" {
 #endif
 
-#ifndef _CRT_TERMINATE_DEFINED
-#define _CRT_TERMINATE_DEFINED
-  void __cdecl __MINGW_NOTHROW exit(int _Code) __MINGW_ATTRIB_NORETURN;
-  void __cdecl __MINGW_NOTHROW _exit(int _Code) __MINGW_ATTRIB_NORETURN;
-
-#if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */
-  /* C99 function name */
-  void __cdecl _Exit(int) __MINGW_ATTRIB_NORETURN;
-#ifndef __CRT__NO_INLINE
-  __CRT_INLINE __MINGW_ATTRIB_NORETURN void  __cdecl _Exit(int status)
-  {  _exit(status); }
-#endif /* !__CRT__NO_INLINE */
-#endif /* Not  __NO_ISOCEXT */
-
-#pragma push_macro("abort")
-#undef abort
-  void __cdecl __MINGW_ATTRIB_NORETURN abort(void);
-#pragma pop_macro("abort")
-
-#endif /* _CRT_TERMINATE_DEFINED */
-
 _CRTIMP void __cdecl _wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line);
 _CRTIMP void __cdecl _assert (const char *_Message, const char *_File, unsigned _Line);
 

@@ -0,0 +1,200 @@
+/*** Autogenerated by WIDL 6.4 from include/asyncinfo.idl - Do not edit ***/
+
+#ifdef _WIN32
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif
+#include <rpc.h>
+#include <rpcndr.h>
+#endif
+
+#ifndef COM_NO_WINDOWS_H
+#include <windows.h>
+#include <ole2.h>
+#endif
+
+#ifndef __asyncinfo_h__
+#define __asyncinfo_h__
+
+/* Forward declarations */
+
+#ifndef __IAsyncInfo_FWD_DEFINED__
+#define __IAsyncInfo_FWD_DEFINED__
+typedef interface IAsyncInfo IAsyncInfo;
+#ifdef __cplusplus
+namespace ABI {
+    interface IAsyncInfo;
+}
+#endif /* __cplusplus */
+#endif
+
+/* Headers for imported files */
+
+#include <inspectable.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum AsyncStatus {
+    Started = 0,
+    Completed = 1,
+    Canceled = 2,
+    Error = 3
+} AsyncStatus;
+/*****************************************************************************
+ * IAsyncInfo interface
+ */
+#ifndef __IAsyncInfo_INTERFACE_DEFINED__
+#define __IAsyncInfo_INTERFACE_DEFINED__
+
+DEFINE_GUID(IID_IAsyncInfo, 0x00000036, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
+#if defined(__cplusplus) && !defined(CINTERFACE)
+MIDL_INTERFACE("00000036-0000-0000-c000-000000000046")
+IAsyncInfo : public IInspectable
+{
+    virtual HRESULT STDMETHODCALLTYPE get_Id(
+        UINT32 *id) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE get_Status(
+        AsyncStatus *status) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE get_ErrorCode(
+        HRESULT *error_code) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE Cancel(
+        ) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE Close(
+        ) = 0;
+
+};
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(IAsyncInfo, 0x00000036, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46)
+#endif
+#else
+typedef struct IAsyncInfoVtbl {
+    BEGIN_INTERFACE
+
+    /*** IUnknown methods ***/
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
+        IAsyncInfo *This,
+        REFIID riid,
+        void **ppvObject);
+
+    ULONG (STDMETHODCALLTYPE *AddRef)(
+        IAsyncInfo *This);
+
+    ULONG (STDMETHODCALLTYPE *Release)(
+        IAsyncInfo *This);
+
+    /*** IInspectable methods ***/
+    HRESULT (STDMETHODCALLTYPE *GetIids)(
+        IAsyncInfo *This,
+        ULONG *iidCount,
+        IID **iids);
+
+    HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)(
+        IAsyncInfo *This,
+        HSTRING *className);
+
+    HRESULT (STDMETHODCALLTYPE *GetTrustLevel)(
+        IAsyncInfo *This,
+        TrustLevel *trustLevel);
+
+    /*** IAsyncInfo methods ***/
+    HRESULT (STDMETHODCALLTYPE *get_Id)(
+        IAsyncInfo *This,
+        UINT32 *id);
+
+    HRESULT (STDMETHODCALLTYPE *get_Status)(
+        IAsyncInfo *This,
+        AsyncStatus *status);
+
+    HRESULT (STDMETHODCALLTYPE *get_ErrorCode)(
+        IAsyncInfo *This,
+        HRESULT *error_code);
+
+    HRESULT (STDMETHODCALLTYPE *Cancel)(
+        IAsyncInfo *This);
+
+    HRESULT (STDMETHODCALLTYPE *Close)(
+        IAsyncInfo *This);
+
+    END_INTERFACE
+} IAsyncInfoVtbl;
+
+interface IAsyncInfo {
+    CONST_VTBL IAsyncInfoVtbl* lpVtbl;
+};
+
+#ifdef COBJMACROS
+#ifndef WIDL_C_INLINE_WRAPPERS
+/*** IUnknown methods ***/
+#define IAsyncInfo_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define IAsyncInfo_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IAsyncInfo_Release(This) (This)->lpVtbl->Release(This)
+/*** IInspectable methods ***/
+#define IAsyncInfo_GetIids(This,iidCount,iids) (This)->lpVtbl->GetIids(This,iidCount,iids)
+#define IAsyncInfo_GetRuntimeClassName(This,className) (This)->lpVtbl->GetRuntimeClassName(This,className)
+#define IAsyncInfo_GetTrustLevel(This,trustLevel) (This)->lpVtbl->GetTrustLevel(This,trustLevel)
+/*** IAsyncInfo methods ***/
+#define IAsyncInfo_get_Id(This,id) (This)->lpVtbl->get_Id(This,id)
+#define IAsyncInfo_get_Status(This,status) (This)->lpVtbl->get_Status(This,status)
+#define IAsyncInfo_get_ErrorCode(This,error_code) (This)->lpVtbl->get_ErrorCode(This,error_code)
+#define IAsyncInfo_Cancel(This) (This)->lpVtbl->Cancel(This)
+#define IAsyncInfo_Close(This) (This)->lpVtbl->Close(This)
+#else
+/*** IUnknown methods ***/
+static FORCEINLINE HRESULT IAsyncInfo_QueryInterface(IAsyncInfo* This,REFIID riid,void **ppvObject) {
+    return This->lpVtbl->QueryInterface(This,riid,ppvObject);
+}
+static FORCEINLINE ULONG IAsyncInfo_AddRef(IAsyncInfo* This) {
+    return This->lpVtbl->AddRef(This);
+}
+static FORCEINLINE ULONG IAsyncInfo_Release(IAsyncInfo* This) {
+    return This->lpVtbl->Release(This);
+}
+/*** IInspectable methods ***/
+static FORCEINLINE HRESULT IAsyncInfo_GetIids(IAsyncInfo* This,ULONG *iidCount,IID **iids) {
+    return This->lpVtbl->GetIids(This,iidCount,iids);
+}
+static FORCEINLINE HRESULT IAsyncInfo_GetRuntimeClassName(IAsyncInfo* This,HSTRING *className) {
+    return This->lpVtbl->GetRuntimeClassName(This,className);
+}
+static FORCEINLINE HRESULT IAsyncInfo_GetTrustLevel(IAsyncInfo* This,TrustLevel *trustLevel) {
+    return This->lpVtbl->GetTrustLevel(This,trustLevel);
+}
+/*** IAsyncInfo methods ***/
+static FORCEINLINE HRESULT IAsyncInfo_get_Id(IAsyncInfo* This,UINT32 *id) {
+    return This->lpVtbl->get_Id(This,id);
+}
+static FORCEINLINE HRESULT IAsyncInfo_get_Status(IAsyncInfo* This,AsyncStatus *status) {
+    return This->lpVtbl->get_Status(This,status);
+}
+static FORCEINLINE HRESULT IAsyncInfo_get_ErrorCode(IAsyncInfo* This,HRESULT *error_code) {
+    return This->lpVtbl->get_ErrorCode(This,error_code);
+}
+static FORCEINLINE HRESULT IAsyncInfo_Cancel(IAsyncInfo* This) {
+    return This->lpVtbl->Cancel(This);
+}
+static FORCEINLINE HRESULT IAsyncInfo_Close(IAsyncInfo* This) {
+    return This->lpVtbl->Close(This);
+}
+#endif
+#endif
+
+#endif
+
+#endif  /* __IAsyncInfo_INTERFACE_DEFINED__ */
+
+/* Begin additional prototypes for all interfaces */
+
+
+/* End additional prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __asyncinfo_h__ */

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/audioclient.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/audioclient.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -34,6 +34,14 @@ interface IAudioClient2;
 #endif /* __cplusplus */
 #endif
 
+#ifndef __IAudioClient3_FWD_DEFINED__
+#define __IAudioClient3_FWD_DEFINED__
+typedef interface IAudioClient3 IAudioClient3;
+#ifdef __cplusplus
+interface IAudioClient3;
+#endif /* __cplusplus */
+#endif
+
 #ifndef __IAudioRenderClient_FWD_DEFINED__
 #define __IAudioRenderClient_FWD_DEFINED__
 typedef interface IAudioRenderClient IAudioRenderClient;
@@ -90,6 +98,14 @@ interface IAudioStreamVolume;
 #endif /* __cplusplus */
 #endif
 
+#ifndef __IAudioAmbisonicsControl_FWD_DEFINED__
+#define __IAudioAmbisonicsControl_FWD_DEFINED__
+typedef interface IAudioAmbisonicsControl IAudioAmbisonicsControl;
+#ifdef __cplusplus
+interface IAudioAmbisonicsControl;
+#endif /* __cplusplus */
+#endif
+
 #ifndef __IChannelAudioVolume_FWD_DEFINED__
 #define __IChannelAudioVolume_FWD_DEFINED__
 typedef interface IChannelAudioVolume IChannelAudioVolume;
@@ -144,6 +160,17 @@ typedef enum AUDCLNT_STREAMOPTIONS {
     AUDCLNT_STREAMOPTIONS_MATCH_FORMAT = 0x2,
     AUDCLNT_STREAMOPTIONS_AMBISONICS = 0x4
 } AUDCLNT_STREAMOPTIONS;
+DEFINE_ENUM_FLAG_OPERATORS(AUDCLNT_STREAMOPTIONS);
+typedef enum AMBISONICS_TYPE {
+    AMBISONICS_TYPE_FULL3D = 0x0
+} AMBISONICS_TYPE;
+typedef enum AMBISONICS_CHANNEL_ORDERING {
+    AMBISONICS_CHANNEL_ORDERING_ACN = 0x0
+} AMBISONICS_CHANNEL_ORDERING;
+typedef enum AMBISONICS_NORMALIZATION {
+    AMBISONICS_NORMALIZATION_SN3D = 0x0,
+    AMBISONICS_NORMALIZATION_N3D = 0x1
+} AMBISONICS_NORMALIZATION;
 
 typedef struct AudioClientProperties {
     UINT32 cbSize;
@@ -151,6 +178,19 @@ typedef struct AudioClientProperties {
     AUDIO_STREAM_CATEGORY eCategory;
     AUDCLNT_STREAMOPTIONS Options;
 } AudioClientProperties;
+typedef struct AudioClient3ActivationParams {
+    GUID tracingContextId;
+} AudioClient3ActivationParams;
+typedef struct AMBISONICS_PARAMS {
+    UINT32 u32Size;
+    UINT32 u32Version;
+    AMBISONICS_TYPE u32Type;
+    AMBISONICS_CHANNEL_ORDERING u32ChannelOrdering;
+    AMBISONICS_NORMALIZATION u32Normalization;
+    UINT32 u32Order;
+    UINT32 u32NumChannels;
+    UINT32 *pu32ChannelMap;
+} AMBISONICS_PARAMS;
 
 /*****************************************************************************
  * IAudioClient interface
@@ -578,6 +618,257 @@ static FORCEINLINE HRESULT IAudioClient2_GetBufferSizeLimits(IAudioClient2* This
 
 #endif  /* __IAudioClient2_INTERFACE_DEFINED__ */
 
+/*****************************************************************************
+ * IAudioClient3 interface
+ */
+#ifndef __IAudioClient3_INTERFACE_DEFINED__
+#define __IAudioClient3_INTERFACE_DEFINED__
+
+DEFINE_GUID(IID_IAudioClient3, 0x7ed4ee07, 0x8e67, 0x4cd4, 0x8c,0x1a, 0x2b,0x7a,0x59,0x87,0xad,0x42);
+#if defined(__cplusplus) && !defined(CINTERFACE)
+MIDL_INTERFACE("7ed4ee07-8e67-4cd4-8c1a-2b7a5987ad42")
+IAudioClient3 : public IAudioClient2
+{
+    virtual HRESULT STDMETHODCALLTYPE GetSharedModeEnginePeriod(
+        const WAVEFORMATEX *pFormat,
+        UINT32 *pDefaultPeriodInFrames,
+        UINT32 *pFundamentalPeriodInFrames,
+        UINT32 *pMinPeriodInFrames,
+        UINT32 *pMaxPeriodInFrames) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE GetCurrentSharedModeEnginePeriod(
+        WAVEFORMATEX **ppFormat,
+        UINT32 *pCurrentPeriodInFrames) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE InitializeSharedAudioStream(
+        DWORD StreamFlags,
+        UINT32 PeriodInFrames,
+        const WAVEFORMATEX *pFormat,
+        LPCGUID AudioSessionGuid) = 0;
+
+};
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(IAudioClient3, 0x7ed4ee07, 0x8e67, 0x4cd4, 0x8c,0x1a, 0x2b,0x7a,0x59,0x87,0xad,0x42)
+#endif
+#else
+typedef struct IAudioClient3Vtbl {
+    BEGIN_INTERFACE
+
+    /*** IUnknown methods ***/
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
+        IAudioClient3 *This,
+        REFIID riid,
+        void **ppvObject);
+
+    ULONG (STDMETHODCALLTYPE *AddRef)(
+        IAudioClient3 *This);
+
+    ULONG (STDMETHODCALLTYPE *Release)(
+        IAudioClient3 *This);
+
+    /*** IAudioClient methods ***/
+    HRESULT (STDMETHODCALLTYPE *Initialize)(
+        IAudioClient3 *This,
+        AUDCLNT_SHAREMODE ShareMode,
+        DWORD StreamFlags,
+        REFERENCE_TIME hnsBufferDuration,
+        REFERENCE_TIME hnsPeriodicity,
+        const WAVEFORMATEX *pFormat,
+        LPCGUID AudioSessionGuid);
+
+    HRESULT (STDMETHODCALLTYPE *GetBufferSize)(
+        IAudioClient3 *This,
+        UINT32 *pNumBufferFrames);
+
+    HRESULT (STDMETHODCALLTYPE *GetStreamLatency)(
+        IAudioClient3 *This,
+        REFERENCE_TIME *phnsLatency);
+
+    HRESULT (STDMETHODCALLTYPE *GetCurrentPadding)(
+        IAudioClient3 *This,
+        UINT32 *pNumPaddingFrames);
+
+    HRESULT (STDMETHODCALLTYPE *IsFormatSupported)(
+        IAudioClient3 *This,
+        AUDCLNT_SHAREMODE ShareMode,
+        const WAVEFORMATEX *pFormat,
+        WAVEFORMATEX **ppClosestMatch);
+
+    HRESULT (STDMETHODCALLTYPE *GetMixFormat)(
+        IAudioClient3 *This,
+        WAVEFORMATEX **ppDeviceFormat);
+
+    HRESULT (STDMETHODCALLTYPE *GetDevicePeriod)(
+        IAudioClient3 *This,
+        REFERENCE_TIME *phnsDefaultDevicePeriod,
+        REFERENCE_TIME *phnsMinimumDevicePeriod);
+
+    HRESULT (STDMETHODCALLTYPE *Start)(
+        IAudioClient3 *This);
+
+    HRESULT (STDMETHODCALLTYPE *Stop)(
+        IAudioClient3 *This);
+
+    HRESULT (STDMETHODCALLTYPE *Reset)(
+        IAudioClient3 *This);
+
+    HRESULT (STDMETHODCALLTYPE *SetEventHandle)(
+        IAudioClient3 *This,
+        HANDLE eventHandle);
+
+    HRESULT (STDMETHODCALLTYPE *GetService)(
+        IAudioClient3 *This,
+        REFIID riid,
+        void **ppv);
+
+    /*** IAudioClient2 methods ***/
+    HRESULT (STDMETHODCALLTYPE *IsOffloadCapable)(
+        IAudioClient3 *This,
+        AUDIO_STREAM_CATEGORY Category,
+        WINBOOL *pbOffloadCapable);
+
+    HRESULT (STDMETHODCALLTYPE *SetClientProperties)(
+        IAudioClient3 *This,
+        const AudioClientProperties *pProperties);
+
+    HRESULT (STDMETHODCALLTYPE *GetBufferSizeLimits)(
+        IAudioClient3 *This,
+        const WAVEFORMATEX *pFormat,
+        WINBOOL bEventDriven,
+        REFERENCE_TIME *phnsMinBufferDuration,
+        REFERENCE_TIME *phnsMaxBufferDuration);
+
+    /*** IAudioClient3 methods ***/
+    HRESULT (STDMETHODCALLTYPE *GetSharedModeEnginePeriod)(
+        IAudioClient3 *This,
+        const WAVEFORMATEX *pFormat,
+        UINT32 *pDefaultPeriodInFrames,
+        UINT32 *pFundamentalPeriodInFrames,
+        UINT32 *pMinPeriodInFrames,
+        UINT32 *pMaxPeriodInFrames);
+
+    HRESULT (STDMETHODCALLTYPE *GetCurrentSharedModeEnginePeriod)(
+        IAudioClient3 *This,
+        WAVEFORMATEX **ppFormat,
+        UINT32 *pCurrentPeriodInFrames);
+
+    HRESULT (STDMETHODCALLTYPE *InitializeSharedAudioStream)(
+        IAudioClient3 *This,
+        DWORD StreamFlags,
+        UINT32 PeriodInFrames,
+        const WAVEFORMATEX *pFormat,
+        LPCGUID AudioSessionGuid);
+
+    END_INTERFACE
+} IAudioClient3Vtbl;
+
+interface IAudioClient3 {
+    CONST_VTBL IAudioClient3Vtbl* lpVtbl;
+};
+
+#ifdef COBJMACROS
+#ifndef WIDL_C_INLINE_WRAPPERS
+/*** IUnknown methods ***/
+#define IAudioClient3_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define IAudioClient3_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IAudioClient3_Release(This) (This)->lpVtbl->Release(This)
+/*** IAudioClient methods ***/
+#define IAudioClient3_Initialize(This,ShareMode,StreamFlags,hnsBufferDuration,hnsPeriodicity,pFormat,AudioSessionGuid) (This)->lpVtbl->Initialize(This,ShareMode,StreamFlags,hnsBufferDuration,hnsPeriodicity,pFormat,AudioSessionGuid)
+#define IAudioClient3_GetBufferSize(This,pNumBufferFrames) (This)->lpVtbl->GetBufferSize(This,pNumBufferFrames)
+#define IAudioClient3_GetStreamLatency(This,phnsLatency) (This)->lpVtbl->GetStreamLatency(This,phnsLatency)
+#define IAudioClient3_GetCurrentPadding(This,pNumPaddingFrames) (This)->lpVtbl->GetCurrentPadding(This,pNumPaddingFrames)
+#define IAudioClient3_IsFormatSupported(This,ShareMode,pFormat,ppClosestMatch) (This)->lpVtbl->IsFormatSupported(This,ShareMode,pFormat,ppClosestMatch)
+#define IAudioClient3_GetMixFormat(This,ppDeviceFormat) (This)->lpVtbl->GetMixFormat(This,ppDeviceFormat)
+#define IAudioClient3_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) (This)->lpVtbl->GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)
+#define IAudioClient3_Start(This) (This)->lpVtbl->Start(This)
+#define IAudioClient3_Stop(This) (This)->lpVtbl->Stop(This)
+#define IAudioClient3_Reset(This) (This)->lpVtbl->Reset(This)
+#define IAudioClient3_SetEventHandle(This,eventHandle) (This)->lpVtbl->SetEventHandle(This,eventHandle)
+#define IAudioClient3_GetService(This,riid,ppv) (This)->lpVtbl->GetService(This,riid,ppv)
+/*** IAudioClient2 methods ***/
+#define IAudioClient3_IsOffloadCapable(This,Category,pbOffloadCapable) (This)->lpVtbl->IsOffloadCapable(This,Category,pbOffloadCapable)
+#define IAudioClient3_SetClientProperties(This,pProperties) (This)->lpVtbl->SetClientProperties(This,pProperties)
+#define IAudioClient3_GetBufferSizeLimits(This,pFormat,bEventDriven,phnsMinBufferDuration,phnsMaxBufferDuration) (This)->lpVtbl->GetBufferSizeLimits(This,pFormat,bEventDriven,phnsMinBufferDuration,phnsMaxBufferDuration)
+/*** IAudioClient3 methods ***/
+#define IAudioClient3_GetSharedModeEnginePeriod(This,pFormat,pDefaultPeriodInFrames,pFundamentalPeriodInFrames,pMinPeriodInFrames,pMaxPeriodInFrames) (This)->lpVtbl->GetSharedModeEnginePeriod(This,pFormat,pDefaultPeriodInFrames,pFundamentalPeriodInFrames,pMinPeriodInFrames,pMaxPeriodInFrames)
+#define IAudioClient3_GetCurrentSharedModeEnginePeriod(This,ppFormat,pCurrentPeriodInFrames) (This)->lpVtbl->GetCurrentSharedModeEnginePeriod(This,ppFormat,pCurrentPeriodInFrames)
+#define IAudioClient3_InitializeSharedAudioStream(This,StreamFlags,PeriodInFrames,pFormat,AudioSessionGuid) (This)->lpVtbl->InitializeSharedAudioStream(This,StreamFlags,PeriodInFrames,pFormat,AudioSessionGuid)
+#else
+/*** IUnknown methods ***/
+static FORCEINLINE HRESULT IAudioClient3_QueryInterface(IAudioClient3* This,REFIID riid,void **ppvObject) {
+    return This->lpVtbl->QueryInterface(This,riid,ppvObject);
+}
+static FORCEINLINE ULONG IAudioClient3_AddRef(IAudioClient3* This) {
+    return This->lpVtbl->AddRef(This);
+}
+static FORCEINLINE ULONG IAudioClient3_Release(IAudioClient3* This) {
+    return This->lpVtbl->Release(This);
+}
+/*** IAudioClient methods ***/
+static FORCEINLINE HRESULT IAudioClient3_Initialize(IAudioClient3* This,AUDCLNT_SHAREMODE ShareMode,DWORD StreamFlags,REFERENCE_TIME hnsBufferDuration,REFERENCE_TIME hnsPeriodicity,const WAVEFORMATEX *pFormat,LPCGUID AudioSessionGuid) {
+    return This->lpVtbl->Initialize(This,ShareMode,StreamFlags,hnsBufferDuration,hnsPeriodicity,pFormat,AudioSessionGuid);
+}
+static FORCEINLINE HRESULT IAudioClient3_GetBufferSize(IAudioClient3* This,UINT32 *pNumBufferFrames) {
+    return This->lpVtbl->GetBufferSize(This,pNumBufferFrames);
+}
+static FORCEINLINE HRESULT IAudioClient3_GetStreamLatency(IAudioClient3* This,REFERENCE_TIME *phnsLatency) {
+    return This->lpVtbl->GetStreamLatency(This,phnsLatency);
+}
+static FORCEINLINE HRESULT IAudioClient3_GetCurrentPadding(IAudioClient3* This,UINT32 *pNumPaddingFrames) {
+    return This->lpVtbl->GetCurrentPadding(This,pNumPaddingFrames);
+}
+static FORCEINLINE HRESULT IAudioClient3_IsFormatSupported(IAudioClient3* This,AUDCLNT_SHAREMODE ShareMode,const WAVEFORMATEX *pFormat,WAVEFORMATEX **ppClosestMatch) {
+    return This->lpVtbl->IsFormatSupported(This,ShareMode,pFormat,ppClosestMatch);
+}
+static FORCEINLINE HRESULT IAudioClient3_GetMixFormat(IAudioClient3* This,WAVEFORMATEX **ppDeviceFormat) {
+    return This->lpVtbl->GetMixFormat(This,ppDeviceFormat);
+}
+static FORCEINLINE HRESULT IAudioClient3_GetDevicePeriod(IAudioClient3* This,REFERENCE_TIME *phnsDefaultDevicePeriod,REFERENCE_TIME *phnsMinimumDevicePeriod) {
+    return This->lpVtbl->GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod);
+}
+static FORCEINLINE HRESULT IAudioClient3_Start(IAudioClient3* This) {
+    return This->lpVtbl->Start(This);
+}
+static FORCEINLINE HRESULT IAudioClient3_Stop(IAudioClient3* This) {
+    return This->lpVtbl->Stop(This);
+}
+static FORCEINLINE HRESULT IAudioClient3_Reset(IAudioClient3* This) {
+    return This->lpVtbl->Reset(This);
+}
+static FORCEINLINE HRESULT IAudioClient3_SetEventHandle(IAudioClient3* This,HANDLE eventHandle) {
+    return This->lpVtbl->SetEventHandle(This,eventHandle);
+}
+static FORCEINLINE HRESULT IAudioClient3_GetService(IAudioClient3* This,REFIID riid,void **ppv) {
+    return This->lpVtbl->GetService(This,riid,ppv);
+}
+/*** IAudioClient2 methods ***/
+static FORCEINLINE HRESULT IAudioClient3_IsOffloadCapable(IAudioClient3* This,AUDIO_STREAM_CATEGORY Category,WINBOOL *pbOffloadCapable) {
+    return This->lpVtbl->IsOffloadCapable(This,Category,pbOffloadCapable);
+}
+static FORCEINLINE HRESULT IAudioClient3_SetClientProperties(IAudioClient3* This,const AudioClientProperties *pProperties) {
+    return This->lpVtbl->SetClientProperties(This,pProperties);
+}
+static FORCEINLINE HRESULT IAudioClient3_GetBufferSizeLimits(IAudioClient3* This,const WAVEFORMATEX *pFormat,WINBOOL bEventDriven,REFERENCE_TIME *phnsMinBufferDuration,REFERENCE_TIME *phnsMaxBufferDuration) {
+    return This->lpVtbl->GetBufferSizeLimits(This,pFormat,bEventDriven,phnsMinBufferDuration,phnsMaxBufferDuration);
+}
+/*** IAudioClient3 methods ***/
+static FORCEINLINE HRESULT IAudioClient3_GetSharedModeEnginePeriod(IAudioClient3* This,const WAVEFORMATEX *pFormat,UINT32 *pDefaultPeriodInFrames,UINT32 *pFundamentalPeriodInFrames,UINT32 *pMinPeriodInFrames,UINT32 *pMaxPeriodInFrames) {
+    return This->lpVtbl->GetSharedModeEnginePeriod(This,pFormat,pDefaultPeriodInFrames,pFundamentalPeriodInFrames,pMinPeriodInFrames,pMaxPeriodInFrames);
+}
+static FORCEINLINE HRESULT IAudioClient3_GetCurrentSharedModeEnginePeriod(IAudioClient3* This,WAVEFORMATEX **ppFormat,UINT32 *pCurrentPeriodInFrames) {
+    return This->lpVtbl->GetCurrentSharedModeEnginePeriod(This,ppFormat,pCurrentPeriodInFrames);
+}
+static FORCEINLINE HRESULT IAudioClient3_InitializeSharedAudioStream(IAudioClient3* This,DWORD StreamFlags,UINT32 PeriodInFrames,const WAVEFORMATEX *pFormat,LPCGUID AudioSessionGuid) {
+    return This->lpVtbl->InitializeSharedAudioStream(This,StreamFlags,PeriodInFrames,pFormat,AudioSessionGuid);
+}
+#endif
+#endif
+
+#endif
+
+
+#endif  /* __IAudioClient3_INTERFACE_DEFINED__ */
+
 
 /*****************************************************************************
  * IAudioRenderClient interface
@@ -1292,6 +1583,124 @@ static FORCEINLINE HRESULT IAudioStreamVolume_GetAllVolumes(IAudioStreamVolume*
 
 #endif  /* __IAudioStreamVolume_INTERFACE_DEFINED__ */
 
+/*****************************************************************************
+ * IAudioAmbisonicsControl interface
+ */
+#ifndef __IAudioAmbisonicsControl_INTERFACE_DEFINED__
+#define __IAudioAmbisonicsControl_INTERFACE_DEFINED__
+
+DEFINE_GUID(IID_IAudioAmbisonicsControl, 0x28724c91, 0xdf35, 0x4856, 0x9f,0x76, 0xd6,0xa2,0x64,0x13,0xf3,0xdf);
+#if defined(__cplusplus) && !defined(CINTERFACE)
+MIDL_INTERFACE("28724c91-df35-4856-9f76-d6a26413f3df")
+IAudioAmbisonicsControl : public IUnknown
+{
+    virtual HRESULT STDMETHODCALLTYPE SetData(
+        const AMBISONICS_PARAMS *pAmbisonicsParams,
+        UINT32 cbAmbisonicsParams) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE SetHeadTracking(
+        WINBOOL bEnableHeadTracking) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE GetHeadTracking(
+        WINBOOL *pbEnableHeadTracking) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE SetRotation(
+        float X,
+        float Y,
+        float Z,
+        float W) = 0;
+
+};
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(IAudioAmbisonicsControl, 0x28724c91, 0xdf35, 0x4856, 0x9f,0x76, 0xd6,0xa2,0x64,0x13,0xf3,0xdf)
+#endif
+#else
+typedef struct IAudioAmbisonicsControlVtbl {
+    BEGIN_INTERFACE
+
+    /*** IUnknown methods ***/
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
+        IAudioAmbisonicsControl *This,
+        REFIID riid,
+        void **ppvObject);
+
+    ULONG (STDMETHODCALLTYPE *AddRef)(
+        IAudioAmbisonicsControl *This);
+
+    ULONG (STDMETHODCALLTYPE *Release)(
+        IAudioAmbisonicsControl *This);
+
+    /*** IAudioAmbisonicsControl methods ***/
+    HRESULT (STDMETHODCALLTYPE *SetData)(
+        IAudioAmbisonicsControl *This,
+        const AMBISONICS_PARAMS *pAmbisonicsParams,
+        UINT32 cbAmbisonicsParams);
+
+    HRESULT (STDMETHODCALLTYPE *SetHeadTracking)(
+        IAudioAmbisonicsControl *This,
+        WINBOOL bEnableHeadTracking);
+
+    HRESULT (STDMETHODCALLTYPE *GetHeadTracking)(
+        IAudioAmbisonicsControl *This,
+        WINBOOL *pbEnableHeadTracking);
+
+    HRESULT (STDMETHODCALLTYPE *SetRotation)(
+        IAudioAmbisonicsControl *This,
+        float X,
+        float Y,
+        float Z,
+        float W);
+
+    END_INTERFACE
+} IAudioAmbisonicsControlVtbl;
+
+interface IAudioAmbisonicsControl {
+    CONST_VTBL IAudioAmbisonicsControlVtbl* lpVtbl;
+};
+
+#ifdef COBJMACROS
+#ifndef WIDL_C_INLINE_WRAPPERS
+/*** IUnknown methods ***/
+#define IAudioAmbisonicsControl_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define IAudioAmbisonicsControl_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IAudioAmbisonicsControl_Release(This) (This)->lpVtbl->Release(This)
+/*** IAudioAmbisonicsControl methods ***/
+#define IAudioAmbisonicsControl_SetData(This,pAmbisonicsParams,cbAmbisonicsParams) (This)->lpVtbl->SetData(This,pAmbisonicsParams,cbAmbisonicsParams)
+#define IAudioAmbisonicsControl_SetHeadTracking(This,bEnableHeadTracking) (This)->lpVtbl->SetHeadTracking(This,bEnableHeadTracking)
+#define IAudioAmbisonicsControl_GetHeadTracking(This,pbEnableHeadTracking) (This)->lpVtbl->GetHeadTracking(This,pbEnableHeadTracking)
+#define IAudioAmbisonicsControl_SetRotation(This,X,Y,Z,W) (This)->lpVtbl->SetRotation(This,X,Y,Z,W)
+#else
+/*** IUnknown methods ***/
+static FORCEINLINE HRESULT IAudioAmbisonicsControl_QueryInterface(IAudioAmbisonicsControl* This,REFIID riid,void **ppvObject) {
+    return This->lpVtbl->QueryInterface(This,riid,ppvObject);
+}
+static FORCEINLINE ULONG IAudioAmbisonicsControl_AddRef(IAudioAmbisonicsControl* This) {
+    return This->lpVtbl->AddRef(This);
+}
+static FORCEINLINE ULONG IAudioAmbisonicsControl_Release(IAudioAmbisonicsControl* This) {
+    return This->lpVtbl->Release(This);
+}
+/*** IAudioAmbisonicsControl methods ***/
+static FORCEINLINE HRESULT IAudioAmbisonicsControl_SetData(IAudioAmbisonicsControl* This,const AMBISONICS_PARAMS *pAmbisonicsParams,UINT32 cbAmbisonicsParams) {
+    return This->lpVtbl->SetData(This,pAmbisonicsParams,cbAmbisonicsParams);
+}
+static FORCEINLINE HRESULT IAudioAmbisonicsControl_SetHeadTracking(IAudioAmbisonicsControl* This,WINBOOL bEnableHeadTracking) {
+    return This->lpVtbl->SetHeadTracking(This,bEnableHeadTracking);
+}
+static FORCEINLINE HRESULT IAudioAmbisonicsControl_GetHeadTracking(IAudioAmbisonicsControl* This,WINBOOL *pbEnableHeadTracking) {
+    return This->lpVtbl->GetHeadTracking(This,pbEnableHeadTracking);
+}
+static FORCEINLINE HRESULT IAudioAmbisonicsControl_SetRotation(IAudioAmbisonicsControl* This,float X,float Y,float Z,float W) {
+    return This->lpVtbl->SetRotation(This,X,Y,Z,W);
+}
+#endif
+#endif
+
+#endif
+
+
+#endif  /* __IAudioAmbisonicsControl_INTERFACE_DEFINED__ */
+
 
 /*****************************************************************************
  * IChannelAudioVolume interface
@@ -1463,6 +1872,11 @@ static FORCEINLINE HRESULT IChannelAudioVolume_GetAllVolumes(IChannelAudioVolume
 #define AUDCLNT_E_OFFLOAD_MODE_ONLY AUDCLNT_ERR(0x24)
 #define AUDCLNT_E_NONOFFLOAD_MODE_ONLY AUDCLNT_ERR(0x25)
 #define AUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x26)
+#define AUDCLNT_E_RAW_MODE_UNSUPPORTED AUDCLNT_ERR(0x027)
+#define AUDCLNT_E_ENGINE_PERIODICITY_LOCKED AUDCLNT_ERR(0x028)
+#define AUDCLNT_E_ENGINE_FORMAT_LOCKED AUDCLNT_ERR(0x029)
+#define AUDCLNT_E_HEADTRACKING_ENABLED AUDCLNT_ERR(0x030)
+#define AUDCLNT_E_HEADTRACKING_UNSUPPORTED AUDCLNT_ERR(0x040)
 #define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)
 #define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)
 #define AUDCLNT_S_POSITION_STALLED AUDCLNT_SUCCESS(0x3)

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/audioendpoints.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/audioendpoints.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/audiopolicy.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/audiopolicy.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -50,6 +50,8 @@ typedef enum _AUDIO_STREAM_CATEGORY {
 #define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000
 #define AUDCLNT_STREAMFLAGS_NOPERSIST 0x00080000
 #define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000
+#define AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY 0x08000000
+#define AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM 0x80000000
 #define AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED 0x10000000
 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE 0x20000000
 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED 0x40000000

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 5.16 from include/austream.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.4 from include/austream.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__

@@ -1,108 +0,0 @@
-/*
- * Copyright 2004 Christian Costa
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-import "unknwn.idl";
-import "mmstream.idl";
-
-cpp_quote("#if 0")
-typedef struct tWAVEFORMATEX WAVEFORMATEX;
-cpp_quote ("#endif")
-
-interface IAudioMediaStream;
-interface IAudioStreamSample;
-interface IMemoryData;
-interface IAudioData;
-
-[
-object,
-local,
-uuid(f7537560-a3be-11d0-8212-00c04fc32c45),
-pointer_default(unique)
-]
-interface IAudioMediaStream : IMediaStream
-{
-	HRESULT GetFormat(
-		[out] /*[optional]*/ WAVEFORMATEX *pWaveFormatCurrent
-	);
-
-	HRESULT SetFormat(
-		[in] const WAVEFORMATEX *lpWaveFormat);
-
-	HRESULT CreateSample(
-		[in] IAudioData *pAudioData,
-		[in] DWORD dwFlags,
-		[out] IAudioStreamSample **ppSample
-	);
-}
-
-
-[
-object,
-local,
-uuid(345fee00-aba5-11d0-8212-00c04fc32c45),
-pointer_default(unique)
-]
-interface IAudioStreamSample : IStreamSample
-{
-	HRESULT GetAudioData(
-		[out] IAudioData **ppAudio
-	);
-}
-
-
-[
-object,
-local,
-uuid(327fc560-af60-11d0-8212-00c04fc32c45),
-pointer_default(unique)
-]
-interface IMemoryData : IUnknown
-{
-	HRESULT SetBuffer(
-		[in] DWORD cbSize,
-		[in] BYTE *pbData,
-		[in] DWORD dwFlags
-	);
-
-	HRESULT GetInfo(
-		[out] DWORD *pdwLength,
-		[out] BYTE **ppbData,
-		[out] DWORD *pcbActualData
-	);
-	HRESULT SetActual(
-		[in] DWORD cbDataValid
-	);
-}
-
-
-[
-object,
-local,
-uuid(54c719c0-af60-11d0-8212-00c04fc32c45),
-pointer_default(unique)
-]
-interface IAudioData : IMemoryData
-{
-	HRESULT GetFormat(
-		[out] /*[optional]*/ WAVEFORMATEX *pWaveFormatCurrent
-	);
-
-	HRESULT SetFormat(
-		[in] const WAVEFORMATEX *lpWaveFormat
-	);
-}