[PATCH 1/5] winegstreamer: Translate GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 dlls/winegstreamer/wg_parser.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 0c23ae6d351..c3c9051a174 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -159,7 +159,10 @@ static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position)
         SPEAKER_TOP_BACK_CENTER,
     };
 
-    if (position < ARRAY_SIZE(position_map))
+    if (position == GST_AUDIO_CHANNEL_POSITION_MONO)
+        return SPEAKER_FRONT_CENTER;
+
+    if (position >= 0 && position < ARRAY_SIZE(position_map))
         return position_map[position];
     return 0;
 }
-- 
2.33.0

[PATCH 2/5] wmvcore: Move the sync reader implementation to winegstreamer.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 dlls/winegstreamer/Makefile.in                |  4 ++-
 dlls/winegstreamer/winegstreamer.spec         |  1 +
 .../wm_syncreader.c}                          | 33 +++++++------------
 dlls/wmvcore/Makefile.in                      |  2 +-
 dlls/wmvcore/wmvcore_main.c                   | 16 +++++++++
 5 files changed, 33 insertions(+), 23 deletions(-)
 rename dlls/{wmvcore/syncreader.c => winegstreamer/wm_syncreader.c} (96%)

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index e35df3cf3f9..671e3bcb7ba 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = winegstreamer.dll
 UNIXLIB   = winegstreamer.so
+IMPORTLIB = winegstreamer
 IMPORTS   = strmbase strmiids uuid ole32 mfuuid
 DELAYIMPORTS = mfplat
 EXTRAINCL = $(GSTREAMER_CFLAGS)
@@ -11,7 +12,8 @@ C_SRCS = \
 	media_source.c \
 	mfplat.c \
 	quartz_parser.c \
-	wg_parser.c
+	wg_parser.c \
+	wm_syncreader.c
 
 IDL_SRCS = \
 	winegstreamer_classes.idl
diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec
index b16365d0c9f..bd9f53a7445 100644
--- a/dlls/winegstreamer/winegstreamer.spec
+++ b/dlls/winegstreamer/winegstreamer.spec
@@ -2,3 +2,4 @@
 @ stdcall -private DllGetClassObject(ptr ptr ptr)
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()
+@ stdcall winegstreamer_create_wm_sync_reader(ptr)
diff --git a/dlls/wmvcore/syncreader.c b/dlls/winegstreamer/wm_syncreader.c
similarity index 96%
rename from dlls/wmvcore/syncreader.c
rename to dlls/winegstreamer/wm_syncreader.c
index b245ff20d31..75b8e021148 100644
--- a/dlls/wmvcore/syncreader.c
+++ b/dlls/winegstreamer/wm_syncreader.c
@@ -16,11 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wmvcore.h"
-
+#include "gst_private.h"
+#include "initguid.h"
 #include "wmsdk.h"
-#include "wine/debug.h"
-#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
@@ -85,7 +83,7 @@ static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface)
     TRACE("(%p) ref=%d\n", This, ref);
 
     if(!ref)
-        heap_free(This);
+        free(This);
 
     return ref;
 }
@@ -605,27 +603,20 @@ static const IWMProfile3Vtbl WMProfile3Vtbl =
     WMProfile3_GetExpectedPacketCount
 };
 
-HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader)
+HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader)
 {
-    WMSyncReader *sync;
+    WMSyncReader *object;
 
-    TRACE("(%p, %x, %p)\n", pcert, rights, syncreader);
+    TRACE("reader %p.\n", reader);
 
-    sync = heap_alloc(sizeof(*sync));
-
-    if (!sync)
+    if (!(object = calloc(1, sizeof(*object))))
         return E_OUTOFMEMORY;
 
-    sync->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
-    sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl;
-    sync->ref = 1;
-
-    *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface;
+    object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
+    object->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl;
+    object->ref = 1;
 
+    TRACE("Created sync reader %p.\n", object);
+    *reader = (IWMSyncReader *)&object->IWMSyncReader2_iface;
     return S_OK;
 }
-
-HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader)
-{
-    return WMCreateSyncReader(NULL, 0, syncreader);
-}
diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in
index 15c017f86d9..d0b230dd7c0 100644
--- a/dlls/wmvcore/Makefile.in
+++ b/dlls/wmvcore/Makefile.in
@@ -1,12 +1,12 @@
 MODULE    = wmvcore.dll
 IMPORTLIB = wmvcore
 IMPORTS   = kernel32
+DELAYIMPORTS = winegstreamer
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
 C_SRCS = \
 	reader.c \
-	syncreader.c \
 	wmvcore_main.c \
 	writer.c
 
diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c
index 5f93fc68e3b..8d4d4251369 100644
--- a/dlls/wmvcore/wmvcore_main.c
+++ b/dlls/wmvcore/wmvcore_main.c
@@ -25,6 +25,22 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
+HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader);
+
+HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader)
+{
+    TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);
+
+    return winegstreamer_create_wm_sync_reader(reader);
+}
+
+HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **reader)
+{
+    TRACE("reader %p.\n", reader);
+
+    return winegstreamer_create_wm_sync_reader(reader);
+}
+
 HRESULT WINAPI WMCheckURLExtension(const WCHAR *url)
 {
     FIXME("(%s): stub\n", wine_dbgstr_w(url));
-- 
2.33.0

[PATCH 3/5] winegstreamer: Get rid of the WMSyncReader typedef.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 dlls/winegstreamer/wm_syncreader.c | 143 +++++++++++++++--------------
 1 file changed, 72 insertions(+), 71 deletions(-)

diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c
index 75b8e021148..1d65820aa02 100644
--- a/dlls/winegstreamer/wm_syncreader.c
+++ b/dlls/winegstreamer/wm_syncreader.c
@@ -22,20 +22,21 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
-typedef struct {
+struct sync_reader
+{
     IWMProfile3 IWMProfile3_iface;
     IWMSyncReader2 IWMSyncReader2_iface;
     LONG ref;
-} WMSyncReader;
+};
 
-static inline WMSyncReader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface)
+static struct sync_reader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface)
 {
-    return CONTAINING_RECORD(iface, WMSyncReader, IWMSyncReader2_iface);
+    return CONTAINING_RECORD(iface, struct sync_reader, IWMSyncReader2_iface);
 }
 
 static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader2 *iface, REFIID riid, void **ppv)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
 
     if(IsEqualGUID(riid, &IID_IUnknown)) {
         TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
@@ -67,7 +68,7 @@ static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader2 *iface, REFIID
 
 static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader2 *iface)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
     TRACE("(%p) ref=%d\n", This, ref);
@@ -77,7 +78,7 @@ static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader2 *iface)
 
 static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
     TRACE("(%p) ref=%d\n", This, ref);
@@ -90,21 +91,21 @@ static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface)
 
 static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p): stub!\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD output, DWORD *max)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p): stub!\n", This, output, max);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_GetMaxStreamSampleSize(IWMSyncReader2 *iface, WORD stream, DWORD *max)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p): stub!\n", This, stream, max);
     return E_NOTIMPL;
 }
@@ -112,7 +113,7 @@ static HRESULT WINAPI WMSyncReader_GetMaxStreamSampleSize(IWMSyncReader2 *iface,
 static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, WORD stream, INSSBuffer **sample,
         QWORD *sample_time, QWORD *sample_duration, DWORD *flags, DWORD *output_num, WORD *stream_num)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p %p %p %p %p %p): stub!\n", This, stream, sample, sample_time,
           sample_duration, flags, output_num, stream_num);
     return E_NOTIMPL;
@@ -120,7 +121,7 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, WORD str
 
 static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *outputs)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%p): stub!\n", This, outputs);
     return E_NOTIMPL;
 }
@@ -128,28 +129,28 @@ static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *
 static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, DWORD output_num, DWORD format_num,
         IWMOutputMediaProps **props)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %u %p): stub!\n", This, output_num, format_num, props);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD output_num, DWORD *formats)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %p): stub!\n", This, output_num, formats);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader2 *iface, WORD stream_num, DWORD *output_num)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %p): stub!\n", This, stream_num, output_num);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps **output)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %p): stub!\n", This, output_num, output);
     return E_NOTIMPL;
 }
@@ -157,49 +158,49 @@ static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, DWORD o
 static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name,
         WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_GetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL *compressed)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p): stub!\n", This, stream_num, compressed);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *iface, DWORD output, WORD *stream_num)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %p): stub!\n", This, output, stream_num);
     return S_OK;
 }
 
 static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader2 *iface, WORD stream_num, WMT_STREAM_SELECTION *selection)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p): stub!\n", This, stream_num, selection);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader2 *iface, const WCHAR *filename)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%s): stub!\n", This, debugstr_w(filename));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader2 *iface, IStream *stream)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%p): stub!\n", This, stream);
     return S_OK;
 }
 
 static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps *output)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %p): stub!\n", This, output_num, output);
     return E_NOTIMPL;
 }
