February 2014 - Wine-Commits

Matteo Bruni : d3dx9: Don't call CoUninitialize if CoInitializeEx failed.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: 8226a187d63e3d355127cf1db830a4281132a598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8226a187d63e3d355127cf1db… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:49 2014 +0100 d3dx9: Don't call CoUninitialize if CoInitializeEx failed. --- dlls/d3dx9_36/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 94301e8..5e87d94 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1025,7 +1025,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, const RECT *pSrcRect, DWORD dwFilter, D3DCOLOR Colorkey, D3DXIMAGE_INFO *pSrcInfo) { D3DXIMAGE_INFO imginfo; - HRESULT hr; + HRESULT hr, com_init; IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder; @@ -1078,7 +1078,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, if (imginfo.ImageFileFormat == D3DXIFF_DIB) convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + com_init = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) goto cleanup_err; @@ -1181,7 +1181,8 @@ cleanup_err: if (factory) IWICImagingFactory_Release(factory); - CoUninitialize(); + if (SUCCEEDED(com_init)) + CoUninitialize(); if (imginfo.ImageFileFormat == D3DXIFF_DIB) HeapFree(GetProcessHeap(), 0, (void*)pSrcData);

1 0

Piotr Caban : qcap: Add Avi Mux IConfigInterleaving:: put_Interleaving implementation.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: e32a9afe65d042d2972da95dd603c6bf0acb0412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32a9afe65d042d2972da95dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 25 12:21:59 2014 +0100 qcap: Add Avi Mux IConfigInterleaving::put_Interleaving implementation. --- dlls/qcap/avimux.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 79e6368..4b3a443 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -55,6 +55,9 @@ typedef struct { ISpecifyPropertyPages ISpecifyPropertyPages_iface; InterleavingMode mode; + REFERENCE_TIME interleave; + REFERENCE_TIME preroll; + AviMuxOut *out; int input_pin_no; AviMuxIn *in[MAX_PIN_NO-1]; @@ -364,8 +367,14 @@ static HRESULT WINAPI ConfigInterleaving_put_Interleaving(IConfigInterleaving *i const REFERENCE_TIME *prtInterleave, const REFERENCE_TIME *prtPreroll) { AviMux *This = impl_from_IConfigInterleaving(iface); - FIXME("(%p)->(%p %p)\n", This, prtInterleave, prtPreroll); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, prtInterleave, prtPreroll); + + if(prtInterleave) + This->interleave = *prtInterleave; + if(prtPreroll) + This->preroll = *prtPreroll; + return S_OK; } static HRESULT WINAPI ConfigInterleaving_get_Interleaving(IConfigInterleaving *iface, @@ -1616,7 +1625,7 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) return NULL; } - avimux = HeapAlloc(GetProcessHeap(), 0, sizeof(AviMux)); + avimux = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AviMux)); if(!avimux) { *phr = E_OUTOFMEMORY; return NULL; @@ -1629,7 +1638,6 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) avimux->IMediaSeeking_iface.lpVtbl = &MediaSeekingVtbl; avimux->IPersistMediaPropertyBag_iface.lpVtbl = &PersistMediaPropertyBagVtbl; avimux->ISpecifyPropertyPages_iface.lpVtbl = &SpecifyPropertyPagesVtbl; - avimux->input_pin_no = 0; info.dir = PINDIR_OUTPUT; info.pFilter = &avimux->filter.IBaseFilter_iface; @@ -1653,6 +1661,8 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) return NULL; } + avimux->interleave = 10000000; + ObjectRefCount(TRUE); *phr = S_OK; return (IUnknown*)&avimux->filter.IBaseFilter_iface;

1 0

Matteo Bruni : d3dx9: Calling CommitChanges with no active pass silently returns.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: b86b3dfa4022a515df6b578b8ca42a6a68ea74fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86b3dfa4022a515df6b578b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:45 2014 +0100 d3dx9: Calling CommitChanges with no active pass silently returns. --- dlls/d3dx9_36/effect.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ac13c72..548d5ee 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3199,6 +3199,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) FIXME("(%p)->(): stub\n", This); + if (!This->active_pass) + { + WARN("Called without an active pass.\n"); + return D3D_OK; + } + return E_NOTIMPL; }

1 0

