November 2013 - Wine-commits

André Hentschel : ntdll: Enable compilation with -D__WINESRC__.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: a160a653175c076f7aef1b87b65ab0f3ef2b4642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a160a653175c076f7aef1b87b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 5 22:44:42 2013 +0100 ntdll: Enable compilation with -D__WINESRC__. --- dlls/ntdll/tests/Makefile.in | 1 - dlls/ntdll/tests/change.c | 6 +++--- dlls/ntdll/tests/directory.c | 4 ++-- dlls/ntdll/tests/exception.c | 6 +++--- dlls/ntdll/tests/file.c | 10 +++++----- dlls/ntdll/tests/info.c | 28 ++++++++++++++-------------- dlls/ntdll/tests/pipe.c | 4 ++-- dlls/ntdll/tests/port.c | 42 +++++++++++++++++++++--------------------- 8 files changed, 50 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a160a653175c076f7aef1…

1 0

Marcus Meissner : user32: Fixed sizeof() to MultiByteToWideChar.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 6f3d942fa4800b6cfd3b96e2458d39542299805b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3d942fa4800b6cfd3b96e24… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Nov 5 21:54:27 2013 +0100 user32: Fixed sizeof() to MultiByteToWideChar. --- dlls/user32/tests/class.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index c8d6a26..1d35832 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1041,7 +1041,7 @@ static void test_comctl32_class( const char *name ) ret = GetClassInfoA( 0, name, &wcA ); ok( ret || broken(!ret) /* <= winxp */, "GetClassInfoA failed for %s\n", name ); if (!ret) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW) ); + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) ); ret = GetClassInfoW( 0, nameW, &wcW ); ok( ret, "GetClassInfoW failed for %s\n", name ); module = GetModuleHandleA( "comctl32" );

1 0

Frédéric Delanoy : avrt: Use BOOL type where appropriate.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: f249638294362754016738c1a08dd6e6d8931f3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f249638294362754016738c1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 5 22:59:06 2013 +0100 avrt: Use BOOL type where appropriate. --- dlls/avrt/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index 5c9ef4a..8a11025 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -86,11 +86,11 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) BOOL WINAPI AvRevertMmThreadCharacteristics(HANDLE AvrtHandle) { FIXME("(%p): stub\n", AvrtHandle); - return 1; + return TRUE; } BOOL WINAPI AvSetMmThreadPriority(HANDLE AvrtHandle, AVRT_PRIORITY prio) { FIXME("(%p)->(%u) stub\n", AvrtHandle, prio); - return 1; + return TRUE; }

1 0

Frédéric Delanoy : user32/tests: Check return code from call to SystemParametersInfo.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 4f6bd4911bad74bc3fbd04efe406afc2d0c95d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6bd4911bad74bc3fbd04efe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 5 22:59:07 2013 +0100 user32/tests: Check return code from call to SystemParametersInfo. --- dlls/user32/tests/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 59225fe..548f8ef 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -949,7 +949,7 @@ static void test_SPI_SETSCREENSAVETIMEOUT( void ) /* 14 */ test_reg_key( SPI_SETSCREENSAVETIMEOUT_REGKEY, SPI_SETSCREENSAVETIMEOUT_VALNAME, buf ); - SystemParametersInfoA( SPI_GETSCREENSAVETIMEOUT, 0, &v, 0 ); + rc = SystemParametersInfoA( SPI_GETSCREENSAVETIMEOUT, 0, &v, 0 ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); eq( v, vals[i], "SPI_{GET,SET}SCREENSAVETIMEOUT", "%d" ); }

1 0

Frédéric Delanoy : user32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 0e37ca1478de18f360044275369417b1badb2745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e37ca1478de18f3600442753… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 5 22:59:08 2013 +0100 user32/tests: Use BOOL type where appropriate. --- dlls/user32/tests/menu.c | 9 +- dlls/user32/tests/msg.c | 38 +++--- dlls/user32/tests/sysparams.c | 266 ++++++++++++++++++++--------------------- dlls/user32/tests/wsprintf.c | 12 +- 4 files changed, 161 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e37ca1478de18f360044…

1 0