@@ -207,14 +208,14 @@ static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD o
 static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name,
         WMT_ATTR_DATATYPE type, const BYTE *value, WORD length)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %s %d %p %d): stub!\n", This, output_num, debugstr_w(name), type, value, length);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader2 *iface, QWORD start, LONGLONG duration)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration));
     return E_NOTIMPL;
 }
@@ -222,14 +223,14 @@ static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader2 *iface, QWORD start,
 static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num,
         LONGLONG frames)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %s %s): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num), wine_dbgstr_longlong(frames));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL compressed)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed);
     return E_NOTIMPL;
 }
@@ -237,7 +238,7 @@ static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, W
 static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WORD stream_count,
         WORD *stream_numbers, WMT_STREAM_SELECTION *selections)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections);
     return S_OK;
 }
@@ -245,7 +246,7 @@ static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WOR
 static HRESULT WINAPI WMSyncReader2_SetRangeByTimecode(IWMSyncReader2 *iface, WORD stream_num,
         WMT_TIMECODE_EXTENSION_DATA *start, WMT_TIMECODE_EXTENSION_DATA *end)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %p %p): stub!\n", This, stream_num, start, end);
     return E_NOTIMPL;
 }
@@ -253,7 +254,7 @@ static HRESULT WINAPI WMSyncReader2_SetRangeByTimecode(IWMSyncReader2 *iface, WO
 static HRESULT WINAPI WMSyncReader2_SetRangeByFrameEx(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num,
         LONGLONG frames_to_read, QWORD *starttime)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%u %s %s %p): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num),
           wine_dbgstr_longlong(frames_to_read), starttime);
     return E_NOTIMPL;
@@ -261,28 +262,28 @@ static HRESULT WINAPI WMSyncReader2_SetRangeByFrameEx(IWMSyncReader2 *iface, WOR
 
 static HRESULT WINAPI WMSyncReader2_SetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx *allocator)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader2_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx **allocator)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader2_SetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx *allocator)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMSyncReader2_GetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx **allocator)
 {
-    WMSyncReader *This = impl_from_IWMSyncReader2(iface);
+    struct sync_reader *This = impl_from_IWMSyncReader2(iface);
     FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator);
     return E_NOTIMPL;
 }
@@ -320,67 +321,67 @@ static const IWMSyncReader2Vtbl WMSyncReader2Vtbl = {
     WMSyncReader2_GetAllocateForStream
 };
 
-static inline WMSyncReader *impl_from_IWMProfile3(IWMProfile3 *iface)
+static struct sync_reader *impl_from_IWMProfile3(IWMProfile3 *iface)
 {
-    return CONTAINING_RECORD(iface, WMSyncReader, IWMProfile3_iface);
+    return CONTAINING_RECORD(iface, struct sync_reader, IWMProfile3_iface);
 }
 
 static HRESULT WINAPI WMProfile_QueryInterface(IWMProfile3 *iface, REFIID riid, void **ppv)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     return IWMSyncReader2_QueryInterface(&This->IWMSyncReader2_iface, riid, ppv);
 }
 
 static ULONG WINAPI WMProfile_AddRef(IWMProfile3 *iface)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     return IWMSyncReader2_AddRef(&This->IWMSyncReader2_iface);
 }
 
 static ULONG WINAPI WMProfile_Release(IWMProfile3 *iface)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     return IWMSyncReader2_Release(&This->IWMSyncReader2_iface);
 }
 
 static HRESULT WINAPI WMProfile_GetVersion(IWMProfile3 *iface, WMT_VERSION *version)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, version);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p, %p\n", This, name, length);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_SetName(IWMProfile3 *iface, const WCHAR *name)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %s\n", This, debugstr_w(name));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p, %p\n", This, description, length);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_SetDescription(IWMProfile3 *iface, const WCHAR *description)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %s\n", This, debugstr_w(description));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_GetStreamCount(IWMProfile3 *iface, DWORD *count)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, count);
 
     if (!count)
@@ -392,175 +393,175 @@ static HRESULT WINAPI WMProfile_GetStreamCount(IWMProfile3 *iface, DWORD *count)
 
 static HRESULT WINAPI WMProfile_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d, %p\n", This, index, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_GetStreamByNumber(IWMProfile3 *iface, WORD stream, IWMStreamConfig **config)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d, %p\n", This, stream, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d\n", This, stream);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_AddStream(IWMProfile3 *iface, IWMStreamConfig *config)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %s, %p\n", This, debugstr_guid(type), config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, count);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **mutual)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d, %p\n", This, index, mutual);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, mutual);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, mutual);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **mutual)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, mutual);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile2_GetProfileID(IWMProfile3 *iface, GUID *guid)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, guid);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *storage)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, storage);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT storage)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d\n", This, storage);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, count);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **bandwidth)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d, %p\n", This, index, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *bandwidth)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *bandwidth)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **bandwidth)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, stream);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, stream);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_RemoveStreamPrioritization(IWMProfile3 *iface)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, stream);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMProfile3_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *packets)
 {
-    WMSyncReader *This = impl_from_IWMProfile3(iface);
+    struct sync_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %s, %p\n", This, wine_dbgstr_longlong(duration), packets);
     return E_NOTIMPL;
 }
@@ -605,7 +606,7 @@ static const IWMProfile3Vtbl WMProfile3Vtbl =
 
 HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader)
 {
-    WMSyncReader *object;
+    struct sync_reader *object;
 
     TRACE("reader %p.\n", reader);
 
-- 
2.33.0

[PATCH 4/5] wmvcore: Move the async reader implementation to winegstreamer.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 dlls/winegstreamer/Makefile.in                |  1 +
 dlls/winegstreamer/winegstreamer.spec         |  1 +
 .../wm_asyncreader.c}                         | 52 ++++++++-----------
 dlls/wmvcore/Makefile.in                      |  1 -
 dlls/wmvcore/wmvcore_main.c                   | 15 ++++++
 5 files changed, 39 insertions(+), 31 deletions(-)
 rename dlls/{wmvcore/reader.c => winegstreamer/wm_asyncreader.c} (98%)

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 671e3bcb7ba..17311cd663c 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -13,6 +13,7 @@ C_SRCS = \
 	mfplat.c \
 	quartz_parser.c \
 	wg_parser.c \
+	wm_asyncreader.c \
 	wm_syncreader.c
 
 IDL_SRCS = \
diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec
index bd9f53a7445..bc6a390f8b1 100644
--- a/dlls/winegstreamer/winegstreamer.spec
+++ b/dlls/winegstreamer/winegstreamer.spec
@@ -2,4 +2,5 @@
 @ stdcall -private DllGetClassObject(ptr ptr ptr)
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()
+@ stdcall winegstreamer_create_wm_async_reader(ptr)
 @ stdcall winegstreamer_create_wm_sync_reader(ptr)
diff --git a/dlls/wmvcore/reader.c b/dlls/winegstreamer/wm_asyncreader.c
similarity index 98%
rename from dlls/wmvcore/reader.c
rename to dlls/winegstreamer/wm_asyncreader.c
index 12ba8099ab1..d3fd1624f24 100644
--- a/dlls/wmvcore/reader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -16,11 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wmvcore.h"
-
+#include "gst_private.h"
 #include "wmsdk.h"
-#include "wine/debug.h"
-#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
@@ -153,7 +150,7 @@ static ULONG WINAPI WMReader_Release(IWMReader *iface)
     TRACE("(%p) ref=%d\n", This, ref);
 
     if(!ref)
-        heap_free(This);
+        free(This);
 
     return ref;
 }
@@ -2039,36 +2036,31 @@ static const IWMPacketSize2Vtbl WMPacketSize2Vtbl =
     packetsize_SetMinPacketSize
 };
 
-HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader)
+HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader)
 {
-    WMReader *reader;
+    WMReader *object;
 
-    TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader);
+    TRACE("reader %p.\n", reader);
 
-    reader = heap_alloc(sizeof(*reader));
-    if(!reader)
+    if (!(object = calloc(1, sizeof(*object))))
         return E_OUTOFMEMORY;
 
-    reader->IWMReader_iface.lpVtbl = &WMReaderVtbl;
-    reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl;
-    reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl;
-    reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl;
-    reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl;
-    reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl;
-    reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl;
-    reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl;
-    reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl;
-    reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl;
-    reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl;
-    reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
-    reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl;
-    reader->ref = 1;
+    object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl;
+    object->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl;
+    object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl;
+    object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl;
+    object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
+    object->IWMReader_iface.lpVtbl = &WMReaderVtbl;
+    object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl;
+    object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl;
+    object->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl;
+    object->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl;
+    object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl;
+    object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl;
+    object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl;
+    object->ref = 1;
 
-    *ret_reader = &reader->IWMReader_iface;
+    TRACE("Created async reader %p.\n", object);
+    *reader = (IWMReader *)&object->IWMReader_iface;
     return S_OK;
 }
