wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Maarten Lankhorst : winegstreamer: Always update time when Run is called.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: feb716b423095d11e3af9a87643887c436bde7cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb716b423095d11e3af9a876… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 6 14:16:43 2010 +0100 winegstreamer: Always update time when Run is called. --- dlls/winegstreamer/gstdemux.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 403f945..7b1c989 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1179,6 +1179,10 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) { if (!This->gstfilter) return VFW_E_NOT_CONNECTED; + EnterCriticalSection(&This->filter.csFilter); + This->filter.rtStreamStart = tStart; + LeaveCriticalSection(&This->filter.csFilter); + gst_element_get_state(This->gstfilter, &now, NULL, -1); if (now == GST_STATE_PLAYING) return S_OK;

1 0

Maarten Lankhorst : quartz: Always update time when Run is called.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: ab7986390a969c2c77b5a020e82d460508bdf96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7986390a969c2c77b5a020e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 6 14:16:42 2010 +0100 quartz: Always update time when Run is called. --- dlls/quartz/nullrenderer.c | 2 +- dlls/quartz/parser.c | 3 +-- dlls/quartz/videorenderer.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 7656927..cdc7621 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -345,11 +345,11 @@ static HRESULT WINAPI NullRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tStar TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->filter.csFilter); + This->filter.rtStreamStart = tStart; if (This->filter.state == State_Running) goto out; if (This->pInputPin->pin.pConnectedTo) { - This->filter.rtStreamStart = tStart; This->pInputPin->end_of_stream = 0; } else if (This->filter.filterInfo.pGraph) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index cf4a260..354d78f 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -304,6 +304,7 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { HRESULT hr_any = VFW_E_NOT_CONNECTED; + This->filter.rtStreamStart = tStart; if (This->filter.state == State_Running || This->filter.state == State_Paused) { This->filter.state = State_Running; @@ -312,8 +313,6 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) return S_OK; } - This->filter.rtStreamStart = tStart; - for (i = 1; i < (This->cStreams + 1); i++) { hr = BaseOutputPinImpl_Active((BaseOutputPin *)This->ppPins[i]); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 8f492cf..6f2a860 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -832,9 +832,9 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->filter.csFilter); + This->filter.rtStreamStart = tStart; if (This->filter.state == State_Running) goto out; - This->filter.rtStreamStart = tStart; QualityControlRender_Start(&This->qcimpl, tStart); if (This->pInputPin->pin.pConnectedTo && (This->filter.state == State_Stopped || !This->pInputPin->end_of_stream)) {

1 0

Maarten Lankhorst : quartz: Remove default clock if the providing filter is removed from filtergraph.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 804a9d14c96ae14634a26a0d095119105b43deb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=804a9d14c96ae14634a26a0d0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 6 14:16:41 2010 +0100 quartz: Remove default clock if the providing filter is removed from filtergraph. --- dlls/quartz/filtergraph.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ef398cb..50a045e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -184,6 +184,7 @@ typedef struct _IFilterGraphImpl { int filterCapacity; LONG nameIndex; IReferenceClock *refClock; + IBaseFilter *refClockProvider; EventsQueue evqueue; HANDLE hEventCompletion; int CompletionStatus; @@ -484,6 +485,12 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IEnumPins *penumpins = NULL; FILTER_STATE state; + if (This->defaultclock && This->refClockProvider == pFilter) + { + IMediaFilter_SetSyncSource((IMediaFilter*)&This->IMediaFilter_vtbl, NULL); + This->defaultclock = 1; + } + TRACE("Removing filter %s\n", debugstr_w(This->pFilterNames[i])); IBaseFilter_GetState(pFilter, 0, &state); if (state == State_Running) @@ -781,7 +788,12 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) { } if (!pClock) + { hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&pClock); + This->refClockProvider = NULL; + } + else + This->refClockProvider = This->ppFiltersInGraph[i]; if (SUCCEEDED(hr)) { @@ -5485,6 +5497,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->notif.disabled = FALSE; fimpl->nRenderers = 0; fimpl->EcCompleteCount = 0; + fimpl->refClockProvider = NULL; fimpl->state = State_Stopped; EventsQueue_Init(&fimpl->evqueue); InitializeCriticalSection(&fimpl->cs);

1 0

Jacek Caban : mshtml: Added PluginHost' s IServiceProvider stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: c12d9ff8d7f1209fb76b405113b278407de57337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12d9ff8d7f1209fb76b40511… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:51:20 2010 +0100 mshtml: Added PluginHost's IServiceProvider stub implementation. --- dlls/mshtml/pluginhost.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 1 + 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index f652b82..e7f39d8 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -129,6 +129,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IBindHost, riid)) { TRACE("(%p)->(IID_IBindHost %p)\n", This, ppv); *ppv = &This->IBindHost_iface; + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -691,6 +694,43 @@ static const IBindHostVtbl BindHostVtbl = { PHBindHost_MonikerBindToObject }; +static inline PluginHost *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IServiceProvider_iface); +} + +static HRESULT WINAPI PHServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IServiceProvider(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHServiceProvider_AddRef(IServiceProvider *iface) +{ + PluginHost *This = impl_from_IServiceProvider(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHServiceProvider_Release(IServiceProvider *iface) +{ + PluginHost *This = impl_from_IServiceProvider(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IServiceProvider(iface); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + PHServiceProvider_QueryInterface, + PHServiceProvider_AddRef, + PHServiceProvider_Release, + PHServiceProvider_QueryService +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -706,6 +746,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; host->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl; host->IBindHost_iface.lpVtbl = &BindHostVtbl; + host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 2e87ea3..2b66696 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -26,6 +26,7 @@ typedef struct { IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; IOleControlSite IOleControlSite_iface; IBindHost IBindHost_iface; + IServiceProvider IServiceProvider_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 51a6b84..9984ae0 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -98,6 +98,7 @@ static const REFIID pluginhost_iids[] = { &IID_IOleInPlaceSiteEx, &IID_IOleControlSite, &IID_IBindHost, + &IID_IServiceProvider, NULL };

1 0

Jacek Caban : mshtml: Added PluginHost's IBindHost stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 4479194e48dfa55c2f277db0a1f8ef8c753aca6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4479194e48dfa55c2f277db0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:51:05 2010 +0100 mshtml: Added PluginHost's IBindHost stub implementation. --- dlls/mshtml/pluginhost.c | 59 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 1 + 3 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 4b8f1b1..f652b82 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -126,6 +126,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IOleControlSite, riid)) { TRACE("(%p)->(IID_IOleControlSite %p)\n", This, ppv); *ppv = &This->IOleControlSite_iface; + }else if(IsEqualGUID(&IID_IBindHost, riid)) { + TRACE("(%p)->(IID_IBindHost %p)\n", This, ppv); + *ppv = &This->IBindHost_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -633,6 +636,61 @@ static const IOleControlSiteVtbl OleControlSiteVtbl = { PHControlSite_ShowPropertyFrame }; +static inline PluginHost *impl_from_IBindHost(IBindHost *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IBindHost_iface); +} + +static HRESULT WINAPI PHBindHost_QueryInterface(IBindHost *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IBindHost(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHBindHost_AddRef(IBindHost *iface) +{ + PluginHost *This = impl_from_IBindHost(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHBindHost_Release(IBindHost *iface) +{ + PluginHost *This = impl_from_IBindHost(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHBindHost_CreateMoniker(IBindHost *iface, LPOLESTR szName, IBindCtx *pBC, IMoniker **ppmk, DWORD dwReserved) +{ + PluginHost *This = impl_from_IBindHost(iface); + FIXME("(%p)->(%s %p %p %x)\n", This, debugstr_w(szName), pBC, ppmk, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHBindHost_MonikerBindToStorage(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC, + IBindStatusCallback *pBSC, REFIID riid, void **ppvObj) +{ + PluginHost *This = impl_from_IBindHost(iface); + FIXME("(%p)->(%p %p %p %s %p)\n", This, pMk, pBC, pBSC, debugstr_guid(riid), ppvObj); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHBindHost_MonikerBindToObject(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC, + IBindStatusCallback *pBSC, REFIID riid, void **ppvObj) +{ + PluginHost *This = impl_from_IBindHost(iface); + FIXME("(%p)->(%p %p %p %s %p)\n", This, pMk, pBC, pBSC, debugstr_guid(riid), ppvObj); + return E_NOTIMPL; +} + +static const IBindHostVtbl BindHostVtbl = { + PHBindHost_QueryInterface, + PHBindHost_AddRef, + PHBindHost_Release, + PHBindHost_CreateMoniker, + PHBindHost_MonikerBindToStorage, + PHBindHost_MonikerBindToObject +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -647,6 +705,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IDispatch_iface.lpVtbl = &DispatchVtbl; host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; host->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl; + host->IBindHost_iface.lpVtbl = &BindHostVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 316ce57..2e87ea3 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -25,6 +25,7 @@ typedef struct { IDispatch IDispatch_iface; IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; IOleControlSite IOleControlSite_iface; + IBindHost IBindHost_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index aa8c0e1..51a6b84 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -97,6 +97,7 @@ static const REFIID pluginhost_iids[] = { &IID_IOleInPlaceSite, &IID_IOleInPlaceSiteEx, &IID_IOleControlSite, + &IID_IBindHost, NULL };

1 0

Jacek Caban : mshtml: Added PluginHost' s IOleControlSite stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: dc062aee5a18e0884cd19157d738acca21bb2675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc062aee5a18e0884cd19157d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:50:52 2010 +0100 mshtml: Added PluginHost's IOleControlSite stub implementation. --- dlls/mshtml/pluginhost.c | 89 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 1 + 3 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index db11c02..4b8f1b1 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -123,6 +123,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IOleInPlaceSiteEx, riid)) { TRACE("(%p)->(IID_IOleInPlaceSiteEx %p)\n", This, ppv); *ppv = &This->IOleInPlaceSiteEx_iface; + }else if(IsEqualGUID(&IID_IOleControlSite, riid)) { + TRACE("(%p)->(IID_IOleControlSite %p)\n", This, ppv); + *ppv = &This->IOleControlSite_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -545,6 +548,91 @@ static const IOleInPlaceSiteExVtbl OleInPlaceSiteExVtbl = { PHInPlaceSiteEx_RequestUIActivate }; +static inline PluginHost *impl_from_IOleControlSite(IOleControlSite *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IOleControlSite_iface); +} + +static HRESULT WINAPI PHControlSite_QueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHControlSite_AddRef(IOleControlSite *iface) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHControlSite_Release(IOleControlSite *iface) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHControlSite_OnControlInfoChanged(IOleControlSite *iface) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_LockInPlaceActive(IOleControlSite *iface, BOOL fLock) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%x)\n", This, fLock); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_GetExtendedControl(IOleControlSite *iface, IDispatch **ppDisp) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%p)\n", This, ppDisp); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_TransformCoords(IOleControlSite *iface, POINTL *pPtlHimetric, POINTF *pPtfContainer, DWORD dwFlags) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%p %p %x)\n", This, pPtlHimetric, pPtfContainer, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_TranslateAccelerator(IOleControlSite *iface, MSG *pMsg, DWORD grfModifiers) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%x)\n", This, grfModifiers); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_OnFocus(IOleControlSite *iface, BOOL fGotFocus) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%x)\n", This, fGotFocus); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_ShowPropertyFrame(IOleControlSite *iface) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IOleControlSiteVtbl OleControlSiteVtbl = { + PHControlSite_QueryInterface, + PHControlSite_AddRef, + PHControlSite_Release, + PHControlSite_OnControlInfoChanged, + PHControlSite_LockInPlaceActive, + PHControlSite_GetExtendedControl, + PHControlSite_TransformCoords, + PHControlSite_TranslateAccelerator, + PHControlSite_OnFocus, + PHControlSite_ShowPropertyFrame +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -558,6 +646,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; host->IDispatch_iface.lpVtbl = &DispatchVtbl; host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; + host->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 077cf0c..316ce57 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -24,6 +24,7 @@ typedef struct { IPropertyNotifySink IPropertyNotifySink_iface; IDispatch IDispatch_iface; IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; + IOleControlSite IOleControlSite_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 3842bbd..aa8c0e1 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -96,6 +96,7 @@ static const REFIID pluginhost_iids[] = { &IID_IOleWindow, &IID_IOleInPlaceSite, &IID_IOleInPlaceSiteEx, + &IID_IOleControlSite, NULL };

1 0

Jacek Caban : mshtml: Added PluginHost' s IOleInPlaceSite stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 890dc6d6a05354991c832d5767228f083a01ae43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890dc6d6a05354991c832d576… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:50:35 2010 +0100 mshtml: Added PluginHost's IOleInPlaceSite stub implementation. --- dlls/mshtml/pluginhost.c | 161 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 3 + 3 files changed, 165 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7e0dd0c..db11c02 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -114,6 +114,15 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IDispatch_iface; + }else if(IsEqualGUID(&IID_IOleWindow, riid)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = &This->IOleInPlaceSiteEx_iface; + }else if(IsEqualGUID(&IID_IOleInPlaceSite, riid)) { + TRACE("(%p)->(IID_IOleInPlaceSite %p)\n", This, ppv); + *ppv = &This->IOleInPlaceSiteEx_iface; + }else if(IsEqualGUID(&IID_IOleInPlaceSiteEx, riid)) { + TRACE("(%p)->(IID_IOleInPlaceSiteEx %p)\n", This, ppv); + *ppv = &This->IOleInPlaceSiteEx_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -385,6 +394,157 @@ static const IDispatchVtbl DispatchVtbl = { PHDispatch_Invoke }; +static inline PluginHost *impl_from_IOleInPlaceSiteEx(IOleInPlaceSiteEx *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IOleInPlaceSiteEx_iface); +} + +static HRESULT WINAPI PHInPlaceSite_QueryInterface(IOleInPlaceSiteEx *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHInPlaceSite_AddRef(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHInPlaceSite_Release(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHInPlaceSite_GetWindow(IOleInPlaceSiteEx *iface, HWND *phwnd) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *iface, BOOL fEnterMode) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_CanInPlaceActivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnUIActivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface, + IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, RECT *lprcPosRect, + RECT *lprcClipRect, OLEINPLACEFRAMEINFO *frame_info) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%p %p %p %p %p)\n", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, frame_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_Scroll(IOleInPlaceSiteEx *iface, SIZE scrollExtent) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->({%d %d})\n", This, scrollExtent.cx, scrollExtent.cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnUIDeactivate(IOleInPlaceSiteEx *iface, BOOL fUndoable) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%x)\n", This, fUndoable); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnInPlaceDeactivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_DiscardUndoState(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_DeactivateAndUndo(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnPosRectChange(IOleInPlaceSiteEx *iface, LPCRECT lprcPosRect) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%p)\n", This, lprcPosRect); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSiteEx_OnInPlaceActivateEx(IOleInPlaceSiteEx *iface, BOOL *pfNoRedraw, DWORD dwFlags) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%p %x)\n", This, pfNoRedraw, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSiteEx_OnInPlaceDeactivateEx(IOleInPlaceSiteEx *iface, BOOL fNoRedraw) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%x)\n", This, fNoRedraw); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSiteEx_RequestUIActivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IOleInPlaceSiteExVtbl OleInPlaceSiteExVtbl = { + PHInPlaceSite_QueryInterface, + PHInPlaceSite_AddRef, + PHInPlaceSite_Release, + PHInPlaceSite_GetWindow, + PHInPlaceSite_ContextSensitiveHelp, + PHInPlaceSite_CanInPlaceActivate, + PHInPlaceSite_OnInPlaceActivate, + PHInPlaceSite_OnUIActivate, + PHInPlaceSite_GetWindowContext, + PHInPlaceSite_Scroll, + PHInPlaceSite_OnUIDeactivate, + PHInPlaceSite_OnInPlaceDeactivate, + PHInPlaceSite_DiscardUndoState, + PHInPlaceSite_DeactivateAndUndo, + PHInPlaceSite_OnPosRectChange, + PHInPlaceSiteEx_OnInPlaceActivateEx, + PHInPlaceSiteEx_OnInPlaceDeactivateEx, + PHInPlaceSiteEx_RequestUIActivate +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -397,6 +557,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; host->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; host->IDispatch_iface.lpVtbl = &DispatchVtbl; + host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 4965d9a..077cf0c 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -23,6 +23,7 @@ typedef struct { IAdviseSinkEx IAdviseSinkEx_iface; IPropertyNotifySink IPropertyNotifySink_iface; IDispatch IDispatch_iface; + IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 55e4952..3842bbd 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -93,6 +93,9 @@ static const REFIID pluginhost_iids[] = { &IID_IAdviseSinkEx, &IID_IPropertyNotifySink, &IID_IDispatch, + &IID_IOleWindow, + &IID_IOleInPlaceSite, + &IID_IOleInPlaceSiteEx, NULL };

1 0

Jacek Caban : mshtml: Added PluginHost's IDispatch stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 06aa58f44be8d2d0fde3eb91fb27089a3e45b37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=06aa58f44be8d2d0fde3eb91f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:50:12 2010 +0100 mshtml: Added PluginHost's IDispatch stub implementation. --- dlls/mshtml/pluginhost.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 37 +++++++++++++++++++++++ 3 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7853899..7e0dd0c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -111,6 +111,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppv); *ppv = &This->IPropertyNotifySink_iface; + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = &This->IDispatch_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -318,6 +321,70 @@ static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PHPropertyNotifySink_OnRequestEdit }; +static inline PluginHost *impl_from_IDispatch(IDispatch *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IDispatch_iface); +} + +static HRESULT WINAPI PHDispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IDispatch(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHDispatch_AddRef(IDispatch *iface) +{ + PluginHost *This = impl_from_IDispatch(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHDispatch_Release(IDispatch *iface) +{ + PluginHost *This = impl_from_IDispatch(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + PluginHost *This = impl_from_IDispatch(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHDispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + PluginHost *This = impl_from_IDispatch(iface); + FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + PluginHost *This = impl_from_IDispatch(iface); + FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHDispatch_Invoke(IDispatch *iface, DISPID dispid, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + PluginHost *This = impl_from_IDispatch(iface); + FIXME("(%p)->(%d %x %p %p)\n", This, dispid, wFlags, pDispParams, pVarResult); + return E_NOTIMPL; +} + +static const IDispatchVtbl DispatchVtbl = { + PHDispatch_QueryInterface, + PHDispatch_AddRef, + PHDispatch_Release, + PHDispatch_GetTypeInfoCount, + PHDispatch_GetTypeInfo, + PHDispatch_GetIDsOfNames, + PHDispatch_Invoke +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -329,6 +396,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; host->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; + host->IDispatch_iface.lpVtbl = &DispatchVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 236587a..4965d9a 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -22,6 +22,7 @@ typedef struct { IOleClientSite IOleClientSite_iface; IAdviseSinkEx IAdviseSinkEx_iface; IPropertyNotifySink IPropertyNotifySink_iface; + IDispatch IDispatch_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 4682c11..55e4952 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -87,6 +87,27 @@ static const char object_ax_str[] = "</object>" "</body></html>"; +static const REFIID pluginhost_iids[] = { + &IID_IOleClientSite, + &IID_IAdviseSink, + &IID_IAdviseSinkEx, + &IID_IPropertyNotifySink, + &IID_IDispatch, + NULL +}; + +static const char *dbgstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) { IUnknown *unk1, *unk2; @@ -102,6 +123,21 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } +#define test_ifaces(i,ids) _test_ifaces(__LINE__,i,ids) +static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) +{ + const IID * const *piid; + IUnknown *unk; + HRESULT hres; + + for(piid = iids; *piid; piid++) { + hres = IDispatch_QueryInterface(iface, *piid, (void**)&unk); + ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08x\n", dbgstr_guid(*piid), hres); + if(SUCCEEDED(hres)) + IUnknown_Release(unk); + } +} + static HRESULT ax_qi(REFIID,void**); static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) @@ -210,6 +246,7 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA "container->pClientSite != container->pAdviseSink\n"); ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pPropertyNotifySink), "container->pClientSite != container->pPropertyNotifySink\n"); + test_ifaces((IUnknown*)container->pClientSite, pluginhost_iids); return S_OK; }

1 0

Jacek Caban : mshtml: Added PluginHost' s IPropertyNotifySink stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: ec29487f1239f8f1f8315cee7e87fe5b92d5f5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec29487f1239f8f1f8315cee7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:49:49 2010 +0100 mshtml: Added PluginHost's IPropertyNotifySink stub implementation. --- dlls/mshtml/pluginhost.c | 55 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 3 +- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 1111071..7853899 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -64,7 +64,7 @@ static void activate_plugin(PluginHost *host) container.pClientSite = &host->IOleClientSite_iface; container.dwAmbientFlags = QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE; container.pAdviseSink = &host->IAdviseSinkEx_iface; - container.pPropertyNotifySink = NULL; /* FIXME */ + container.pPropertyNotifySink = &host->IPropertyNotifySink_iface; hres = IQuickActivate_QuickActivate(quick_activate, &container, &control); if(FAILED(hres)) @@ -108,6 +108,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IAdviseSinkEx, riid)) { TRACE("(%p)->(IID_IAdviseSinkEx %p)\n", This, ppv); *ppv = &This->IAdviseSinkEx_iface; + }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppv); + *ppv = &This->IPropertyNotifySink_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -270,6 +273,51 @@ static const IAdviseSinkExVtbl AdviseSinkExVtbl = { PHAdviseSinkEx_OnViewStatusChange }; +static inline PluginHost *impl_from_IPropertyNotifySink(IPropertyNotifySink *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IPropertyNotifySink_iface); +} + +static HRESULT WINAPI PHPropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHPropertyNotifySink_AddRef(IPropertyNotifySink *iface) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHPropertyNotifySink_Release(IPropertyNotifySink *iface) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHPropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHPropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { + PHPropertyNotifySink_QueryInterface, + PHPropertyNotifySink_AddRef, + PHPropertyNotifySink_Release, + PHPropertyNotifySink_OnChanged, + PHPropertyNotifySink_OnRequestEdit +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -278,8 +326,9 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) if(!host) return E_OUTOFMEMORY; - host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; - host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; + host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; + host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; + host->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 91c6323..236587a 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -21,6 +21,7 @@ typedef struct HTMLObjectElement HTMLObjectElement; typedef struct { IOleClientSite IOleClientSite_iface; IAdviseSinkEx IAdviseSinkEx_iface; + IPropertyNotifySink IPropertyNotifySink_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 384b738..4682c11 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -181,7 +181,6 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(container->cbSize == sizeof(*container), "container->cbSize = %d\n", container->cbSize); ok(container->pClientSite != NULL, "container->pClientSite == NULL\n"); ok(container->pAdviseSink != NULL, "container->pAdviseSink == NULL\n"); - todo_wine ok(container->pPropertyNotifySink != NULL, "container->pPropertyNotifySink == NULL\n"); ok(!container->pUnkEventSink, "container->pUnkEventSink != NULL\n"); ok(container->dwAmbientFlags == (QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE), @@ -209,6 +208,8 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pAdviseSink), "container->pClientSite != container->pAdviseSink\n"); + ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pPropertyNotifySink), + "container->pClientSite != container->pPropertyNotifySink\n"); return S_OK; }

1 0

Jacek Caban : mshtml: Added PluginHost's IAdviseSinkEx stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 546f4bf5e3c87690a2638efa916f3f542d74c106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546f4bf5e3c87690a2638efa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:49:16 2010 +0100 mshtml: Added PluginHost's IAdviseSinkEx stub implementation. --- dlls/mshtml/pluginhost.c | 80 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 19 ++++++++++- 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 5b04399..1111071 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -63,7 +63,7 @@ static void activate_plugin(PluginHost *host) container.pClientSite = &host->IOleClientSite_iface; container.dwAmbientFlags = QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE; - container.pAdviseSink = NULL; /* FIXME */ + container.pAdviseSink = &host->IAdviseSinkEx_iface; container.pPropertyNotifySink = NULL; /* FIXME */ hres = IQuickActivate_QuickActivate(quick_activate, &container, &control); @@ -102,6 +102,12 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IOleClientSite, riid)) { TRACE("(%p)->(IID_IOleClientSite %p)\n", This, ppv); *ppv = &This->IOleClientSite_iface; + }else if(IsEqualGUID(&IID_IAdviseSink, riid)) { + TRACE("(%p)->(IID_IAdviseSink %p)\n", This, ppv); + *ppv = &This->IAdviseSinkEx_iface; + }else if(IsEqualGUID(&IID_IAdviseSinkEx, riid)) { + TRACE("(%p)->(IID_IAdviseSinkEx %p)\n", This, ppv); + *ppv = &This->IAdviseSinkEx_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -193,6 +199,77 @@ static const IOleClientSiteVtbl OleClientSiteVtbl = { PHClientSite_RequestNewObjectLayout }; +static inline PluginHost *impl_from_IAdviseSinkEx(IAdviseSinkEx *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IAdviseSinkEx_iface); +} + +static HRESULT WINAPI PHAdviseSinkEx_QueryInterface(IAdviseSinkEx *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHAdviseSinkEx_AddRef(IAdviseSinkEx *iface) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHAdviseSinkEx_Release(IAdviseSinkEx *iface) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static void WINAPI PHAdviseSinkEx_OnDataChange(IAdviseSinkEx *iface, FORMATETC *pFormatetc, STGMEDIUM *pStgMedium) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)->(%p %p)\n", This, pFormatetc, pStgMedium); +} + +static void WINAPI PHAdviseSinkEx_OnViewChange(IAdviseSinkEx *iface, DWORD dwAspect, LONG lindex) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)->(%d %d)\n", This, dwAspect, lindex); +} + +static void WINAPI PHAdviseSinkEx_OnRename(IAdviseSinkEx *iface, IMoniker *pmk) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)->(%p)\n", This, pmk); +} + +static void WINAPI PHAdviseSinkEx_OnSave(IAdviseSinkEx *iface) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)\n", This); +} + +static void WINAPI PHAdviseSinkEx_OnClose(IAdviseSinkEx *iface) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)\n", This); +} + +static void WINAPI PHAdviseSinkEx_OnViewStatusChange(IAdviseSinkEx *iface, DWORD dwViewStatus) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)->(%d)\n", This, dwViewStatus); +} + +static const IAdviseSinkExVtbl AdviseSinkExVtbl = { + PHAdviseSinkEx_QueryInterface, + PHAdviseSinkEx_AddRef, + PHAdviseSinkEx_Release, + PHAdviseSinkEx_OnDataChange, + PHAdviseSinkEx_OnViewChange, + PHAdviseSinkEx_OnRename, + PHAdviseSinkEx_OnSave, + PHAdviseSinkEx_OnClose, + PHAdviseSinkEx_OnViewStatusChange +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -202,6 +279,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) return E_OUTOFMEMORY; host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; + host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 5d53e08..91c6323 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -20,6 +20,7 @@ typedef struct HTMLObjectElement HTMLObjectElement; typedef struct { IOleClientSite IOleClientSite_iface; + IAdviseSinkEx IAdviseSinkEx_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index dc3d903..384b738 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -87,6 +87,21 @@ static const char object_ax_str[] = "</object>" "</body></html>"; +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + + if(iface1 == iface2) + return TRUE; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_Release(unk1); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + IUnknown_Release(unk2); + + return unk1 == unk2; +} + static HRESULT ax_qi(REFIID,void**); static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) @@ -165,7 +180,6 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(container != NULL, "container == NULL\n"); ok(container->cbSize == sizeof(*container), "container->cbSize = %d\n", container->cbSize); ok(container->pClientSite != NULL, "container->pClientSite == NULL\n"); - todo_wine ok(container->pAdviseSink != NULL, "container->pAdviseSink == NULL\n"); todo_wine ok(container->pPropertyNotifySink != NULL, "container->pPropertyNotifySink == NULL\n"); @@ -193,6 +207,9 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(!control->dwPropNotifyCookie, "control->dwPropNotifyCookie = %x\n", control->dwPropNotifyCookie); ok(!control->dwPointerActivationPolicy, "control->dwPointerActivationPolicy = %x\n", control->dwPointerActivationPolicy); + ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pAdviseSink), + "container->pClientSite != container->pAdviseSink\n"); + return S_OK; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010