Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- dlls/wmvcore/Makefile.in | 1 + dlls/wmvcore/reader.c | 312 ----------------------------------- dlls/wmvcore/syncreader.c | 337 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 338 insertions(+), 312 deletions(-) create mode 100644 dlls/wmvcore/syncreader.c
diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index e4efe0d3873..d84411ab846 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -6,6 +6,7 @@ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ reader.c \ + syncreader.c \ wmvcore_main.c \ writer.c
diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 293bba0279c..12ba8099ab1 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -2072,315 +2072,3 @@ HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) { return WMCreateReader(NULL, 0, ret_reader); } - -typedef struct { - IWMSyncReader2 IWMSyncReader2_iface; - LONG ref; -} WMSyncReader; - -static inline WMSyncReader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface) -{ - return CONTAINING_RECORD(iface, WMSyncReader, IWMSyncReader2_iface); -} - -static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader2 *iface, REFIID riid, void **ppv) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMSyncReader2_iface; - }else if(IsEqualGUID(riid, &IID_IWMSyncReader)) { - TRACE("(%p)->(IID_IWMSyncReader %p)\n", This, ppv); - *ppv = &This->IWMSyncReader2_iface; - }else if(IsEqualGUID(riid, &IID_IWMSyncReader2)) { - TRACE("(%p)->(IID_IWMSyncReader2 %p)\n", This, ppv); - *ppv = &This->IWMSyncReader2_iface; - }else { - *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader2 *iface) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) - heap_free(This); - - return ref; -} - -static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface) -{ - WMSyncReader *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); - 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); - FIXME("(%p)->(%d %p): stub!\n", This, stream, max); - return E_NOTIMPL; -} - -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); - 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; -} - -static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *outputs) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%p): stub!\n", This, outputs); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, DWORD output_num, DWORD format_num, - IWMOutputMediaProps **props) -{ - WMSyncReader *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); - 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); - 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); - FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); - return E_NOTIMPL; -} - -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); - 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); - 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); - 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); - 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); - 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); - 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); - FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); - return E_NOTIMPL; -} - -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); - 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); - FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num, - LONGLONG frames) -{ - 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)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL compressed) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WORD stream_count, - WORD *stream_numbers, WMT_STREAM_SELECTION *selections) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections); - return S_OK; -} - -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_AddRef, - WMSyncReader_Release, - WMSyncReader_Open, - WMSyncReader_Close, - WMSyncReader_SetRange, - WMSyncReader_SetRangeByFrame, - WMSyncReader_GetNextSample, - WMSyncReader_SetStreamsSelected, - WMSyncReader_GetStreamSelected, - WMSyncReader_SetReadStreamSamples, - WMSyncReader_GetReadStreamSamples, - WMSyncReader_GetOutputSetting, - WMSyncReader_SetOutputSetting, - WMSyncReader_GetOutputCount, - WMSyncReader_GetOutputProps, - WMSyncReader_SetOutputProps, - WMSyncReader_GetOutputFormatCount, - WMSyncReader_GetOutputFormat, - WMSyncReader_GetOutputNumberForStream, - WMSyncReader_GetStreamNumberForOutput, - WMSyncReader_GetMaxOutputSampleSize, - WMSyncReader_GetMaxStreamSampleSize, - WMSyncReader_OpenStream, - WMSyncReader2_SetRangeByTimecode, - WMSyncReader2_SetRangeByFrameEx, - WMSyncReader2_SetAllocateForOutput, - WMSyncReader2_GetAllocateForOutput, - WMSyncReader2_SetAllocateForStream, - WMSyncReader2_GetAllocateForStream -}; - -HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) -{ - WMSyncReader *sync; - - TRACE("(%p, %x, %p)\n", pcert, rights, syncreader); - - sync = heap_alloc(sizeof(*sync)); - - if (!sync) - return E_OUTOFMEMORY; - - sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; - sync->ref = 1; - - *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface; - - return S_OK; -} - -HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader) -{ - return WMCreateSyncReader(NULL, 0, syncreader); -} diff --git a/dlls/wmvcore/syncreader.c b/dlls/wmvcore/syncreader.c new file mode 100644 index 00000000000..c3176e61ddb --- /dev/null +++ b/dlls/wmvcore/syncreader.c @@ -0,0 +1,337 @@ +/* + * Copyright 2012 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wmvcore.h" + +#include "wmsdk.h" +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +typedef struct { + IWMSyncReader2 IWMSyncReader2_iface; + LONG ref; +} WMSyncReader; + +static inline WMSyncReader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface) +{ + return CONTAINING_RECORD(iface, WMSyncReader, IWMSyncReader2_iface); +} + +static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader2 *iface, REFIID riid, void **ppv) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMSyncReader2_iface; + }else if(IsEqualGUID(riid, &IID_IWMSyncReader)) { + TRACE("(%p)->(IID_IWMSyncReader %p)\n", This, ppv); + *ppv = &This->IWMSyncReader2_iface; + }else if(IsEqualGUID(riid, &IID_IWMSyncReader2)) { + TRACE("(%p)->(IID_IWMSyncReader2 %p)\n", This, ppv); + *ppv = &This->IWMSyncReader2_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader2 *iface) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface) +{ + WMSyncReader *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); + 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); + FIXME("(%p)->(%d %p): stub!\n", This, stream, max); + return E_NOTIMPL; +} + +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); + 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; +} + +static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *outputs) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%p): stub!\n", This, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, DWORD output_num, DWORD format_num, + IWMOutputMediaProps **props) +{ + WMSyncReader *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); + 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); + 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); + FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); + return E_NOTIMPL; +} + +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); + 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); + 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); + 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); + 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); + 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); + 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); + FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); + return E_NOTIMPL; +} + +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); + 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); + FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num, + LONGLONG frames) +{ + 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)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL compressed) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WORD stream_count, + WORD *stream_numbers, WMT_STREAM_SELECTION *selections) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections); + return S_OK; +} + +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_AddRef, + WMSyncReader_Release, + WMSyncReader_Open, + WMSyncReader_Close, + WMSyncReader_SetRange, + WMSyncReader_SetRangeByFrame, + WMSyncReader_GetNextSample, + WMSyncReader_SetStreamsSelected, + WMSyncReader_GetStreamSelected, + WMSyncReader_SetReadStreamSamples, + WMSyncReader_GetReadStreamSamples, + WMSyncReader_GetOutputSetting, + WMSyncReader_SetOutputSetting, + WMSyncReader_GetOutputCount, + WMSyncReader_GetOutputProps, + WMSyncReader_SetOutputProps, + WMSyncReader_GetOutputFormatCount, + WMSyncReader_GetOutputFormat, + WMSyncReader_GetOutputNumberForStream, + WMSyncReader_GetStreamNumberForOutput, + WMSyncReader_GetMaxOutputSampleSize, + WMSyncReader_GetMaxStreamSampleSize, + WMSyncReader_OpenStream, + WMSyncReader2_SetRangeByTimecode, + WMSyncReader2_SetRangeByFrameEx, + WMSyncReader2_SetAllocateForOutput, + WMSyncReader2_GetAllocateForOutput, + WMSyncReader2_SetAllocateForStream, + WMSyncReader2_GetAllocateForStream +}; + +HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) +{ + WMSyncReader *sync; + + TRACE("(%p, %x, %p)\n", pcert, rights, syncreader); + + sync = heap_alloc(sizeof(*sync)); + + if (!sync) + return E_OUTOFMEMORY; + + sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; + sync->ref = 1; + + *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface; + + return S_OK; +} + +HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader) +{ + return WMCreateSyncReader(NULL, 0, syncreader); +}
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- dlls/wmvcore/tests/wmvcore.c | 299 ++++++++++------------------------- 1 file changed, 87 insertions(+), 212 deletions(-)
diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index fac9948d60e..bdd99d1b42f 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -25,13 +25,25 @@
HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer);
+#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported) +{ + HRESULT hr, expected_hr; + IUnknown *unknown = iface, *out; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(out); + return hr; +} + static void test_wmwriter_interfaces(void) { HRESULT hr; - IWMWriter *writer; - IWMHeaderInfo *header; - IWMHeaderInfo2 *header2; - IWMHeaderInfo3 *header3; + IWMWriter *writer;
hr = WMCreateWriter( NULL, &writer ); ok(hr == S_OK, "WMCreateWriter failed 0x%08x\n", hr); @@ -41,50 +53,24 @@ static void test_wmwriter_interfaces(void) return; }
- hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo, (void **)&header); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo2, (void **)&header2); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + check_interface(writer, &IID_IWMWriterSink, FALSE);
- hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo3, (void **)&header3); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + check_interface(writer, &IID_IWMWriter, TRUE); + check_interface(writer, &IID_IWMWriterAdvanced, TRUE); + check_interface(writer, &IID_IWMWriterAdvanced2, TRUE); + check_interface(writer, &IID_IWMWriterAdvanced3, TRUE); + todo_wine check_interface(writer, &IID_IWMWriterPreprocess, TRUE); + todo_wine check_interface(writer, &IID_IWMHeaderInfo, TRUE); + todo_wine check_interface(writer, &IID_IWMHeaderInfo2, TRUE); + todo_wine check_interface(writer, &IID_IWMHeaderInfo3, TRUE);
- if(header) - IWMHeaderInfo_Release(header); - if(header2) - IWMHeaderInfo2_Release(header2); - if(header3) - IWMHeaderInfo3_Release(header3); IWMWriter_Release(writer); }
static void test_wmreader_interfaces(void) { HRESULT hr; - IWMReader *reader; - IWMReaderAdvanced *advanced; - IWMReaderAdvanced2 *advanced2; - IWMHeaderInfo *header; - IWMHeaderInfo2 *header2; - IWMHeaderInfo3 *header3; - IWMProfile *profile; - IWMProfile2 *profile2; - IWMProfile3 *profile3; - IWMPacketSize *packet; - IWMPacketSize2 *packet2; - IWMReaderAccelerator *accel; - IWMReaderTimecode *timecode; - IWMReaderNetworkConfig *netconfig; - IWMReaderNetworkConfig2 *netconfig2; - IWMReaderStreamClock *clock; - IWMReaderTypeNegotiation *negotiation; - IWMDRMReader *drmreader; - IWMDRMReader2 *drmreader2; - IWMDRMReader3 *drmreader3; - IWMReaderPlaylistBurn *playlist; - IWMLanguageList *langlist; - IReferenceClock *refclock; + IWMReader *reader;
hr = WMCreateReader( NULL, 0, &reader ); ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); @@ -94,110 +80,36 @@ static void test_wmreader_interfaces(void) return; }
- hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced, (void **)&advanced); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced2); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig, (void **)&netconfig); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig2, (void **)&netconfig2); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMReaderStreamClock, (void **)&clock); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTypeNegotiation, (void **)&negotiation); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader, (void **)&drmreader); - ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader2, (void **)&drmreader2); - ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader3, (void **)&drmreader3); - ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMReader_QueryInterface(reader, &IID_IReferenceClock, (void **)&refclock); - ok(hr == S_OK, "Failed 0x%08x\n", hr); - - if(packet) - IWMPacketSize_Release(packet); - if(packet2) - IWMPacketSize2_Release(packet2); - if(advanced) - IWMReaderAdvanced_Release(advanced); - if(advanced2) - IWMReaderAdvanced2_Release(advanced2); - if(profile) - IWMProfile_Release(profile); - if(profile2) - IWMProfile2_Release(profile2); - if(profile3) - IWMProfile3_Release(profile3); - if(header) - IWMHeaderInfo_Release(header); - if(header2) - IWMHeaderInfo2_Release(header2); - if(header3) - IWMHeaderInfo3_Release(header3); - if(accel) - IWMReaderAccelerator_Release(accel); - if(timecode) - IWMReaderTimecode_Release(timecode); - if(netconfig) - IWMReaderNetworkConfig_Release(netconfig); - if(netconfig2) - IWMReaderNetworkConfig2_Release(netconfig2); - if(clock) - IWMReaderStreamClock_Release(clock); - if(negotiation) - IWMReaderTypeNegotiation_Release(negotiation); - if(playlist) - IWMReaderPlaylistBurn_Release(playlist); - if(langlist) - IWMLanguageList_Release(langlist); - if(refclock) - IReferenceClock_Release(refclock); + check_interface(reader, &IID_IWMDRMReader, FALSE); + check_interface(reader, &IID_IWMDRMReader2, FALSE); + check_interface(reader, &IID_IWMDRMReader3, FALSE); + check_interface(reader, &IID_IWMSyncReader, FALSE); + check_interface(reader, &IID_IWMSyncReader2, FALSE); + + check_interface(reader, &IID_IWMReader, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced2, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced3, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced4, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced5, TRUE); + check_interface(reader, &IID_IWMReaderAdvanced6, TRUE); + check_interface(reader, &IID_IWMHeaderInfo, TRUE); + check_interface(reader, &IID_IWMHeaderInfo2, TRUE); + check_interface(reader, &IID_IWMHeaderInfo3, TRUE); + check_interface(reader, &IID_IWMProfile, TRUE); + check_interface(reader, &IID_IWMProfile2, TRUE); + check_interface(reader, &IID_IWMProfile3, TRUE); + check_interface(reader, &IID_IWMPacketSize, TRUE); + check_interface(reader, &IID_IWMPacketSize2, TRUE); + check_interface(reader, &IID_IWMReaderAccelerator, TRUE); + check_interface(reader, &IID_IWMReaderTimecode, TRUE); + check_interface(reader, &IID_IWMReaderNetworkConfig, TRUE); + check_interface(reader, &IID_IWMReaderNetworkConfig2, TRUE); + check_interface(reader, &IID_IWMReaderStreamClock, TRUE); + check_interface(reader, &IID_IWMReaderTypeNegotiation, TRUE); + check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); + check_interface(reader, &IID_IWMLanguageList, TRUE); + check_interface(reader, &IID_IReferenceClock, TRUE);
IWMReader_Release(reader); } @@ -205,18 +117,7 @@ static void test_wmreader_interfaces(void) static void test_wmsyncreader_interfaces(void) { HRESULT hr; - IWMSyncReader *reader; - IWMHeaderInfo *header; - IWMHeaderInfo2 *header2; - IWMHeaderInfo3 *header3; - IWMProfile *profile; - IWMProfile2 *profile2; - IWMProfile3 *profile3; - IWMPacketSize *packet; - IWMPacketSize2 *packet2; - IWMReaderTimecode *timecode; - IWMReaderPlaylistBurn *playlist; - IWMLanguageList *langlist; + IWMSyncReader *reader;
hr = WMCreateSyncReader( NULL, 0, &reader ); ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); @@ -226,62 +127,36 @@ static void test_wmsyncreader_interfaces(void) return; }
- hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - hr = IWMSyncReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); - - if(packet) - IWMPacketSize_Release(packet); - if(packet2) - IWMPacketSize2_Release(packet2); - if(profile) - IWMProfile_Release(profile); - if(profile2) - IWMProfile2_Release(profile2); - if(profile3) - IWMProfile3_Release(profile3); - if(header) - IWMHeaderInfo_Release(header); - if(header2) - IWMHeaderInfo2_Release(header2); - if(header3) - IWMHeaderInfo3_Release(header3); - if(timecode) - IWMReaderTimecode_Release(timecode); - if(playlist) - IWMReaderPlaylistBurn_Release(playlist); - if(langlist) - IWMLanguageList_Release(langlist); - + check_interface(reader, &IID_IWMDRMReader, FALSE); + check_interface(reader, &IID_IWMDRMReader2, FALSE); + check_interface(reader, &IID_IWMDRMReader3, FALSE); + check_interface(reader, &IID_IWMReader, FALSE); + check_interface(reader, &IID_IWMReaderAccelerator, FALSE); + check_interface(reader, &IID_IWMReaderAdvanced, FALSE); + check_interface(reader, &IID_IWMReaderAdvanced2, FALSE); + check_interface(reader, &IID_IWMReaderAdvanced3, FALSE); + check_interface(reader, &IID_IWMReaderAdvanced4, FALSE); + check_interface(reader, &IID_IWMReaderAdvanced5, FALSE); + check_interface(reader, &IID_IWMReaderAdvanced6, FALSE); + check_interface(reader, &IID_IWMReaderNetworkConfig, FALSE); + check_interface(reader, &IID_IWMReaderNetworkConfig2, FALSE); + check_interface(reader, &IID_IWMReaderStreamClock, FALSE); + check_interface(reader, &IID_IWMReaderTypeNegotiation, FALSE); + check_interface(reader, &IID_IReferenceClock, FALSE); + + check_interface(reader, &IID_IWMSyncReader, TRUE); + check_interface(reader, &IID_IWMSyncReader2, TRUE); + todo_wine check_interface(reader, &IID_IWMHeaderInfo, TRUE); + todo_wine check_interface(reader, &IID_IWMHeaderInfo2, TRUE); + todo_wine check_interface(reader, &IID_IWMHeaderInfo3, TRUE); + todo_wine check_interface(reader, &IID_IWMProfile, TRUE); + todo_wine check_interface(reader, &IID_IWMProfile2, TRUE); + todo_wine check_interface(reader, &IID_IWMProfile3, TRUE); + todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); + todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); + todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE); + todo_wine check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); + todo_wine check_interface(reader, &IID_IWMLanguageList, TRUE);
IWMSyncReader_Release(reader); }
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- dlls/wmvcore/syncreader.c | 294 +++++++++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 6 +- 2 files changed, 297 insertions(+), 3 deletions(-)
diff --git a/dlls/wmvcore/syncreader.c b/dlls/wmvcore/syncreader.c index c3176e61ddb..b245ff20d31 100644 --- a/dlls/wmvcore/syncreader.c +++ b/dlls/wmvcore/syncreader.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
typedef struct { + IWMProfile3 IWMProfile3_iface; IWMSyncReader2 IWMSyncReader2_iface; LONG ref; } WMSyncReader; @@ -41,6 +42,15 @@ static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader2 *iface, REFIID if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IWMSyncReader2_iface; + }else if(IsEqualGUID(riid, &IID_IWMProfile)) { + TRACE("(%p)->(IID_IWMProfile %p)\n", This, ppv); + *ppv = &This->IWMProfile3_iface; + }else if(IsEqualGUID(riid, &IID_IWMProfile2)) { + TRACE("(%p)->(IID_IWMProfile2 %p)\n", This, ppv); + *ppv = &This->IWMProfile3_iface; + }else if(IsEqualGUID(riid, &IID_IWMProfile3)) { + TRACE("(%p)->(IID_IWMProfile3 %p)\n", This, ppv); + *ppv = &This->IWMProfile3_iface; }else if(IsEqualGUID(riid, &IID_IWMSyncReader)) { TRACE("(%p)->(IID_IWMSyncReader %p)\n", This, ppv); *ppv = &This->IWMSyncReader2_iface; @@ -312,6 +322,289 @@ static const IWMSyncReader2Vtbl WMSyncReader2Vtbl = { WMSyncReader2_GetAllocateForStream };
+static inline WMSyncReader *impl_from_IWMProfile3(IWMProfile3 *iface) +{ + return CONTAINING_RECORD(iface, WMSyncReader, IWMProfile3_iface); +} + +static HRESULT WINAPI WMProfile_QueryInterface(IWMProfile3 *iface, REFIID riid, void **ppv) +{ + WMSyncReader *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); + return IWMSyncReader2_AddRef(&This->IWMSyncReader2_iface); +} + +static ULONG WINAPI WMProfile_Release(IWMProfile3 *iface) +{ + WMSyncReader *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); + 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); + 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); + 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); + 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); + 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); + FIXME("%p, %p\n", This, count); + + if (!count) + return E_INVALIDARG; + + *count = 0; + return S_OK; +} + +static HRESULT WINAPI WMProfile_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) +{ + WMSyncReader *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); + 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); + FIXME("%p, %p\n", This, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfile_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream) +{ + WMSyncReader *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); + FIXME("%p, %p\n", This, config); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfile_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config) +{ + WMSyncReader *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); + 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); + 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); + 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); + FIXME("%p, %p\n", This, mutual); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfile_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) +{ + WMSyncReader *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); + FIXME("%p, %p\n", This, mutual); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfile2_GetProfileID(IWMProfile3 *iface, GUID *guid) +{ + WMSyncReader *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); + 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); + FIXME("%p, %d\n", This, storage); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfile3_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count) +{ + WMSyncReader *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); + 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); + FIXME("%p, %p\n", This, bandwidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfile3_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) +{ + WMSyncReader *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); + FIXME("%p, %p\n", This, bandwidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfile3_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) +{ + WMSyncReader *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); + FIXME("%p, %p\n", This, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfile3_RemoveStreamPrioritization(IWMProfile3 *iface) +{ + WMSyncReader *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); + 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); + FIXME("%p, %s, %p\n", This, wine_dbgstr_longlong(duration), packets); + return E_NOTIMPL; +} + +static const IWMProfile3Vtbl WMProfile3Vtbl = +{ + WMProfile_QueryInterface, + WMProfile_AddRef, + WMProfile_Release, + WMProfile_GetVersion, + WMProfile_GetName, + WMProfile_SetName, + WMProfile_GetDescription, + WMProfile_SetDescription, + WMProfile_GetStreamCount, + WMProfile_GetStream, + WMProfile_GetStreamByNumber, + WMProfile_RemoveStream, + WMProfile_RemoveStreamByNumber, + WMProfile_AddStream, + WMProfile_ReconfigStream, + WMProfile_CreateNewStream, + WMProfile_GetMutualExclusionCount, + WMProfile_GetMutualExclusion, + WMProfile_RemoveMutualExclusion, + WMProfile_AddMutualExclusion, + WMProfile_CreateNewMutualExclusion, + WMProfile2_GetProfileID, + WMProfile3_GetStorageFormat, + WMProfile3_SetStorageFormat, + WMProfile3_GetBandwidthSharingCount, + WMProfile3_GetBandwidthSharing, + WMProfile3_RemoveBandwidthSharing, + WMProfile3_AddBandwidthSharing, + WMProfile3_CreateNewBandwidthSharing, + WMProfile3_GetStreamPrioritization, + WMProfile3_SetStreamPrioritization, + WMProfile3_RemoveStreamPrioritization, + WMProfile3_CreateNewStreamPrioritization, + WMProfile3_GetExpectedPacketCount +}; + HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) { WMSyncReader *sync; @@ -323,6 +616,7 @@ HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader * if (!sync) return E_OUTOFMEMORY;
+ sync->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; sync->ref = 1;
diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index bdd99d1b42f..63509b8c93e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -149,9 +149,9 @@ static void test_wmsyncreader_interfaces(void) todo_wine check_interface(reader, &IID_IWMHeaderInfo, TRUE); todo_wine check_interface(reader, &IID_IWMHeaderInfo2, TRUE); todo_wine check_interface(reader, &IID_IWMHeaderInfo3, TRUE); - todo_wine check_interface(reader, &IID_IWMProfile, TRUE); - todo_wine check_interface(reader, &IID_IWMProfile2, TRUE); - todo_wine check_interface(reader, &IID_IWMProfile3, TRUE); + check_interface(reader, &IID_IWMProfile, TRUE); + check_interface(reader, &IID_IWMProfile2, TRUE); + check_interface(reader, &IID_IWMProfile3, TRUE); todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE);
-
Gijs Vermeulen