-
-HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader)
-{
-    return WMCreateReader(NULL, 0, ret_reader);
-}
diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in
index d0b230dd7c0..6aed828abae 100644
--- a/dlls/wmvcore/Makefile.in
+++ b/dlls/wmvcore/Makefile.in
@@ -6,7 +6,6 @@ DELAYIMPORTS = winegstreamer
 EXTRADLLFLAGS = -Wb,--prefer-native
 
 C_SRCS = \
-	reader.c \
 	wmvcore_main.c \
 	writer.c
 
diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c
index 8d4d4251369..ff837921286 100644
--- a/dlls/wmvcore/wmvcore_main.c
+++ b/dlls/wmvcore/wmvcore_main.c
@@ -25,8 +25,23 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
+HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader);
 HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader);
 
+HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader)
+{
+    TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);
+
+    return winegstreamer_create_wm_async_reader(reader);
+}
+
+HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader)
+{
+    TRACE("reader %p.\n", reader);
+
+    return winegstreamer_create_wm_async_reader(reader);
+}
+
 HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader)
 {
     TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);
-- 
2.33.0

[PATCH 4/5] wmvcore: Move the async reader implementation to winegstreamer.

[Jefferson Carpenter]

This appears to have caused a regression in the Rise of Legends demo.

https://bugs.winehq.org/show_bug.cgi?id=51909

I can provide more information as needed, especially after I get gdb 
working on Wine again.

On 10/7/2021 3:47 PM, Zebediah Figura wrote:
> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
> ---
>   dlls/winegstreamer/Makefile.in                |  1 +
>   dlls/winegstreamer/winegstreamer.spec         |  1 +
>   .../wm_asyncreader.c}                         | 52 ++++++++-----------
>   dlls/wmvcore/Makefile.in                      |  1 -
>   dlls/wmvcore/wmvcore_main.c                   | 15 ++++++
>   5 files changed, 39 insertions(+), 31 deletions(-)
>   rename dlls/{wmvcore/reader.c => winegstreamer/wm_asyncreader.c} (98%)
>
> diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
> index 671e3bcb7ba..17311cd663c 100644
> --- a/dlls/winegstreamer/Makefile.in
> +++ b/dlls/winegstreamer/Makefile.in
> @@ -13,6 +13,7 @@ C_SRCS = \
>   mfplat.c \
>   quartz_parser.c \
>   wg_parser.c \
> +	wm_asyncreader.c \
>   wm_syncreader.c
>
> IDL_SRCS = \
> diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec
> index bd9f53a7445..bc6a390f8b1 100644
> --- a/dlls/winegstreamer/winegstreamer.spec
> +++ b/dlls/winegstreamer/winegstreamer.spec
> @@ -2,4 +2,5 @@
>   @ stdcall -private DllGetClassObject(ptr ptr ptr)
>   @ stdcall -private DllRegisterServer()
>   @ stdcall -private DllUnregisterServer()
> +@ stdcall winegstreamer_create_wm_async_reader(ptr)
>   @ stdcall winegstreamer_create_wm_sync_reader(ptr)
> diff --git a/dlls/wmvcore/reader.c b/dlls/winegstreamer/wm_asyncreader.c
> similarity index 98%
> rename from dlls/wmvcore/reader.c
> rename to dlls/winegstreamer/wm_asyncreader.c
> index 12ba8099ab1..d3fd1624f24 100644
> --- a/dlls/wmvcore/reader.c
> +++ b/dlls/winegstreamer/wm_asyncreader.c
> @@ -16,11 +16,8 @@
>    * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
>    */
>
> -#include "wmvcore.h"
> -
> +#include "gst_private.h"
>   #include "wmsdk.h"
> -#include "wine/debug.h"
> -#include "wine/heap.h"
>
> WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
>
> @@ -153,7 +150,7 @@ static ULONG WINAPI WMReader_Release(IWMReader *iface)
>       TRACE("(%p) ref=%d\n", This, ref);
>
> if(!ref)
> -        heap_free(This);
> +        free(This);
>
> return ref;
>   }
> @@ -2039,36 +2036,31 @@ static const IWMPacketSize2Vtbl WMPacketSize2Vtbl =
>       packetsize_SetMinPacketSize
>   };
>
> -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader)
> +HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader)
>   {
> -    WMReader *reader;
> +    WMReader *object;
>
> -    TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader);
> +    TRACE("reader %p.\n", reader);
>
> -    reader = heap_alloc(sizeof(*reader));
> -    if(!reader)
> +    if (!(object = calloc(1, sizeof(*object))))
>           return E_OUTOFMEMORY;
>
> -    reader->IWMReader_iface.lpVtbl = &WMReaderVtbl;
> -    reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl;
> -    reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl;
> -    reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl;
> -    reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl;
> -    reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl;
> -    reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl;
> -    reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl;
> -    reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl;
> -    reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl;
> -    reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl;
> -    reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
> -    reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl;
> -    reader->ref = 1;
> +    object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl;
> +    object->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl;
> +    object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl;
> +    object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl;
> +    object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl;
> +    object->IWMReader_iface.lpVtbl = &WMReaderVtbl;
> +    object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl;
> +    object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl;
> +    object->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl;
> +    object->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl;
> +    object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl;
> +    object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl;
> +    object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl;
> +    object->ref = 1;
>
> -    *ret_reader = &reader->IWMReader_iface;
> +    TRACE("Created async reader %p.\n", object);
> +    *reader = (IWMReader *)&object->IWMReader_iface;
>       return S_OK;
>   }
> -
> -HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader)
> -{
> -    return WMCreateReader(NULL, 0, ret_reader);
> -}
> diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in
> index d0b230dd7c0..6aed828abae 100644
> --- a/dlls/wmvcore/Makefile.in
> +++ b/dlls/wmvcore/Makefile.in
> @@ -6,7 +6,6 @@ DELAYIMPORTS = winegstreamer
>   EXTRADLLFLAGS = -Wb,--prefer-native
>
> C_SRCS = \
> -	reader.c \
>   wmvcore_main.c \
>   writer.c
>
> diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c
> index 8d4d4251369..ff837921286 100644
> --- a/dlls/wmvcore/wmvcore_main.c
> +++ b/dlls/wmvcore/wmvcore_main.c
> @@ -25,8 +25,23 @@
>
> WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
>
> +HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader);
>   HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader);
>
> +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader)
> +{
> +    TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);
> +
> +    return winegstreamer_create_wm_async_reader(reader);
> +}
> +
> +HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader)
> +{
> +    TRACE("reader %p.\n", reader);
> +
> +    return winegstreamer_create_wm_async_reader(reader);
> +}
> +
>   HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader)
>   {
>       TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);

[PATCH 5/5] winegstreamer: Get rid of the WMReader typedef.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 dlls/winegstreamer/wm_asyncreader.c | 497 ++++++++++++++--------------
 1 file changed, 249 insertions(+), 248 deletions(-)

diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index d3fd1624f24..b4ef4851c33 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -21,7 +21,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
-typedef struct {
+struct async_reader
+{
     IWMReader IWMReader_iface;
     IWMReaderAdvanced6 IWMReaderAdvanced6_iface;
     IWMReaderAccelerator IWMReaderAccelerator_iface;
@@ -36,16 +37,16 @@ typedef struct {
     IWMProfile3 IWMProfile3_iface;
     IWMPacketSize2 IWMPacketSize2_iface;
     LONG ref;
-} WMReader;
+};
 
-static inline WMReader *impl_from_IWMReader(IWMReader *iface)
+static struct async_reader *impl_from_IWMReader(IWMReader *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMReader_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMReader_iface);
 }
 
 static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
 
     if(IsEqualGUID(riid, &IID_IUnknown)) {
         TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
@@ -134,7 +135,7 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi
 
 static ULONG WINAPI WMReader_AddRef(IWMReader *iface)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     LONG ref = InterlockedIncrement(&This->ref);
 
     TRACE("(%p) ref=%d\n", This, ref);
@@ -144,7 +145,7 @@ static ULONG WINAPI WMReader_AddRef(IWMReader *iface)
 
 static ULONG WINAPI WMReader_Release(IWMReader *iface)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     LONG ref = InterlockedDecrement(&This->ref);
 
     TRACE("(%p) ref=%d\n", This, ref);
@@ -157,21 +158,21 @@ static ULONG WINAPI WMReader_Release(IWMReader *iface)
 
 static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_Close(IWMReader *iface)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)->(%p)\n", This, outputs);
 
     if(!outputs)
