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

wmvcore: Support IWMReaderAccelerator in IWMReader. 

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alistair Leslie-Hughes 2017-06-23 04:12:11 +00:00 committed by Alexandre Julliard
parent 4dc61a2ca6
commit 94af0276c1
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wmvcore/tests/wmvcore.c
View File

@ -121,7 +121,7 @@ static void test_wmreader_interfaces(void)
todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr);
hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel);
todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); ok(hr == S_OK, "Failed 0x%08x\n", hr);
hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode);
todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr);

54
dlls/wmvcore/wmvcore_main.c
View File

@ -66,6 +66,7 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor)
typedef struct { typedef struct {
IWMReader IWMReader_iface; IWMReader IWMReader_iface;
IWMReaderAdvanced6 IWMReaderAdvanced6_iface; IWMReaderAdvanced6 IWMReaderAdvanced6_iface;
IWMReaderAccelerator IWMReaderAccelerator_iface;
LONG ref; LONG ref;
} WMReader; } WMReader;
@ -102,6 +103,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi
}else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) {
TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv);
*ppv = &This->IWMReaderAdvanced6_iface; *ppv = &This->IWMReaderAdvanced6_iface;
}else if(IsEqualGUID(riid, &IID_IWMReaderAccelerator)) {
TRACE("(%p)->(IID_IWMReaderAccelerator %p)\n", This, ppv);
*ppv = &This->IWMReaderAccelerator_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);
@ -656,6 +660,55 @@ static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = {
WMReaderAdvanced6_SetProtextStreamSamples WMReaderAdvanced6_SetProtextStreamSamples
}; };
static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface)
{
return CONTAINING_RECORD(iface, WMReader, IWMReaderAccelerator_iface);
}
static HRESULT WINAPI reader_accl_QueryInterface(IWMReaderAccelerator *iface, REFIID riid, void **object)
{
WMReader *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);
return IWMReader_AddRef(&This->IWMReader_iface);
}
static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface)
{
WMReader *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);
FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec);
return E_NOTIMPL;
}
static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype)
{
WMReader *This = impl_from_IWMReaderAccelerator(iface);
FIXME("%p, %d, %p\n", This, output, subtype);
return E_NOTIMPL;
}
static const IWMReaderAcceleratorVtbl WMReaderAcceleratorVtbl = {
reader_accl_QueryInterface,
reader_accl_AddRef,
reader_accl_Release,
reader_accl_GetCodecInterface,
reader_accl_Notify
};
HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader)
{ {
WMReader *reader; WMReader *reader;
@ -668,6 +721,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_
reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; reader->IWMReader_iface.lpVtbl = &WMReaderVtbl;
reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl;
reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl;
reader->ref = 1; reader->ref = 1;
*ret_reader = &reader->IWMReader_iface; *ret_reader = &reader->IWMReader_iface;