Matteo Bruni : d3dx9: Call D3DCompile() for ASCII effects.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: 62288d02bed7fdd30f50e73b0eda20a4c465fe25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62288d02bed7fdd30f50e73b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:46 2014 +0100 d3dx9: Call D3DCompile() for ASCII effects. --- dlls/d3dx9_36/effect.c | 76 ++++++++++++++++++++++++++++++------------ dlls/d3dx9_36/tests/effect.c | 14 ++++++-- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 548d5ee..61d6829 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -26,6 +26,7 @@ #include "windef.h" #include "wingdi.h" #include "d3dx9_36_private.h" +#include "d3dcompiler.h" /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f @@ -5188,11 +5189,13 @@ err_out: } static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, - const char *data, SIZE_T data_size, struct ID3DXEffectImpl *effect) + const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect) { DWORD tag, offset; const char *ptr = data; HRESULT hr; + ID3DBlob *bytecode = NULL, *temp_errors = NULL; TRACE("base %p, data %p, data_size %lu, effect %p\n", base, data, data_size, effect); @@ -5203,30 +5206,55 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, if (tag != d3dx9_effect_version(9, 1)) { - /* todo: compile hlsl ascii code */ - FIXME("HLSL ascii effects not supported, yet\n"); - - /* Show the start of the shader for debugging info. */ - TRACE("effect:\n%s\n", debugstr_an(data, data_size > 40 ? 40 : data_size)); - } - else - { - read_dword(&ptr, &offset); - TRACE("Offset: %x\n", offset); - - hr = d3dx9_parse_effect(base, ptr, data_size, offset); - if (hr != D3D_OK) + TRACE("HLSL ASCII effect, trying to compile it.\n"); + hr = D3DCompile(data, data_size, NULL, defines, include, + "main", "fx_2_0", 0, eflags, &bytecode, &temp_errors); + if (FAILED(hr)) { - FIXME("Failed to parse effect.\n"); + WARN("Failed to compile ASCII effect.\n"); + if (bytecode) + ID3D10Blob_Release(bytecode); + if (temp_errors) + TRACE("%s\n", (char *)ID3D10Blob_GetBufferPointer(temp_errors)); + if (errors) + *errors = temp_errors; + else if (temp_errors) + ID3D10Blob_Release(temp_errors); return hr; } + if (!bytecode) + { + FIXME("No output from effect compilation.\n"); + return D3DERR_INVALIDCALL; + } + if (errors) + *errors = temp_errors; + else if (temp_errors) + ID3D10Blob_Release(temp_errors); + + ptr = ID3D10Blob_GetBufferPointer(bytecode); + read_dword(&ptr, &tag); + TRACE("Tag: %x\n", tag); + } + + read_dword(&ptr, &offset); + TRACE("Offset: %x\n", offset); + + hr = d3dx9_parse_effect(base, ptr, data_size, offset); + if (bytecode) + ID3D10Blob_Release(bytecode); + if (hr != D3D_OK) + { + FIXME("Failed to parse effect.\n"); + return hr; } return D3D_OK; } static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9 *device, - const char *data, SIZE_T data_size, struct ID3DXEffectPool *pool) + const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool) { HRESULT hr; @@ -5241,7 +5269,8 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3 IDirect3DDevice9_AddRef(device); effect->device = device; - if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, effect))) + if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include, + eflags, error_messages, effect))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect(effect); @@ -5285,7 +5314,8 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (!object) return E_OUTOFMEMORY; - hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, pool); + hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, (const D3D_SHADER_MACRO *)defines, + (ID3DInclude *)include, flags, (ID3DBlob **)compilation_errors, pool); if (FAILED(hr)) { WARN("Failed to initialize shader reflection\n"); @@ -5310,7 +5340,9 @@ HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *src return D3DXCreateEffectEx(device, srcdata, srcdatalen, defines, include, NULL, flags, pool, effect, compilation_errors); } -static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compiler, const char *data, SIZE_T data_size) +static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compiler, + const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT eflags, ID3DBlob **error_messages) { HRESULT hr; @@ -5319,7 +5351,8 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil compiler->ID3DXEffectCompiler_iface.lpVtbl = &ID3DXEffectCompiler_Vtbl; compiler->ref = 1; - if (FAILED(hr = d3dx9_base_effect_init(&compiler->base_effect, data, data_size, NULL))) + if (FAILED(hr = d3dx9_base_effect_init(&compiler->base_effect, data, data_size, defines, + include, eflags, error_messages, NULL))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect_compiler(compiler); @@ -5348,7 +5381,8 @@ HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, co if (!object) return E_OUTOFMEMORY; - hr = d3dx9_effect_compiler_init(object, srcdata, srcdatalen); + hr = d3dx9_effect_compiler_init(object, srcdata, srcdatalen, (const D3D_SHADER_MACRO *)defines, + (ID3DInclude *)include, flags, (ID3DBlob **)parse_errors); if (FAILED(hr)) { WARN("Failed to initialize effect compiler\n"); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bc1ddbe..44f931c 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -156,7 +156,12 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); - ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + if (FAILED(hr)) + { + skip("Failed to compile effect, skipping test.\n"); + return; + } hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3DXBaseEffect, (void **)&base); ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x (E_NOINTERFACE)\n", hr, E_NOINTERFACE); @@ -265,7 +270,12 @@ static void test_create_effect_compiler(void) ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); hr = D3DXCreateEffectCompiler(effect_desc, 0, NULL, NULL, 0, &compiler, NULL); - ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + if (FAILED(hr)) + { + skip("D3DXCreateEffectCompiler failed, skipping test.\n"); + return; + } count = compiler->lpVtbl->Release(compiler); ok(count == 0, "Release failed %u\n", count);