@@ -183,56 +184,56 @@ static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs)
 
 static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)->(%u %p)\n", This, output_num, output);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)->(%u %p)\n", This, output_num, output);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)->(%u %p)\n", This, output_num, formats);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_Stop(IWMReader *iface)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_Pause(IWMReader *iface)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReader_Resume(IWMReader *iface)
 {
-    WMReader *This = impl_from_IWMReader(iface);
+    struct async_reader *This = impl_from_IWMReader(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
@@ -254,60 +255,60 @@ static const IWMReaderVtbl WMReaderVtbl = {
     WMReader_Resume
 };
 
-static inline WMReader *impl_from_IWMReaderAdvanced6(IWMReaderAdvanced6 *iface)
+static struct async_reader *impl_from_IWMReaderAdvanced6(IWMReaderAdvanced6 *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMReaderAdvanced6_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMReaderAdvanced6_iface);
 }
 
 static HRESULT WINAPI WMReaderAdvanced_QueryInterface(IWMReaderAdvanced6 *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI WMReaderAdvanced_AddRef(IWMReaderAdvanced6 *iface)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI WMReaderAdvanced_Release(IWMReaderAdvanced6 *iface)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI WMReaderAdvanced_SetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL user_clock)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%x)\n", This, user_clock);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL *user_clock)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, user_clock);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QWORD time)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(time));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_SetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL selection)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%x)\n", This, selection);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL *selection)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, selection);
     return E_NOTIMPL;
 }
@@ -315,7 +316,7 @@ static HRESULT WINAPI WMReaderAdvanced_GetManualStreamSelection(IWMReaderAdvance
 static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *iface, WORD stream_count,
         WORD *stream_numbers, WMT_STREAM_SELECTION *selections)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p %p)\n", This, stream_count, stream_numbers, selections);
     return E_NOTIMPL;
 }
@@ -323,21 +324,21 @@ static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *if
 static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, WORD stream_num,
         WMT_STREAM_SELECTION *selection)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p)\n", This, stream_num, selection);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_SetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL get_callbacks)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%x)\n", This, get_callbacks);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL *get_callbacks)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, get_callbacks);
     return E_NOTIMPL;
 }
@@ -345,7 +346,7 @@ static HRESULT WINAPI WMReaderAdvanced_GetReceiveSelectionCallbacks(IWMReaderAdv
 static HRESULT WINAPI WMReaderAdvanced_SetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num,
         BOOL receive_stream_samples)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %x)\n", This, stream_num, receive_stream_samples);
     return E_NOTIMPL;
 }
@@ -353,91 +354,91 @@ static HRESULT WINAPI WMReaderAdvanced_SetReceiveStreamSamples(IWMReaderAdvanced
 static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num,
         BOOL *receive_stream_samples)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p)\n", This, stream_num, receive_stream_samples);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL allocate)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %x)\n", This, output_num, allocate);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p)\n", This, output_num, allocate);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_SetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL allocate)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %x)\n", This, output_num, allocate);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL *allocate)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p)\n", This, output_num, allocate);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetStatistics(IWMReaderAdvanced6 *iface, WM_READER_STATISTICS *statistics)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, statistics);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_SetClientInfo(IWMReaderAdvanced6 *iface, WM_READER_CLIENTINFO *client_info)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, client_info);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetMaxOutputSampleSize(IWMReaderAdvanced6 *iface, DWORD output, DWORD *max)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p)\n", This, output, max);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_GetMaxStreamSampleSize(IWMReaderAdvanced6 *iface, WORD stream, DWORD *max)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p)\n", This, stream, max);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced_NotifyLateDelivery(IWMReaderAdvanced6 *iface, QWORD lateness)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(lateness));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_SetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE mode)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d)\n", This, mode);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_GetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE *mode)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, mode);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_GetBufferProgress(IWMReaderAdvanced6 *iface, DWORD *percent, QWORD *buffering)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p %p)\n", This, percent, buffering);
     return E_NOTIMPL;
 }
@@ -445,28 +446,28 @@ static HRESULT WINAPI WMReaderAdvanced2_GetBufferProgress(IWMReaderAdvanced6 *if
 static HRESULT WINAPI WMReaderAdvanced2_GetDownloadProgress(IWMReaderAdvanced6 *iface, DWORD *percent,
         QWORD *bytes_downloaded, QWORD *download)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p %p %p)\n", This, percent, bytes_downloaded, download);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_GetSaveAsProgress(IWMReaderAdvanced6 *iface, DWORD *percent)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, percent);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_SaveFileAs(IWMReaderAdvanced6 *iface, const WCHAR *filename)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_w(filename));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_GetProtocolName(IWMReaderAdvanced6 *iface, WCHAR *protocol, DWORD *protocol_len)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p %p)\n", This, protocol, protocol_len);
     return E_NOTIMPL;
 }
@@ -474,7 +475,7 @@ static HRESULT WINAPI WMReaderAdvanced2_GetProtocolName(IWMReaderAdvanced6 *ifac
 static HRESULT WINAPI WMReaderAdvanced2_StartAtMarker(IWMReaderAdvanced6 *iface, WORD marker_index,
         QWORD duration, float rate, void *context)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %s %f %p)\n", This, marker_index, wine_dbgstr_longlong(duration), rate, context);
     return E_NOTIMPL;
 }
@@ -482,7 +483,7 @@ static HRESULT WINAPI WMReaderAdvanced2_StartAtMarker(IWMReaderAdvanced6 *iface,
 static HRESULT WINAPI WMReaderAdvanced2_GetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num,
         const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length);
     return E_NOTIMPL;
 }
@@ -490,35 +491,35 @@ static HRESULT WINAPI WMReaderAdvanced2_GetOutputSetting(IWMReaderAdvanced6 *ifa
 static HRESULT WINAPI WMReaderAdvanced2_SetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num,
         const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %s %d %p %d)\n", This, output_num, debugstr_w(name), type, value, length);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_Preroll(IWMReaderAdvanced6 *iface, QWORD start, QWORD duration, float rate)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%s %s %f)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_SetLogClientID(IWMReaderAdvanced6 *iface, BOOL log_client_id)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%x)\n", This, log_client_id);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_GetLogClientID(IWMReaderAdvanced6 *iface, BOOL *log_client_id)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, log_client_id);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced2_StopBuffering(IWMReaderAdvanced6 *iface)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
@@ -526,14 +527,14 @@ static HRESULT WINAPI WMReaderAdvanced2_StopBuffering(IWMReaderAdvanced6 *iface)
 static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, IStream *stream,
         IWMReaderCallback *callback, void *context)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p %p %p)\n", This, stream, callback, context);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced3_StopNetStreaming(IWMReaderAdvanced6 *iface)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
@@ -541,14 +542,14 @@ static HRESULT WINAPI WMReaderAdvanced3_StopNetStreaming(IWMReaderAdvanced6 *ifa
 static HRESULT WINAPI WMReaderAdvanced3_StartAtPosition(IWMReaderAdvanced6 *iface, WORD stream_num,
         void *offset_start, void *duration, WMT_OFFSET_FORMAT format, float rate, void *context)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p %p %d %f %p)\n", This, stream_num, offset_start, duration, format, rate, context);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced4_GetLanguageCount(IWMReaderAdvanced6 *iface, DWORD output_num, WORD *language_count)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p)\n", This, output_num, language_count);
     return E_NOTIMPL;
 }
@@ -556,21 +557,21 @@ static HRESULT WINAPI WMReaderAdvanced4_GetLanguageCount(IWMReaderAdvanced6 *ifa
 static HRESULT WINAPI WMReaderAdvanced4_GetLanguage(IWMReaderAdvanced6 *iface, DWORD output_num,
        WORD language, WCHAR *language_string, WORD *language_string_len)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %x %p %p)\n", This, output_num, language, language_string, language_string_len);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced4_GetMaxSpeedFactor(IWMReaderAdvanced6 *iface, double *factor)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, factor);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced4_IsUsingFastCache(IWMReaderAdvanced6 *iface, BOOL *using_fast_cache)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, using_fast_cache);
     return E_NOTIMPL;
 }
@@ -578,42 +579,42 @@ static HRESULT WINAPI WMReaderAdvanced4_IsUsingFastCache(IWMReaderAdvanced6 *ifa
 static HRESULT WINAPI WMReaderAdvanced4_AddLogParam(IWMReaderAdvanced6 *iface, const WCHAR *namespace,
         const WCHAR *name, const WCHAR *value)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%s %s %s)\n", This, debugstr_w(namespace), debugstr_w(name), debugstr_w(value));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced4_SendLogParams(IWMReaderAdvanced6 *iface)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced4_CanSaveFileAs(IWMReaderAdvanced6 *iface, BOOL *can_save)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p)\n", This, can_save);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced4_CancelSaveFileAs(IWMReaderAdvanced6 *iface)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced4_GetURL(IWMReaderAdvanced6 *iface, WCHAR *url, DWORD *url_len)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p %p)\n", This, url, url_len);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, DWORD output_num, IWMPlayerHook *hook)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%d %p)\n", This, output_num, hook);
     return E_NOTIMPL;
 }
