ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wmvcore: Upgrade to IWMSyncReader2. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50740
Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gijs Vermeulen 2021-03-01 12:15:28 +01:00 committed by Alexandre Julliard
parent 6170749eab
commit 7fa74fa78e
1 changed files with 111 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
dlls/wmvcore/reader.c
View File

@ -2074,25 +2074,28 @@ HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader)
} }
typedef struct { typedef struct {
IWMSyncReader IWMSyncReader_iface; IWMSyncReader2 IWMSyncReader2_iface;
LONG ref; LONG ref;
} WMSyncReader; } WMSyncReader;
static inline WMSyncReader *impl_from_IWMSyncReader(IWMSyncReader *iface) static inline WMSyncReader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface)
{ {
return CONTAINING_RECORD(iface, WMSyncReader, IWMSyncReader_iface); return CONTAINING_RECORD(iface, WMSyncReader, IWMSyncReader2_iface);
} }
static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader *iface, REFIID riid, void **ppv) static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader2 *iface, REFIID riid, void **ppv)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
if(IsEqualGUID(riid, &IID_IUnknown)) { if(IsEqualGUID(riid, &IID_IUnknown)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
*ppv = &This->IWMSyncReader_iface; *ppv = &This->IWMSyncReader2_iface;
}else if(IsEqualGUID(riid, &IID_IWMSyncReader)) { }else if(IsEqualGUID(riid, &IID_IWMSyncReader)) {
TRACE("(%p)->(IID_IWMSyncReader %p)\n", This, ppv); TRACE("(%p)->(IID_IWMSyncReader %p)\n", This, ppv);
*ppv = &This->IWMSyncReader_iface; *ppv = &This->IWMSyncReader2_iface;
}else if(IsEqualGUID(riid, &IID_IWMSyncReader2)) {
TRACE("(%p)->(IID_IWMSyncReader2 %p)\n", This, ppv);
*ppv = &This->IWMSyncReader2_iface;
}else { }else {
*ppv = NULL; *ppv = NULL;
FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
@ -2103,9 +2106,9 @@ static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader *iface, REFIID r
return S_OK; return S_OK;
} }
static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader *iface) static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader2 *iface)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
@ -2113,9 +2116,9 @@ static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader *iface)
return ref; return ref;
} }
static ULONG WINAPI WMSyncReader_Release(IWMSyncReader *iface) static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
@ -2126,161 +2129,206 @@ static ULONG WINAPI WMSyncReader_Release(IWMSyncReader *iface)
return ref; return ref;
} }
static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader *iface) static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p): stub!\n", This); FIXME("(%p): stub!\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader *iface, DWORD output, DWORD *max) static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD output, DWORD *max)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%d %p): stub!\n", This, output, max); FIXME("(%p)->(%d %p): stub!\n", This, output, max);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetMaxStreamSampleSize(IWMSyncReader *iface, WORD stream, DWORD *max) static HRESULT WINAPI WMSyncReader_GetMaxStreamSampleSize(IWMSyncReader2 *iface, WORD stream, DWORD *max)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%d %p): stub!\n", This, stream, max); FIXME("(%p)->(%d %p): stub!\n", This, stream, max);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader *iface, WORD stream, INSSBuffer **sample, 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) QWORD *sample_time, QWORD *sample_duration, DWORD *flags, DWORD *output_num, WORD *stream_num)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%d %p %p %p %p %p %p): stub!\n", This, stream, sample, sample_time, FIXME("(%p)->(%d %p %p %p %p %p %p): stub!\n", This, stream, sample, sample_time,
sample_duration, flags, output_num, stream_num); sample_duration, flags, output_num, stream_num);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader *iface, DWORD *outputs) static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *outputs)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%p): stub!\n", This, outputs); FIXME("(%p)->(%p): stub!\n", This, outputs);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader *iface, DWORD output_num, DWORD format_num, static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, DWORD output_num, DWORD format_num,
IWMOutputMediaProps **props) IWMOutputMediaProps **props)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%u %u %p): stub!\n", This, output_num, format_num, props); FIXME("(%p)->(%u %u %p): stub!\n", This, output_num, format_num, props);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader *iface, DWORD output_num, DWORD *formats) static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD output_num, DWORD *formats)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%u %p): stub!\n", This, output_num, formats); FIXME("(%p)->(%u %p): stub!\n", This, output_num, formats);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader *iface, WORD stream_num, DWORD *output_num) static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader2 *iface, WORD stream_num, DWORD *output_num)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%u %p): stub!\n", This, stream_num, output_num); FIXME("(%p)->(%u %p): stub!\n", This, stream_num, output_num);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader *iface, DWORD output_num, IWMOutputMediaProps **output) static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps **output)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); FIXME("(%p)->(%u %p): stub!\n", This, output_num, output);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader *iface, DWORD output_num, const WCHAR *name, static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name,
WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%u %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length); FIXME("(%p)->(%u %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetReadStreamSamples(IWMSyncReader *iface, WORD stream_num, BOOL *compressed) static HRESULT WINAPI WMSyncReader_GetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL *compressed)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%d %p): stub!\n", This, stream_num, compressed); FIXME("(%p)->(%d %p): stub!\n", This, stream_num, compressed);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader *iface, DWORD output, WORD *stream_num) static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *iface, DWORD output, WORD *stream_num)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%u %p): stub!\n", This, output, stream_num); FIXME("(%p)->(%u %p): stub!\n", This, output, stream_num);
return S_OK; return S_OK;
} }
static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader *iface, WORD stream_num, WMT_STREAM_SELECTION *selection) static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader2 *iface, WORD stream_num, WMT_STREAM_SELECTION *selection)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%d %p): stub!\n", This, stream_num, selection); FIXME("(%p)->(%d %p): stub!\n", This, stream_num, selection);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader *iface, const WCHAR *filename) static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader2 *iface, const WCHAR *filename)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%s): stub!\n", This, debugstr_w(filename)); FIXME("(%p)->(%s): stub!\n", This, debugstr_w(filename));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader *iface, IStream *stream) static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader2 *iface, IStream *stream)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%p): stub!\n", This, stream); FIXME("(%p)->(%p): stub!\n", This, stream);
return S_OK; return S_OK;
} }
static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader *iface, DWORD output_num, IWMOutputMediaProps *output) static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps *output)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); FIXME("(%p)->(%u %p): stub!\n", This, output_num, output);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader *iface, DWORD output_num, const WCHAR *name, static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name,
WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) WMT_ATTR_DATATYPE type, const BYTE *value, WORD length)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%d %s %d %p %d): stub!\n", This, output_num, debugstr_w(name), type, value, length); FIXME("(%p)->(%d %s %d %p %d): stub!\n", This, output_num, debugstr_w(name), type, value, length);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader *iface, QWORD start, LONGLONG duration) static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader2 *iface, QWORD start, LONGLONG duration)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration)); FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader *iface, WORD stream_num, QWORD frame_num, static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num,
LONGLONG frames) LONGLONG frames)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%d %s %s): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num), wine_dbgstr_longlong(frames)); FIXME("(%p)->(%d %s %s): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num), wine_dbgstr_longlong(frames));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader *iface, WORD stream_num, BOOL compressed) static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL compressed)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed); FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader *iface, WORD stream_count, static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WORD stream_count,
WORD *stream_numbers, WMT_STREAM_SELECTION *selections) WORD *stream_numbers, WMT_STREAM_SELECTION *selections)
{ {
WMSyncReader *This = impl_from_IWMSyncReader(iface); WMSyncReader *This = impl_from_IWMSyncReader2(iface);
FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections); FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections);
return S_OK; return S_OK;
} }
static const IWMSyncReaderVtbl WMSyncReaderVtbl = { 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);
FIXME("(%p)->(%u %p %p): stub!\n", This, stream_num, start, end);
return E_NOTIMPL;
}
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);
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;
}
static HRESULT WINAPI WMSyncReader2_SetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx *allocator)
{
WMSyncReader *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);
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);
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);
FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator);
return E_NOTIMPL;
}
static const IWMSyncReader2Vtbl WMSyncReader2Vtbl = {
WMSyncReader_QueryInterface, WMSyncReader_QueryInterface,
WMSyncReader_AddRef, WMSyncReader_AddRef,
WMSyncReader_Release, WMSyncReader_Release,
@ -2304,7 +2352,13 @@ static const IWMSyncReaderVtbl WMSyncReaderVtbl = {
WMSyncReader_GetStreamNumberForOutput, WMSyncReader_GetStreamNumberForOutput,
WMSyncReader_GetMaxOutputSampleSize, WMSyncReader_GetMaxOutputSampleSize,
WMSyncReader_GetMaxStreamSampleSize, WMSyncReader_GetMaxStreamSampleSize,
WMSyncReader_OpenStream WMSyncReader_OpenStream,
WMSyncReader2_SetRangeByTimecode,
WMSyncReader2_SetRangeByFrameEx,
WMSyncReader2_SetAllocateForOutput,
WMSyncReader2_GetAllocateForOutput,
WMSyncReader2_SetAllocateForStream,
WMSyncReader2_GetAllocateForStream
}; };
HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader)
@ -2318,10 +2372,10 @@ HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader *
if (!sync) if (!sync)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
sync->IWMSyncReader_iface.lpVtbl = &WMSyncReaderVtbl; sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl;
sync->ref = 1; sync->ref = 1;
*syncreader = &sync->IWMSyncReader_iface; *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface;
return S_OK; return S_OK;
} }