1 0

Matteo Bruni : d3dx9: Kill a noisy TRACE.
by Alexandre Julliard Feb. 25, 2014

Feb. 25, 2014

Module: wine Branch: master Commit: 49604ca1b7bde7c6b2af778299d147f9bce08622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49604ca1b7bde7c6b2af77829… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 24 19:18:47 2014 +0100 d3dx9: Kill a noisy TRACE. --- dlls/d3dx9_36/util.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index bba8514..3b3f308 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -349,8 +349,6 @@ static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) { - TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); - if (outtype == intype) { *(DWORD *)outdata = *(DWORD *)indata;

1 0

Piotr Caban : qcap: Don't define IMemInputPin_iface in AviMuxIn structure.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 0ea378e101a8b89b31149d96fd9fc9ff6648b97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea378e101a8b89b31149d96f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:09:10 2014 +0100 qcap: Don't define IMemInputPin_iface in AviMuxIn structure. --- dlls/qcap/avimux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f39e003..fdc0e8e 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -42,7 +42,6 @@ typedef struct { typedef struct { BaseInputPin pin; IAMStreamControl IAMStreamControl_iface; - IMemInputPin IMemInputPin_iface; IPropertyBag IPropertyBag_iface; IQualityControl IQualityControl_iface; } AviMuxIn; @@ -1062,7 +1061,7 @@ static HRESULT WINAPI AviMuxIn_QueryInterface(IPin *iface, REFIID riid, void **p else if(IsEqualIID(riid, &IID_IAMStreamControl)) *ppv = &avimuxin->IAMStreamControl_iface; else if(IsEqualIID(riid, &IID_IMemInputPin)) - *ppv = &avimuxin->IMemInputPin_iface; + *ppv = &avimuxin->pin.IMemInputPin_iface; else if(IsEqualIID(riid, &IID_IPropertyBag)) *ppv = &avimuxin->IPropertyBag_iface; else if(IsEqualIID(riid, &IID_IQualityControl)) @@ -1317,7 +1316,8 @@ static const IAMStreamControlVtbl AviMuxIn_AMStreamControlVtbl = { static inline AviMuxIn* AviMuxIn_from_IMemInputPin(IMemInputPin *iface) { - return CONTAINING_RECORD(iface, AviMuxIn, IMemInputPin_iface); + BaseInputPin *bip = CONTAINING_RECORD(iface, BaseInputPin, IMemInputPin_iface); + return CONTAINING_RECORD(bip, AviMuxIn, pin); } static HRESULT WINAPI AviMuxIn_MemInputPin_QueryInterface( @@ -1540,8 +1540,8 @@ static HRESULT create_input_pin(AviMux *avimux) &AviMuxIn_BaseInputFuncTable, &avimux->filter.csFilter, NULL, (IPin**)&avimux->in[avimux->input_pin_no]); if(FAILED(hr)) return hr; + avimux->in[avimux->input_pin_no]->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; avimux->in[avimux->input_pin_no]->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; - avimux->in[avimux->input_pin_no]->IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; avimux->in[avimux->input_pin_no]->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; avimux->in[avimux->input_pin_no]->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl;

1 0

Jacek Caban : wmp: Added IOleControl stub implementation.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 6cbf44b5e67874618e260dd995e9c43e254921ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbf44b5e67874618e260dd99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:49 2014 +0100 wmp: Added IOleControl stub implementation. --- dlls/wmp/oleobj.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 1 + 2 files changed, 66 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index c081bf8..6f11d95 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -261,6 +261,9 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IWMPPlayer4)) { TRACE("(%p)->(IID_IWMPPlayer4 %p)\n", This, ppv); *ppv = &This->IWMPPlayer4_iface; + }else if(IsEqualGUID(riid, &IID_IOleControl)) { + TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); + *ppv = &This->IOleControl_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -645,6 +648,67 @@ static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { OleInPlaceObjectWindowless_GetDropTarget }; +static inline WindowsMediaPlayer *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IOleControl_iface); +} + +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, pCI); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%x)\n", This, freeze); + return E_NOTIMPL; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + static inline WindowsMediaPlayer *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, WindowsMediaPlayer, IProvideClassInfo2_iface); @@ -851,6 +915,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; wmp->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; wmp->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; + wmp->IOleControl_iface.lpVtbl = &OleControlVtbl; wmp->ref = 1; diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 11d4c22..0969dca 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -28,6 +28,7 @@ struct WindowsMediaPlayer { IPersistStreamInit IPersistStreamInit_iface; IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; IConnectionPointContainer IConnectionPointContainer_iface; + IOleControl IOleControl_iface; IWMPPlayer4 IWMPPlayer4_iface; LONG ref;