@@ -621,7 +622,7 @@ static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface,
 static HRESULT WINAPI WMReaderAdvanced6_SetProtectStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert,
         DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size)
 {
-    WMReader *This = impl_from_IWMReaderAdvanced6(iface);
+    struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
     FIXME("(%p)->(%p %d %d %x %p %p)\n", This, cert, cert_size, cert_type, flags, initialization_vector,
           initialization_vector_size);
     return E_NOTIMPL;
@@ -681,32 +682,32 @@ static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = {
     WMReaderAdvanced6_SetProtectStreamSamples
 };
 
-static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface)
+static struct async_reader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMReaderAccelerator_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMReaderAccelerator_iface);
 }
 
 static HRESULT WINAPI reader_accl_QueryInterface(IWMReaderAccelerator *iface, REFIID riid, void **object)
 {
-    WMReader *This = impl_from_IWMReaderAccelerator(iface);
+    struct async_reader *This = impl_from_IWMReaderAccelerator(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, object);
 }
 
 static ULONG WINAPI reader_accl_AddRef(IWMReaderAccelerator *iface)
 {
-    WMReader *This = impl_from_IWMReaderAccelerator(iface);
+    struct async_reader *This = impl_from_IWMReaderAccelerator(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface)
 {
-    WMReader *This = impl_from_IWMReaderAccelerator(iface);
+    struct async_reader *This = impl_from_IWMReaderAccelerator(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface, DWORD output, REFIID riid, void **codec)
 {
-    WMReader *This = impl_from_IWMReaderAccelerator(iface);
+    struct async_reader *This = impl_from_IWMReaderAccelerator(iface);
 
     FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec);
 
@@ -715,7 +716,7 @@ static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface,
 
 static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype)
 {
-    WMReader *This = impl_from_IWMReaderAccelerator(iface);
+    struct async_reader *This = impl_from_IWMReaderAccelerator(iface);
 
     FIXME("%p, %d, %p\n", This, output, subtype);
 
@@ -730,39 +731,39 @@ static const IWMReaderAcceleratorVtbl WMReaderAcceleratorVtbl = {
     reader_accl_Notify
 };
 
-static inline WMReader *impl_from_IWMReaderNetworkConfig2(IWMReaderNetworkConfig2 *iface)
+static struct async_reader *impl_from_IWMReaderNetworkConfig2(IWMReaderNetworkConfig2 *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMReaderNetworkConfig2_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMReaderNetworkConfig2_iface);
 }
 
 static HRESULT WINAPI networkconfig_QueryInterface(IWMReaderNetworkConfig2 *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI networkconfig_AddRef(IWMReaderNetworkConfig2 *iface)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI networkconfig_Release(IWMReaderNetworkConfig2 *iface)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI networkconfig_GetBufferingTime(IWMReaderNetworkConfig2 *iface, QWORD *buffering_time)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, buffering_time);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetBufferingTime(IWMReaderNetworkConfig2 *iface, QWORD buffering_time)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s\n", This, wine_dbgstr_longlong(buffering_time));
     return E_NOTIMPL;
 }
@@ -770,7 +771,7 @@ static HRESULT WINAPI networkconfig_SetBufferingTime(IWMReaderNetworkConfig2 *if
 static HRESULT WINAPI networkconfig_GetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array,
         DWORD *ranges)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p, %p\n", This, array, ranges);
     return E_NOTIMPL;
 }
@@ -778,7 +779,7 @@ static HRESULT WINAPI networkconfig_GetUDPPortRanges(IWMReaderNetworkConfig2 *if
 static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array,
         DWORD ranges)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p, %u\n", This, array, ranges);
     return E_NOTIMPL;
 }
@@ -786,7 +787,7 @@ static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *if
 static HRESULT WINAPI networkconfig_GetProxySettings(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         WMT_PROXY_SETTINGS *proxy)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %p\n", This, debugstr_w(protocol), proxy);
     return E_NOTIMPL;
 }
@@ -794,7 +795,7 @@ static HRESULT WINAPI networkconfig_GetProxySettings(IWMReaderNetworkConfig2 *if
 static HRESULT WINAPI networkconfig_SetProxySettings(IWMReaderNetworkConfig2 *iface, LPCWSTR protocol,
         WMT_PROXY_SETTINGS proxy)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %d\n", This, debugstr_w(protocol), proxy);
     return E_NOTIMPL;
 }
@@ -802,7 +803,7 @@ static HRESULT WINAPI networkconfig_SetProxySettings(IWMReaderNetworkConfig2 *if
 static HRESULT WINAPI networkconfig_GetProxyHostName(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         WCHAR *hostname, DWORD *size)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %p, %p\n", This, debugstr_w(protocol), hostname, size);
     return E_NOTIMPL;
 }
@@ -810,7 +811,7 @@ static HRESULT WINAPI networkconfig_GetProxyHostName(IWMReaderNetworkConfig2 *if
 static HRESULT WINAPI networkconfig_SetProxyHostName(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         const WCHAR *hostname)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %s\n", This, debugstr_w(protocol), debugstr_w(hostname));
     return E_NOTIMPL;
 }
@@ -818,7 +819,7 @@ static HRESULT WINAPI networkconfig_SetProxyHostName(IWMReaderNetworkConfig2 *if
 static HRESULT WINAPI networkconfig_GetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         DWORD *port)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %p\n", This, debugstr_w(protocol), port);
     return E_NOTIMPL;
 }
@@ -826,7 +827,7 @@ static HRESULT WINAPI networkconfig_GetProxyPort(IWMReaderNetworkConfig2 *iface,
 static HRESULT WINAPI networkconfig_SetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         DWORD port)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %u\n", This, debugstr_w(protocol), port);
     return E_NOTIMPL;
 }
@@ -834,7 +835,7 @@ static HRESULT WINAPI networkconfig_SetProxyPort(IWMReaderNetworkConfig2 *iface,
 static HRESULT WINAPI networkconfig_GetProxyExceptionList(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         WCHAR *exceptions, DWORD *count)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %p, %p\n", This, debugstr_w(protocol), exceptions, count);
     return E_NOTIMPL;
 }
@@ -842,7 +843,7 @@ static HRESULT WINAPI networkconfig_GetProxyExceptionList(IWMReaderNetworkConfig
 static HRESULT WINAPI networkconfig_SetProxyExceptionList(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         const WCHAR *exceptions)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %s\n", This, debugstr_w(protocol), debugstr_w(exceptions));
     return E_NOTIMPL;
 }
@@ -850,7 +851,7 @@ static HRESULT WINAPI networkconfig_SetProxyExceptionList(IWMReaderNetworkConfig
 static HRESULT WINAPI networkconfig_GetProxyBypassForLocal(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         BOOL *bypass)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %p\n", This, debugstr_w(protocol), bypass);
     return E_NOTIMPL;
 }
@@ -858,7 +859,7 @@ static HRESULT WINAPI networkconfig_GetProxyBypassForLocal(IWMReaderNetworkConfi
 static HRESULT WINAPI networkconfig_SetProxyBypassForLocal(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
         BOOL bypass)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s, %d\n", This, debugstr_w(protocol), bypass);
     return E_NOTIMPL;
 }
@@ -866,7 +867,7 @@ static HRESULT WINAPI networkconfig_SetProxyBypassForLocal(IWMReaderNetworkConfi
 static HRESULT WINAPI networkconfig_GetForceRerunAutoProxyDetection(IWMReaderNetworkConfig2 *iface,
         BOOL *detection)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, detection);
     return E_NOTIMPL;
 }
@@ -874,91 +875,91 @@ static HRESULT WINAPI networkconfig_GetForceRerunAutoProxyDetection(IWMReaderNet
 static HRESULT WINAPI networkconfig_SetForceRerunAutoProxyDetection(IWMReaderNetworkConfig2 *iface,
         BOOL detection)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %d\n", This, detection);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetEnableMulticast(IWMReaderNetworkConfig2 *iface, BOOL *multicast)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, multicast);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetEnableMulticast(IWMReaderNetworkConfig2 *iface, BOOL multicast)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %d\n", This, multicast);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetEnableHTTP(IWMReaderNetworkConfig2 *iface, BOOL *enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetEnableHTTP(IWMReaderNetworkConfig2 *iface, BOOL enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %d\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetEnableUDP(IWMReaderNetworkConfig2 *iface, BOOL *enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetEnableUDP(IWMReaderNetworkConfig2 *iface, BOOL enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %d\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetEnableTCP(IWMReaderNetworkConfig2 *iface, BOOL *enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetEnableTCP(IWMReaderNetworkConfig2 *iface, BOOL enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %d\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_ResetProtocolRollover(IWMReaderNetworkConfig2 *iface)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD *bandwidth)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD bandwidth)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %u\n", This, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetNumProtocolsSupported(IWMReaderNetworkConfig2 *iface, DWORD *protocols)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, protocols);
     return E_NOTIMPL;
 }
@@ -966,14 +967,14 @@ static HRESULT WINAPI networkconfig_GetNumProtocolsSupported(IWMReaderNetworkCon
 static HRESULT WINAPI networkconfig_GetSupportedProtocolName(IWMReaderNetworkConfig2 *iface, DWORD protocol_num,
         WCHAR *protocol, DWORD *size)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %u, %p %p\n", This, protocol_num, protocol, size);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_AddLoggingUrl(IWMReaderNetworkConfig2 *iface, const WCHAR *url)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s\n", This, debugstr_w(url));
     return E_NOTIMPL;
 }
@@ -981,49 +982,49 @@ static HRESULT WINAPI networkconfig_AddLoggingUrl(IWMReaderNetworkConfig2 *iface
 static HRESULT WINAPI networkconfig_GetLoggingUrl(IWMReaderNetworkConfig2 *iface, DWORD index, WCHAR *url,
         DWORD *size)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %u, %p, %p\n", This, index, url, size);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetLoggingUrlCount(IWMReaderNetworkConfig2 *iface, DWORD *count)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, count);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_ResetLoggingUrlList(IWMReaderNetworkConfig2 *iface)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetEnableContentCaching(IWMReaderNetworkConfig2 *iface, BOOL *enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetEnableContentCaching(IWMReaderNetworkConfig2 *iface, BOOL enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %d\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetEnableFastCache(IWMReaderNetworkConfig2 *iface, BOOL *enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetEnableFastCache(IWMReaderNetworkConfig2 *iface, BOOL enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %d\n", This, enable);
     return E_NOTIMPL;
 }
@@ -1031,7 +1032,7 @@ static HRESULT WINAPI networkconfig_SetEnableFastCache(IWMReaderNetworkConfig2 *
 static HRESULT WINAPI networkconfig_GetAcceleratedStreamingDuration(IWMReaderNetworkConfig2 *iface,
         QWORD *duration)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, duration);
     return E_NOTIMPL;
 }