André Hentschel : include: Add some definitions to axextend.idl.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: b7672fac6dba4ccb2aaa1ddad678e8946a5653aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7672fac6dba4ccb2aaa1ddad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 5 23:56:37 2013 +0100 include: Add some definitions to axextend.idl. --- include/axextend.idl | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index acc66a5..3610d81 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -22,6 +22,8 @@ interface IAMAudioInputMixer; interface IAMAudioRendererStats; interface IAMBufferNegotiation; interface IAMCameraControl; +interface IAMCertifiedOutputProtection; +interface IAMClockSlave; interface IAMCopyCaptureFileProgress; interface IAMCrossbar; interface IAMDevMemoryAllocator; @@ -731,6 +733,71 @@ interface ICaptureGraphBuilder2 : IUnknown [out] IPin **ppPin); } +[ + local, + object, + uuid(9fd52741-176d-4b36-8f51-ca8f933223be), + pointer_default(unique) +] +interface IAMClockSlave : IUnknown +{ + HRESULT SetErrorTolerance( + [in] DWORD dwTolerance); + + HRESULT GetErrorTolerance( + [out] DWORD *pdwTolerance); +}; + +typedef struct _AMCOPPSignature { + BYTE Signature[256]; +} AMCOPPSignature; + +typedef struct _AMCOPPCommand { + GUID macKDI; + GUID guidCommandID; + DWORD dwSequence; + DWORD bSizeData; + BYTE CommandData[4056]; +} AMCOPPCommand, *LPAMCOPPCommand; + +typedef struct _AMCOPPStatusInput { + GUID rApp; + GUID guidStatusRequestID; + DWORD dwSequence; + DWORD cbSizeData; + BYTE StatusData[4056]; +} AMCOPPStatusInput, *LPAMCOPPStatusInput; + +typedef struct _AMCOPPStatusOutput { + GUID macKDI; + DWORD cbSizeData; + BYTE COPPStatus[4076]; +} AMCOPPStatusOutput, *LPAMCOPPStatusOutput; + +[ + local, + object, + uuid(6feded3e-0ff1-4901-a2f1-43f7012c8515), + pointer_default(unique) +] +interface IAMCertifiedOutputProtection : IUnknown +{ + HRESULT KeyExchange ( + [out] GUID* pRandom, + [out] BYTE** VarLenCertGH, + [out] DWORD* pdwLengthCertGH); + + HRESULT SessionSequenceStart( + [in] AMCOPPSignature* pSig); + + HRESULT ProtectionCommand( + [in] const AMCOPPCommand* cmd); + + HRESULT ProtectionStatus( + [in] const AMCOPPStatusInput* pStatusInput, + [out] AMCOPPStatusOutput* pStatusOutput); +}; + enum _AM_RENSDEREXFLAGS { AM_RENDEREX_RENDERTOEXISTINGRENDERERS = 0x01

1 0

André Hentschel : quartz: Get rid of the VMR9Impl typedef.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: bc59206e0e3c70c25c6230f9a22c61cb79b532e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc59206e0e3c70c25c6230f9a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 5 23:58:12 2013 +0100 quartz: Get rid of the VMR9Impl typedef. --- dlls/quartz/vmr9.c | 189 ++++++++++++++++++++++++++-------------------------- 1 files changed, 95 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc59206e0e3c70c25c623…

1 0

André Hentschel : quartz: Add Video Mixing Renderer 7.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: f9cccaa3def66a288117a7204ba2ab1b1383c579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9cccaa3def66a288117a7204… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 5 23:59:54 2013 +0100 quartz: Add Video Mixing Renderer 7. --- dlls/quartz/main.c | 1 + dlls/quartz/quartz_private.h | 1 + dlls/quartz/quartz_strmif.idl | 7 +++ dlls/quartz/regsvr.c | 12 ++++++ dlls/quartz/vmr9.c | 87 +++++++++++++++++++++++++---------------- include/uuids.h | 1 + 6 files changed, 75 insertions(+), 34 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 2a4071c..81f9ab8 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -75,6 +75,7 @@ static const struct object_creation_info object_creation[] = { &CLSID_MPEG1Splitter, MPEGSplitter_create }, { &CLSID_VideoRenderer, VideoRenderer_create }, { &CLSID_NullRenderer, NullRenderer_create }, + { &CLSID_VideoMixingRenderer, VMR7Impl_create }, { &CLSID_VideoMixingRenderer9, VMR9Impl_create }, { &CLSID_VideoRendererDefault, VideoRendererDefault_create }, { &CLSID_DSoundRender, DSoundRender_create }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index af0300e..7cad3a7 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -54,6 +54,7 @@ HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; +HRESULT VMR7Impl_create(IUnknown *pUnkOuter, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT VMR9Impl_create(IUnknown *pUnkOuter, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/quartz_strmif.idl b/dlls/quartz/quartz_strmif.idl index 7ad8a7b..44dc668 100644 --- a/dlls/quartz/quartz_strmif.idl +++ b/dlls/quartz/quartz_strmif.idl @@ -155,6 +155,13 @@ coclass ACMWrapper { interface IBaseFilter; } coclass WAVEParser { interface IBaseFilter; } [ + helpstring("Video Mixing Renderer"), + threading(both), + uuid(b87beb7b-8d29-423f-ae4d-6582c10175ac) +] +coclass VideoMixingRenderer { interface IBaseFilter; } + +[ helpstring("Video Mixing Renderer 9"), threading(both), uuid(51b4abf3-748f-4e3b-a276-c828330e926a) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index d5adf8a..6afce5a 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -952,6 +952,18 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, + { &CLSID_VideoMixingRenderer, + &CLSID_LegacyAmFilterCategory, + {'V','i','d','e','o',' ','M','i','x','i','n','g',' ','R','e','n','d','e','r','e','r',0}, + 0x200000, + { { REG_PINFLAG_B_RENDERER, + { { &MEDIATYPE_Video, &GUID_NULL }, + { NULL } + }, + }, + { 0xFFFFFFFF }, + } + }, { &CLSID_VideoMixingRenderer9, &CLSID_LegacyAmFilterCategory, {'V','i','d','e','o',' ','M','i','x','i','n','g',' ','R','e','n','d','e','r','e','r',' ','9',0}, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 09e595d..1c72b86 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -880,7 +880,7 @@ static ULONG WINAPI VMR9_Release(IBaseFilter * iface) return 0; } -static const IBaseFilterVtbl VMR9_Vtbl = +static const IBaseFilterVtbl VMR_Vtbl = { VMR9_QueryInterface, VMR9_AddRef, @@ -1581,67 +1581,86 @@ static const IVMRSurfaceAllocatorNotify9Vtbl IVMRSurfaceAllocatorNotify9_Vtbl = VMR9SurfaceAllocatorNotify_NotifyEvent }; -HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) +static HRESULT vmr_create(IUnknown *outer_unk, LPVOID *ppv, const CLSID *clsid) { HRESULT hr; - struct quartz_vmr* pVMR9; + struct quartz_vmr* pVMR; TRACE("(%p, %p)\n", outer_unk, ppv); *ppv = NULL; - pVMR9 = CoTaskMemAlloc(sizeof(struct quartz_vmr)); + pVMR = CoTaskMemAlloc(sizeof(struct quartz_vmr)); - pVMR9->hD3d9 = LoadLibraryA("d3d9.dll"); - if (!pVMR9->hD3d9 ) + pVMR->hD3d9 = LoadLibraryA("d3d9.dll"); + if (!pVMR->hD3d9 ) { WARN("Could not load d3d9.dll\n"); - CoTaskMemFree(pVMR9); + CoTaskMemFree(pVMR); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } - pVMR9->outer_unk = outer_unk; - pVMR9->bUnkOuterValid = FALSE; - pVMR9->bAggregatable = FALSE; - pVMR9->IUnknown_inner.lpVtbl = &IInner_VTable; - pVMR9->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; - - pVMR9->mode = 0; - pVMR9->allocator_d3d9_dev = NULL; - pVMR9->allocator_mon= NULL; - pVMR9->num_surfaces = pVMR9->cur_surface = 0; - pVMR9->allocator = NULL; - pVMR9->presenter = NULL; - pVMR9->hWndClippingWindow = NULL; - pVMR9->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; - pVMR9->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; - pVMR9->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &IVMRSurfaceAllocatorNotify9_Vtbl; - - hr = BaseRenderer_Init(&pVMR9->renderer, &VMR9_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); + pVMR->outer_unk = outer_unk; + pVMR->bUnkOuterValid = FALSE; + pVMR->bAggregatable = FALSE; + pVMR->IUnknown_inner.lpVtbl = &IInner_VTable; + pVMR->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + + pVMR->mode = 0; + pVMR->allocator_d3d9_dev = NULL; + pVMR->allocator_mon= NULL; + pVMR->num_surfaces = pVMR->cur_surface = 0; + pVMR->allocator = NULL; + pVMR->presenter = NULL; + pVMR->hWndClippingWindow = NULL; + pVMR->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; + pVMR->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &IVMRSurfaceAllocatorNotify9_Vtbl; + + if (IsEqualGUID(clsid, &CLSID_VideoMixingRenderer)) + hr = BaseRenderer_Init(&pVMR->renderer, &VMR_Vtbl, outer_unk, &CLSID_VideoMixingRenderer, + (DWORD_PTR)(__FILE__ ": VMR7Impl.csFilter"), &BaseFuncTable); + else + hr = BaseRenderer_Init(&pVMR->renderer, &VMR_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, + (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); + if (FAILED(hr)) goto fail; - hr = BaseControlWindow_Init(&pVMR9->baseControlWindow, &IVideoWindow_VTable, &pVMR9->renderer.filter, &pVMR9->renderer.filter.csFilter, &pVMR9->renderer.pInputPin->pin, &renderer_BaseWindowFuncTable); + hr = BaseControlWindow_Init(&pVMR->baseControlWindow, &IVideoWindow_VTable, &pVMR->renderer.filter, + &pVMR->renderer.filter.csFilter, &pVMR->renderer.pInputPin->pin, + &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; - hr = BaseControlVideo_Init(&pVMR9->baseControlVideo, &IBasicVideo_VTable, &pVMR9->renderer.filter, &pVMR9->renderer.filter.csFilter, &pVMR9->renderer.pInputPin->pin, &renderer_BaseControlVideoFuncTable); + hr = BaseControlVideo_Init(&pVMR->baseControlVideo, &IBasicVideo_VTable, &pVMR->renderer.filter, + &pVMR->renderer.filter.csFilter, &pVMR->renderer.pInputPin->pin, + &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; - *ppv = (LPVOID)pVMR9; - ZeroMemory(&pVMR9->source_rect, sizeof(RECT)); - ZeroMemory(&pVMR9->target_rect, sizeof(RECT)); - TRACE("Created at %p\n", pVMR9); + *ppv = (LPVOID)pVMR; + ZeroMemory(&pVMR->source_rect, sizeof(RECT)); + ZeroMemory(&pVMR->target_rect, sizeof(RECT)); + TRACE("Created at %p\n", pVMR); return hr; fail: - BaseRendererImpl_Release(&pVMR9->renderer.filter.IBaseFilter_iface); - CloseHandle(pVMR9->hD3d9); - CoTaskMemFree(pVMR9); + BaseRendererImpl_Release(&pVMR->renderer.filter.IBaseFilter_iface); + CloseHandle(pVMR->hD3d9); + CoTaskMemFree(pVMR); return hr; } +HRESULT VMR7Impl_create(IUnknown *outer_unk, LPVOID *ppv) +{ + return vmr_create(outer_unk, ppv, &CLSID_VideoMixingRenderer); +} + +HRESULT VMR9Impl_create(IUnknown *outer_unk, LPVOID *ppv) +{ + return vmr_create(outer_unk, ppv, &CLSID_VideoMixingRenderer9); +} static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, LPVOID * ppv) diff --git a/include/uuids.h b/include/uuids.h index 376cca7..c385f3e 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -275,6 +275,7 @@ OUR_GUID_ENTRY(CLSID_VideoProcAmpPropertyPage, 0x71f96464, 0x78f3, 0x11d0, OUR_GUID_ENTRY(CLSID_CameraControlPropertyPage, 0x71f96465, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) OUR_GUID_ENTRY(CLSID_AnalogVideoDecoderPropertyPage, 0x71f96466, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) OUR_GUID_ENTRY(CLSID_VideoStreamConfigPropertyPage, 0x71f96467, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) +OUR_GUID_ENTRY(CLSID_VideoMixingRenderer, 0xb87beb7b, 0x8d29, 0x423f, 0xae, 0x4d, 0x65, 0x82, 0xc1, 0x01, 0x75, 0xac) OUR_GUID_ENTRY(CLSID_VideoMixingRenderer9, 0x51b4abf3, 0x748f, 0x4e3b, 0xa2, 0x76, 0xc8, 0x28, 0x33, 0x0e, 0x92, 0x6a) #undef OUR_GUID_ENTRY

1 0

André Hentschel : quartz: Add stubbed IVMRFilterConfig interface.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: d029181d1a049b8e46054948ce0e02b947ded25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d029181d1a049b8e46054948c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 6 00:00:55 2013 +0100 quartz: Add stubbed IVMRFilterConfig interface. --- dlls/quartz/vmr9.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 1c72b86..f39f052 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -53,6 +53,7 @@ struct quartz_vmr IUnknown IUnknown_inner; IAMFilterMiscFlags IAMFilterMiscFlags_iface; + IVMRFilterConfig IVMRFilterConfig_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; IVMRWindowlessControl9 IVMRWindowlessControl9_iface; IVMRSurfaceAllocatorNotify9 IVMRSurfaceAllocatorNotify9_iface; @@ -120,6 +121,11 @@ static inline struct quartz_vmr *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags return CONTAINING_RECORD(iface, struct quartz_vmr, IAMFilterMiscFlags_iface); } +static inline struct quartz_vmr *impl_from_IVMRFilterConfig(IVMRFilterConfig *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRFilterConfig_iface); +} + static inline struct quartz_vmr *impl_from_IVMRFilterConfig9(IVMRFilterConfig9 *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRFilterConfig9_iface); @@ -725,6 +731,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->baseControlVideo.IBasicVideo_iface; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_iface; + else if (IsEqualIID(riid, &IID_IVMRFilterConfig)) + *ppv = &This->IVMRFilterConfig_iface; else if (IsEqualIID(riid, &IID_IVMRFilterConfig9)) *ppv = &This->IVMRFilterConfig9_iface; else if (IsEqualIID(riid, &IID_IVMRWindowlessControl9) && This->mode == VMR9Mode_Windowless) @@ -1074,6 +1082,103 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { AMFilterMiscFlags_GetMiscFlags }; +static HRESULT WINAPI VMR7FilterConfig_QueryInterface(IVMRFilterConfig *iface, REFIID riid, + void** ppv) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI VMR7FilterConfig_AddRef(IVMRFilterConfig *iface) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI VMR7FilterConfig_Release(IVMRFilterConfig *iface) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI VMR7FilterConfig_SetImageCompositor(IVMRFilterConfig *iface, + IVMRImageCompositor *compositor) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, compositor); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7FilterConfig_SetNumberOfStreams(IVMRFilterConfig *iface, DWORD max) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7FilterConfig_GetNumberOfStreams(IVMRFilterConfig *iface, DWORD *max) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7FilterConfig_SetRenderingPrefs(IVMRFilterConfig *iface, DWORD renderflags) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, renderflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7FilterConfig_GetRenderingPrefs(IVMRFilterConfig *iface, DWORD *renderflags) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, renderflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7FilterConfig_SetRenderingMode(IVMRFilterConfig *iface, DWORD mode) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR7FilterConfig_GetRenderingMode(IVMRFilterConfig *iface, DWORD *mode) +{ + struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + + TRACE("(%p/%p)->(%p) stub\n", iface, This, mode); + if (!mode) return E_POINTER; + + if (This->mode) + *mode = This->mode; + else + *mode = VMRMode_Windowed; + + return S_OK; +} + +static const IVMRFilterConfigVtbl VMR7_FilterConfig_Vtbl = +{ + VMR7FilterConfig_QueryInterface, + VMR7FilterConfig_AddRef, + VMR7FilterConfig_Release, + VMR7FilterConfig_SetImageCompositor, + VMR7FilterConfig_SetNumberOfStreams, + VMR7FilterConfig_GetNumberOfStreams, + VMR7FilterConfig_SetRenderingPrefs, + VMR7FilterConfig_GetRenderingPrefs, + VMR7FilterConfig_SetRenderingMode, + VMR7FilterConfig_GetRenderingMode +}; + static HRESULT WINAPI VMR9FilterConfig_QueryInterface(IVMRFilterConfig9 *iface, REFIID riid, LPVOID * ppv) { struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface); @@ -1613,6 +1718,7 @@ static HRESULT vmr_create(IUnknown *outer_unk, LPVOID *ppv, const CLSID *clsid) pVMR->allocator = NULL; pVMR->presenter = NULL; pVMR->hWndClippingWindow = NULL; + pVMR->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; pVMR->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; pVMR->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &IVMRSurfaceAllocatorNotify9_Vtbl;

1 0

André Hentschel : quartz: Add stubbed IVMRWindowlessControl interface.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: e26d4a6f43dd508e81f7bfd15418cdcf087c98d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26d4a6f43dd508e81f7bfd15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 6 00:02:38 2013 +0100 quartz: Add stubbed IVMRWindowlessControl interface. --- dlls/quartz/vmr9.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 220 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e26d4a6f43dd508e81f7b…

1 0