1 0

Jacek Caban : wmp: Added SetObjectRects implementation.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: ca589fc1e5b97214a98c190c161f6fd051f386ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca589fc1e5b97214a98c190c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:37 2014 +0100 wmp: Added SetObjectRects implementation. --- dlls/wmp/oleobj.c | 12 ++++++++++-- dlls/wmp/tests/oleobj.c | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 3dd2378..c081bf8 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -596,8 +596,16 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjec LPCRECT lprcPosRect, LPCRECT lprcClipRect) { WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); - FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); - return E_NOTIMPL; + + TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_rect(lprcPosRect), wine_dbgstr_rect(lprcClipRect)); + + if(This->hwnd) { + SetWindowPos(This->hwnd, NULL, lprcPosRect->left, lprcPosRect->top, + lprcPosRect->right-lprcPosRect->left, lprcPosRect->bottom-lprcPosRect->top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + return S_OK; } static HRESULT WINAPI OleInPlaceObjectWindowless_ReactivateAndUndo(IOleInPlaceObjectWindowless *iface) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 9e27d3b..e57913d 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -926,6 +926,15 @@ static void test_wmp(void) test_window(hwnd); + pos.left = 1; + pos.top = 2; + pos.right = 301; + pos.bottom = 312; + hres = IOleInPlaceObject_SetObjectRects(ipobj, &pos, &pos); + ok(hres == S_OK, "SetObjectRects failed: %08x\n", hres); + GetClientRect(hwnd, &pos); + test_rect_size(&pos, 300, 310); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, 0, container_hwnd, &pos); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); ok(!IsWindowVisible(hwnd), "Window is visible\n");

1 0