@@ -1039,56 +1040,56 @@ static HRESULT WINAPI networkconfig_GetAcceleratedStreamingDuration(IWMReaderNet
 static HRESULT WINAPI networkconfig_SetAcceleratedStreamingDuration(IWMReaderNetworkConfig2 *iface,
         QWORD duration)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %s\n", This, wine_dbgstr_longlong(duration));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD *limit)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, limit);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD limit)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %u\n", This, limit);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetEnableResends(IWMReaderNetworkConfig2 *iface, BOOL *enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetEnableResends(IWMReaderNetworkConfig2 *iface, BOOL enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %u\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetEnableThinning(IWMReaderNetworkConfig2 *iface, BOOL *enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_SetEnableThinning(IWMReaderNetworkConfig2 *iface, BOOL enable)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %u\n", This, enable);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI networkconfig_GetMaxNetPacketSize(IWMReaderNetworkConfig2 *iface, DWORD *packet_size)
 {
-    WMReader *This = impl_from_IWMReaderNetworkConfig2(iface);
+    struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
     FIXME("%p, %p\n", This, packet_size);
     return E_NOTIMPL;
 }
@@ -1146,46 +1147,46 @@ static const IWMReaderNetworkConfig2Vtbl WMReaderNetworkConfig2Vtbl =
     networkconfig_GetMaxNetPacketSize
 };
 
-static inline WMReader *impl_from_IWMReaderStreamClock(IWMReaderStreamClock *iface)
+static struct async_reader *impl_from_IWMReaderStreamClock(IWMReaderStreamClock *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMReaderStreamClock_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMReaderStreamClock_iface);
 }
 
 static HRESULT WINAPI readclock_QueryInterface(IWMReaderStreamClock *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMReaderStreamClock(iface);
+    struct async_reader *This = impl_from_IWMReaderStreamClock(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI readclock_AddRef(IWMReaderStreamClock *iface)
 {
-    WMReader *This = impl_from_IWMReaderStreamClock(iface);
+    struct async_reader *This = impl_from_IWMReaderStreamClock(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI readclock_Release(IWMReaderStreamClock *iface)
 {
-    WMReader *This = impl_from_IWMReaderStreamClock(iface);
+    struct async_reader *This = impl_from_IWMReaderStreamClock(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI readclock_GetTime(IWMReaderStreamClock *iface, QWORD *now)
 {
-    WMReader *This = impl_from_IWMReaderStreamClock(iface);
+    struct async_reader *This = impl_from_IWMReaderStreamClock(iface);
     FIXME("%p, %p\n", This, now);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI readclock_SetTimer(IWMReaderStreamClock *iface, QWORD when, void *param, DWORD *id)
 {
-    WMReader *This = impl_from_IWMReaderStreamClock(iface);
+    struct async_reader *This = impl_from_IWMReaderStreamClock(iface);
     FIXME("%p, %s, %p, %p\n", This, wine_dbgstr_longlong(when), param, id);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI readclock_KillTimer(IWMReaderStreamClock *iface, DWORD id)
 {
-    WMReader *This = impl_from_IWMReaderStreamClock(iface);
+    struct async_reader *This = impl_from_IWMReaderStreamClock(iface);
     FIXME("%p, %d\n", This, id);
     return E_NOTIMPL;
 }
@@ -1200,32 +1201,32 @@ static const IWMReaderStreamClockVtbl WMReaderStreamClockVtbl =
     readclock_KillTimer
 };
 
-static inline WMReader *impl_from_IWMReaderTypeNegotiation(IWMReaderTypeNegotiation *iface)
+static struct async_reader *impl_from_IWMReaderTypeNegotiation(IWMReaderTypeNegotiation *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMReaderTypeNegotiation_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMReaderTypeNegotiation_iface);
 }
 
 static HRESULT WINAPI negotiation_QueryInterface(IWMReaderTypeNegotiation *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMReaderTypeNegotiation(iface);
+    struct async_reader *This = impl_from_IWMReaderTypeNegotiation(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI negotiation_AddRef(IWMReaderTypeNegotiation *iface)
 {
-    WMReader *This = impl_from_IWMReaderTypeNegotiation(iface);
+    struct async_reader *This = impl_from_IWMReaderTypeNegotiation(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface)
 {
-    WMReader *This = impl_from_IWMReaderTypeNegotiation(iface);
+    struct async_reader *This = impl_from_IWMReaderTypeNegotiation(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props)
 {
-    WMReader *This = impl_from_IWMReaderTypeNegotiation(iface);
+    struct async_reader *This = impl_from_IWMReaderTypeNegotiation(iface);
     FIXME("%p, %d, %p\n", This, output, props);
     return E_NOTIMPL;
 }
@@ -1238,32 +1239,32 @@ static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl =
     negotiation_TryOutputProps
 };
 
-static inline WMReader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface)
+static struct async_reader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMReaderTimecode_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMReaderTimecode_iface);
 }
 
 static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMReaderTimecode(iface);
+    struct async_reader *This = impl_from_IWMReaderTimecode(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface)
 {
-    WMReader *This = impl_from_IWMReaderTimecode(iface);
+    struct async_reader *This = impl_from_IWMReaderTimecode(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface)
 {
-    WMReader *This = impl_from_IWMReaderTimecode(iface);
+    struct async_reader *This = impl_from_IWMReaderTimecode(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, WORD num, WORD *count)
 {
-    WMReader *This = impl_from_IWMReaderTimecode(iface);
+    struct async_reader *This = impl_from_IWMReaderTimecode(iface);
     FIXME("%p, %d, %p\n", This, num, count);
     return E_NOTIMPL;
 }
@@ -1271,7 +1272,7 @@ static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, W
 static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface, WORD stream, WORD range,
         DWORD *start_timecode, DWORD *end_timecode)
 {
-    WMReader *This = impl_from_IWMReaderTimecode(iface);
+    struct async_reader *This = impl_from_IWMReaderTimecode(iface);
     FIXME("%p, %d, %d, %p, %p\n", This, stream, range, start_timecode, end_timecode);
     return E_NOTIMPL;
 }
@@ -1286,54 +1287,54 @@ static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl =
 };
 
 
-static inline WMReader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface)
+static struct async_reader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMReaderPlaylistBurn_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMReaderPlaylistBurn_iface);
 }
 
 static HRESULT WINAPI playlist_QueryInterface(IWMReaderPlaylistBurn *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMReaderPlaylistBurn(iface);
+    struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI playlist_AddRef(IWMReaderPlaylistBurn *iface)
 {
-    WMReader *This = impl_from_IWMReaderPlaylistBurn(iface);
+    struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface)
 {
-    WMReader *This = impl_from_IWMReaderPlaylistBurn(iface);
+    struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count,
         LPCWSTR_WMSDK_TYPE_SAFE *filenames, IWMStatusCallback *callback, void *context)
 {
-    WMReader *This = impl_from_IWMReaderPlaylistBurn(iface);
+    struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface);
     FIXME("%p, %d, %p, %p, %p\n", This, count, filenames, callback, context);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *stat)
 {
-    WMReader *This = impl_from_IWMReaderPlaylistBurn(iface);
+    struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface);
     FIXME("%p, %d, %p\n", This, count, stat);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface)
 {
-    WMReader *This = impl_from_IWMReaderPlaylistBurn(iface);
+    struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface);
     FIXME("%p\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT result)
 {
-    WMReader *This = impl_from_IWMReaderPlaylistBurn(iface);
+    struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface);
     FIXME("%p, 0x%08x\n", This, result);
     return E_NOTIMPL;
 }
@@ -1349,32 +1350,32 @@ static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl =
     playlist_EndPlaylistBurn
 };
 
-static inline WMReader *impl_from_IWMHeaderInfo3(IWMHeaderInfo3 *iface)
+static struct async_reader *impl_from_IWMHeaderInfo3(IWMHeaderInfo3 *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMHeaderInfo3_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMHeaderInfo3_iface);
 }
 
 static HRESULT WINAPI headerinfo_QueryInterface(IWMHeaderInfo3 *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI headerinfo_AddRef(IWMHeaderInfo3 *iface)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI headerinfo_Release(IWMHeaderInfo3 *iface)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI headerinfo_GetAttributeCount(IWMHeaderInfo3 *iface, WORD stream_num, WORD *attributes)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %p\n", This, stream_num, attributes);
     return E_NOTIMPL;
 }
@@ -1382,7 +1383,7 @@ static HRESULT WINAPI headerinfo_GetAttributeCount(IWMHeaderInfo3 *iface, WORD s
 static HRESULT WINAPI headerinfo_GetAttributeByIndex(IWMHeaderInfo3 *iface, WORD index, WORD *stream_num,
         WCHAR *name, WORD *name_len, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %p, %p, %p, %p, %p, %p\n", This, index, stream_num, name, name_len, type,
             value, length);
     return E_NOTIMPL;
@@ -1391,7 +1392,7 @@ static HRESULT WINAPI headerinfo_GetAttributeByIndex(IWMHeaderInfo3 *iface, WORD
 static HRESULT WINAPI headerinfo_GetAttributeByName(IWMHeaderInfo3 *iface, WORD *stream_num, LPCWSTR name,
         WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %p, %s, %p, %p, %p\n", This, stream_num, debugstr_w(name), type, value, length);
     return E_NOTIMPL;
 }
@@ -1399,14 +1400,14 @@ static HRESULT WINAPI headerinfo_GetAttributeByName(IWMHeaderInfo3 *iface, WORD
 static HRESULT WINAPI headerinfo_SetAttribute(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name,
         WMT_ATTR_DATATYPE type, const BYTE *value, WORD length)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %s, %d, %p, %d\n", This, stream_num, debugstr_w(name), type, value, length);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI headerinfo_GetMarkerCount(IWMHeaderInfo3 *iface, WORD *markers)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %p\n", This, markers);
     return E_NOTIMPL;
 }
@@ -1414,7 +1415,7 @@ static HRESULT WINAPI headerinfo_GetMarkerCount(IWMHeaderInfo3 *iface, WORD *mar
 static HRESULT WINAPI headerinfo_GetMarker(IWMHeaderInfo3 *iface, WORD index, WCHAR *marker_name,
         WORD *marker_len, QWORD *marker_time)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %p, %p, %p\n", This, index, marker_name, marker_len, marker_time);
     return E_NOTIMPL;
 }
@@ -1422,21 +1423,21 @@ static HRESULT WINAPI headerinfo_GetMarker(IWMHeaderInfo3 *iface, WORD index, WC
 static HRESULT WINAPI headerinfo_AddMarker(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE marker_name,
         QWORD marker_time)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %p, %s\n", This, marker_name, wine_dbgstr_longlong(marker_time));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI headerinfo_RemoveMarker(IWMHeaderInfo3 *iface, WORD index)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d\n", This, index);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI headerinfo_GetScriptCount(IWMHeaderInfo3 *iface, WORD *scripts)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %p\n", This, scripts);
     return E_NOTIMPL;
 }
@@ -1444,7 +1445,7 @@ static HRESULT WINAPI headerinfo_GetScriptCount(IWMHeaderInfo3 *iface, WORD *scr
 static HRESULT WINAPI headerinfo_GetScript(IWMHeaderInfo3 *iface, WORD index, WCHAR *type,
         WORD *type_len, WCHAR *command, WORD *command_len, QWORD *script_time)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %p, %p, %p, %p, %p\n", This, index, type, type_len, command, command_len, script_time);
     return E_NOTIMPL;
 }
@@ -1452,21 +1453,21 @@ static HRESULT WINAPI headerinfo_GetScript(IWMHeaderInfo3 *iface, WORD index, WC
 static HRESULT WINAPI headerinfo_AddScript(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE type,
         LPCWSTR_WMSDK_TYPE_SAFE command, QWORD script_time)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %s, %s, %s\n", This, debugstr_w(type), debugstr_w(command), wine_dbgstr_longlong(script_time));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI headerinfo_RemoveScript(IWMHeaderInfo3 *iface, WORD index)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d\n", This, index);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI headerinfo_GetCodecInfoCount(IWMHeaderInfo3 *iface, DWORD *codec_infos)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %p\n", This, codec_infos);
     return E_NOTIMPL;
 }
@@ -1475,7 +1476,7 @@ static HRESULT WINAPI headerinfo_GetCodecInfo(IWMHeaderInfo3 *iface, DWORD index
         WCHAR *name, WORD *description_len, WCHAR *description, WMT_CODEC_INFO_TYPE *codec_type,
         WORD *codec_info_cnt, BYTE *codec_info)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %p, %p, %p, %p, %p, %p, %p\n", This, index, name_len, name, description_len,
             description, codec_type, codec_info_cnt, codec_info);
     return E_NOTIMPL;
@@ -1483,7 +1484,7 @@ static HRESULT WINAPI headerinfo_GetCodecInfo(IWMHeaderInfo3 *iface, DWORD index
 
 static HRESULT WINAPI headerinfo_GetAttributeCountEx(IWMHeaderInfo3 *iface, WORD stream_num, WORD *attributes)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %p\n", This, stream_num, attributes);
     return E_NOTIMPL;
 }
@@ -1491,7 +1492,7 @@ static HRESULT WINAPI headerinfo_GetAttributeCountEx(IWMHeaderInfo3 *iface, WORD
 static HRESULT WINAPI headerinfo_GetAttributeIndices(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name,
         WORD *lang_index, WORD *indices, WORD *count)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %s, %p, %p, %p\n", This, stream_num, debugstr_w(name), lang_index, indices, count);
     return E_NOTIMPL;
 }
@@ -1500,7 +1501,7 @@ static HRESULT WINAPI headerinfo_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, WO
         WORD index, LPWSTR name, WORD *name_len, WMT_ATTR_DATATYPE *type, WORD *lang_index,
         BYTE *value, DWORD *data_len)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %d, %s, %p, %p, %p, %p, %p\n", This, stream_num, index, debugstr_w(name), name_len,
             type, lang_index, value, data_len);
     return E_NOTIMPL;
@@ -1509,7 +1510,7 @@ static HRESULT WINAPI headerinfo_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, WO
 static HRESULT WINAPI headerinfo_ModifyAttribute(IWMHeaderInfo3 *iface, WORD stream_num,
         WORD index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD length)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %d, %d, %d, %p, %d\n", This, stream_num, index, type, lang_index, value, length);
     return E_NOTIMPL;
 }
@@ -1517,7 +1518,7 @@ static HRESULT WINAPI headerinfo_ModifyAttribute(IWMHeaderInfo3 *iface, WORD str
 static HRESULT WINAPI headerinfo_AddAttribute(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name,
         WORD *index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD length)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %s, %p, %d, %d, %p, %d\n", This, stream_num, debugstr_w(name), index,
             type, lang_index, value, length);
     return E_NOTIMPL;
@@ -1525,7 +1526,7 @@ static HRESULT WINAPI headerinfo_AddAttribute(IWMHeaderInfo3 *iface, WORD stream
 
 static HRESULT WINAPI headerinfo_DeleteAttribute(IWMHeaderInfo3 *iface, WORD stream_num, WORD index)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %d, %d\n", This, stream_num, index);
     return E_NOTIMPL;
 }
@@ -1534,7 +1535,7 @@ static HRESULT WINAPI headerinfo_AddCodecInfo(IWMHeaderInfo3 *iface, LPCWSTR_WMS
         LPCWSTR_WMSDK_TYPE_SAFE description, WMT_CODEC_INFO_TYPE codec_type, WORD codec_info_cnt,
         BYTE *codec_info)
 {
-    WMReader *This = impl_from_IWMHeaderInfo3(iface);
+    struct async_reader *This = impl_from_IWMHeaderInfo3(iface);
     FIXME("%p, %p, %p, %d, %d, %p\n", This, name, description, codec_type, codec_info_cnt,
             codec_info);
     return E_NOTIMPL;
@@ -1569,32 +1570,32 @@ static const IWMHeaderInfo3Vtbl WMHeaderInfo3Vtbl =
 };
 
 