Piotr Caban : qcap: Add Avi Mux input pin IMemInputPin:: GetAllocatorRequirements implementation.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: d9f6a377be134a553d29132d7db4daa6c917f778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f6a377be134a553d29132d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:06:34 2014 +0100 qcap: Add Avi Mux input pin IMemInputPin::GetAllocatorRequirements implementation. --- dlls/qcap/avimux.c | 11 +++++++++-- dlls/qcap/tests/qcap.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index c5a16f8..f39e003 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1365,8 +1365,15 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_GetAllocatorRequirements( { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pProps); - return E_NOTIMPL; + + TRACE("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pProps); + + if(!pProps) + return E_POINTER; + + pProps->cbAlign = 1; + pProps->cbPrefix = 8; + return S_OK; } static HRESULT WINAPI AviMuxIn_MemInputPin_Receive( diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 83d38c8..162b17e 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1232,6 +1232,8 @@ static void test_AviMux(void) IBaseFilter *avimux; IEnumPins *ep; IEnumMediaTypes *emt; + IMemInputPin *memin; + ALLOCATOR_PROPERTIES props; HRESULT hr; init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); @@ -1336,6 +1338,21 @@ static void test_AviMux(void) CHECK_CALLED(NotifyAllocator); CHECK_CALLED(Reconnect); + hr = IPin_QueryInterface(avimux_in, &IID_IMemInputPin, (void**)&memin); + ok(hr == S_OK, "QueryInterface returned %x\n", hr); + + props.cBuffers = 0xdeadbee1; + props.cbBuffer = 0xdeadbee2; + props.cbAlign = 0xdeadbee3; + props.cbPrefix = 0xdeadbee4; + hr = IMemInputPin_GetAllocatorRequirements(memin, &props); + ok(hr == S_OK, "GetAllocatorRequirments returned %x\n", hr); + ok(props.cBuffers == 0xdeadbee1, "cBuffers = %d\n", props.cBuffers); + ok(props.cbBuffer == 0xdeadbee2, "cbBuffer = %d\n", props.cbBuffer); + ok(props.cbAlign == 1, "cbAlign = %d\n", props.cbAlign); + ok(props.cbPrefix == 8, "cbPrefix = %d\n", props.cbPrefix); + IMemInputPin_Release(memin); + hr = IPin_Disconnect(avimux_out); ok(hr == S_OK, "Disconnect returned %x\n", hr);

1 0

Piotr Caban : qcap: Add Avi Mux input pin IMemInputPin::GetAllocator.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 151a3eec9ac95fd84599aa2a4e8bddb5788010f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151a3eec9ac95fd84599aa2a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:10:27 2014 +0100 qcap: Add Avi Mux input pin IMemInputPin::GetAllocator. --- dlls/qcap/avimux.c | 18 ++++++++++++++++-- dlls/qcap/tests/qcap.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index fdc0e8e..555cc44 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1346,8 +1346,15 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_GetAllocator( { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), ppAllocator); - return E_NOTIMPL; + + TRACE("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), ppAllocator); + + if(!ppAllocator) + return E_POINTER; + + IMemAllocator_AddRef(avimuxin->pin.pAllocator); + *ppAllocator = avimuxin->pin.pAllocator; + return S_OK; } static HRESULT WINAPI AviMuxIn_MemInputPin_NotifyAllocator( @@ -1545,6 +1552,13 @@ static HRESULT create_input_pin(AviMux *avimux) avimux->in[avimux->input_pin_no]->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; avimux->in[avimux->input_pin_no]->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl; + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void**)&avimux->in[avimux->input_pin_no]->pin.pAllocator); + if(FAILED(hr)) { + BaseInputPinImpl_Release(&avimux->in[avimux->input_pin_no]->pin.pin.IPin_iface); + return hr; + } + avimux->input_pin_no++; return S_OK; } diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 162b17e..dff5bb8 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1234,6 +1234,7 @@ static void test_AviMux(void) IEnumMediaTypes *emt; IMemInputPin *memin; ALLOCATOR_PROPERTIES props; + IMemAllocator *memalloc; HRESULT hr; init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); @@ -1351,6 +1352,21 @@ static void test_AviMux(void) ok(props.cbBuffer == 0xdeadbee2, "cbBuffer = %d\n", props.cbBuffer); ok(props.cbAlign == 1, "cbAlign = %d\n", props.cbAlign); ok(props.cbPrefix == 8, "cbPrefix = %d\n", props.cbPrefix); + + hr = IMemInputPin_GetAllocator(memin, &memalloc); + ok(hr == S_OK, "GetAllocator returned %x\n", hr); + + props.cBuffers = 0xdeadbee1; + props.cbBuffer = 0xdeadbee2; + props.cbAlign = 0xdeadbee3; + props.cbPrefix = 0xdeadbee4; + hr = IMemAllocator_GetProperties(memalloc, &props); + ok(hr == S_OK, "GetProperties returned %x\n", hr); + ok(props.cBuffers == 0, "cBuffers = %d\n", props.cBuffers); + ok(props.cbBuffer == 0, "cbBuffer = %d\n", props.cbBuffer); + ok(props.cbAlign == 0, "cbAlign = %d\n", props.cbAlign); + ok(props.cbPrefix == 0, "cbPrefix = %d\n", props.cbPrefix); + IMemAllocator_Release(memalloc); IMemInputPin_Release(memin); hr = IPin_Disconnect(avimux_out);

1 0