-static inline WMReader *impl_from_IWMLanguageList(IWMLanguageList *iface)
+static struct async_reader *impl_from_IWMLanguageList(IWMLanguageList *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMLanguageList_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMLanguageList_iface);
 }
 
 static HRESULT WINAPI langlist_QueryInterface(IWMLanguageList *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMLanguageList(iface);
+    struct async_reader *This = impl_from_IWMLanguageList(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI langlist_AddRef(IWMLanguageList *iface)
 {
-    WMReader *This = impl_from_IWMLanguageList(iface);
+    struct async_reader *This = impl_from_IWMLanguageList(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI langlist_Release(IWMLanguageList *iface)
 {
-    WMReader *This = impl_from_IWMLanguageList(iface);
+    struct async_reader *This = impl_from_IWMLanguageList(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI langlist_GetLanguageCount(IWMLanguageList *iface, WORD *count)
 {
-    WMReader *This = impl_from_IWMLanguageList(iface);
+    struct async_reader *This = impl_from_IWMLanguageList(iface);
     FIXME("%p, %p\n", This, count);
     return E_NOTIMPL;
 }
@@ -1602,7 +1603,7 @@ static HRESULT WINAPI langlist_GetLanguageCount(IWMLanguageList *iface, WORD *co
 static HRESULT WINAPI langlist_GetLanguageDetails(IWMLanguageList *iface, WORD index,
         WCHAR *language, WORD *length)
 {
-    WMReader *This = impl_from_IWMLanguageList(iface);
+    struct async_reader *This = impl_from_IWMLanguageList(iface);
     FIXME("%p, %d, %p, %p\n", This, index, language, length);
     return E_NOTIMPL;
 }
@@ -1610,7 +1611,7 @@ static HRESULT WINAPI langlist_GetLanguageDetails(IWMLanguageList *iface, WORD i
 static HRESULT WINAPI langlist_AddLanguageByRFC1766String(IWMLanguageList *iface, LPCWSTR_WMSDK_TYPE_SAFE language,
         WORD *index)
 {
-    WMReader *This = impl_from_IWMLanguageList(iface);
+    struct async_reader *This = impl_from_IWMLanguageList(iface);
     FIXME("%p, %p, %p\n", This, language, index);
     return E_NOTIMPL;
 }
@@ -1625,32 +1626,32 @@ static const IWMLanguageListVtbl WMLanguageListVtbl =
     langlist_AddLanguageByRFC1766String
 };
 
-static inline WMReader *impl_from_IReferenceClock(IReferenceClock *iface)
+static struct async_reader *impl_from_IReferenceClock(IReferenceClock *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IReferenceClock_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IReferenceClock_iface);
 }
 
 static HRESULT WINAPI refclock_QueryInterface(IReferenceClock *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IReferenceClock(iface);
+    struct async_reader *This = impl_from_IReferenceClock(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI refclock_AddRef(IReferenceClock *iface)
 {
-    WMReader *This = impl_from_IReferenceClock(iface);
+    struct async_reader *This = impl_from_IReferenceClock(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI refclock_Release(IReferenceClock *iface)
 {
-    WMReader *This = impl_from_IReferenceClock(iface);
+    struct async_reader *This = impl_from_IReferenceClock(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI refclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time)
 {
-    WMReader *This = impl_from_IReferenceClock(iface);
+    struct async_reader *This = impl_from_IReferenceClock(iface);
     FIXME("%p, %p\n", This, time);
     return E_NOTIMPL;
 }
@@ -1658,7 +1659,7 @@ static HRESULT WINAPI refclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *t
 static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME basetime,
         REFERENCE_TIME streamtime, HEVENT event, DWORD_PTR *cookie)
 {
-    WMReader *This = impl_from_IReferenceClock(iface);
+    struct async_reader *This = impl_from_IReferenceClock(iface);
     FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(basetime),
             wine_dbgstr_longlong(streamtime), event, cookie);
     return E_NOTIMPL;
@@ -1667,7 +1668,7 @@ static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME
 static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME starttime,
         REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie)
 {
-    WMReader *This = impl_from_IReferenceClock(iface);
+    struct async_reader *This = impl_from_IReferenceClock(iface);
     FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(starttime),
             wine_dbgstr_longlong(period), semaphore, cookie);
     return E_NOTIMPL;
@@ -1675,7 +1676,7 @@ static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_
 
 static HRESULT WINAPI refclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie)
 {
-    WMReader *This = impl_from_IReferenceClock(iface);
+    struct async_reader *This = impl_from_IReferenceClock(iface);
     FIXME("%p, %lu\n", This, cookie);
     return E_NOTIMPL;
 }
@@ -1691,67 +1692,67 @@ static const IReferenceClockVtbl ReferenceClockVtbl =
     refclock_Unadvise
 };
 
-static inline WMReader *impl_from_IWMProfile3(IWMProfile3 *iface)
+static struct async_reader *impl_from_IWMProfile3(IWMProfile3 *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMProfile3_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMProfile3_iface);
 }
 
 static HRESULT WINAPI profile3_QueryInterface(IWMProfile3 *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI profile3_AddRef(IWMProfile3 *iface)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI profile3_Release(IWMProfile3 *iface)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI profile3_GetVersion(IWMProfile3 *iface, WMT_VERSION *version)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, version);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p, %p\n", This, name, length);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_SetName(IWMProfile3 *iface, const WCHAR *name)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %s\n", This, debugstr_w(name));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p, %p\n", This, description, length);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_SetDescription(IWMProfile3 *iface, const WCHAR *description)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %s\n", This, debugstr_w(description));
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, count);
 
     if (!count)
@@ -1763,175 +1764,175 @@ static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count)
 
 static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d, %p\n", This, index, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetStreamByNumber(IWMProfile3 *iface, WORD stream, IWMStreamConfig **config)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d, %p\n", This, stream, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d\n", This, stream);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_AddStream(IWMProfile3 *iface, IWMStreamConfig *config)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %s, %p\n", This, debugstr_guid(type), config);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, count);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **mutual)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d, %p\n", This, index, mutual);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, mutual);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, mutual);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **mutual)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, mutual);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetProfileID(IWMProfile3 *iface, GUID *guid)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, guid);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *storage)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, storage);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT storage)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d\n", This, storage);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, count);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **bandwidth)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %d, %p\n", This, index, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *bandwidth)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *bandwidth)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **bandwidth)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, bandwidth);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, stream);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, stream);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_RemoveStreamPrioritization(IWMProfile3 *iface)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p\n", This);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %p\n", This, stream);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI profile3_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *packets)
 {
-    WMReader *This = impl_from_IWMProfile3(iface);
+    struct async_reader *This = impl_from_IWMProfile3(iface);
     FIXME("%p, %s, %p\n", This, wine_dbgstr_longlong(duration), packets);
     return E_NOTIMPL;
 }
@@ -1974,53 +1975,53 @@ static const IWMProfile3Vtbl WMProfile3Vtbl =
     profile3_GetExpectedPacketCount
 };
 
-static inline WMReader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface)
+static struct async_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface)
 {
-    return CONTAINING_RECORD(iface, WMReader, IWMPacketSize2_iface);
+    return CONTAINING_RECORD(iface, struct async_reader, IWMPacketSize2_iface);
 }
 
 static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv)
 {
-    WMReader *This = impl_from_IWMPacketSize2(iface);
+    struct async_reader *This = impl_from_IWMPacketSize2(iface);
     return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv);
 }
 
 static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface)
 {
-    WMReader *This = impl_from_IWMPacketSize2(iface);
+    struct async_reader *This = impl_from_IWMPacketSize2(iface);
     return IWMReader_AddRef(&This->IWMReader_iface);
 }
 
 static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface)
 {
-    WMReader *This = impl_from_IWMPacketSize2(iface);
+    struct async_reader *This = impl_from_IWMPacketSize2(iface);
     return IWMReader_Release(&This->IWMReader_iface);
 }
 
 static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size)
 {
-    WMReader *This = impl_from_IWMPacketSize2(iface);
+    struct async_reader *This = impl_from_IWMPacketSize2(iface);
     FIXME("%p, %p\n", This, size);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size)
 {
-    WMReader *This = impl_from_IWMPacketSize2(iface);
+    struct async_reader *This = impl_from_IWMPacketSize2(iface);
     FIXME("%p, %d\n", This, size);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size)
 {
-    WMReader *This = impl_from_IWMPacketSize2(iface);
+    struct async_reader *This = impl_from_IWMPacketSize2(iface);
     FIXME("%p, %p\n", This, size);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size)
 {
-    WMReader *This = impl_from_IWMPacketSize2(iface);
+    struct async_reader *This = impl_from_IWMPacketSize2(iface);
     FIXME("%p, %d\n", This, size);
     return E_NOTIMPL;
 }
@@ -2038,7 +2039,7 @@ static const IWMPacketSize2Vtbl WMPacketSize2Vtbl =
 
 HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader)
 {
-    WMReader *object;
+    struct async_reader *object;
 
     TRACE("reader %p.\n", reader);
 
-- 
2.33.0