December 2010 - Wine-Commits

Maarten Lankhorst : quartz: Remove default clock if the providing filter is removed from filtergraph.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

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 Dec. 6, 2010

Dec. 6, 2010

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

Maarten Lankhorst : quartz: Always update time when Run is called.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

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 : strmbase: Use advise functions in WaitFor.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: 3f9abe2c28bdfab7866b818d397681077430393c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9abe2c28bdfab7866b818d3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 6 14:16:44 2010 +0100 strmbase: Use advise functions in WaitFor. --- dlls/strmbase/qualitycontrol.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index ad6d942..5676a95 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -148,18 +148,11 @@ HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sam now -= This->clockstart; jitter = now - start; -#if 0 - /* AdviseTime is bugged, so don't use it at all */ - if (jitter < -200000) { + if (jitter <= -10000) { DWORD_PTR cookie; - IReferenceClock_AdviseTime(This->clock, clockstart, start, ev, &cookie); + IReferenceClock_AdviseTime(This->clock, This->clockstart, start, (HEVENT)ev, &cookie); WaitForSingleObject(ev, INFINITE); - IReferenceClock_Unadvise(This->clock, cookie); - } else -#endif - if (jitter < -10000) { - TRACE("Sleeping for %i ms\n", (int)-jitter/10000); - WaitForSingleObject(ev, -jitter/10000); + IReferenceClock_Unadvise(This->clock, cookie); } } else

1 0

Jacek Caban : mshtml: Added QuickActivation support.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: 410501e6c91397a91746d55e87d40acccb793e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=410501e6c91397a91746d55e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:49:00 2010 +0100 mshtml: Added QuickActivation support. --- dlls/mshtml/npplugin.c | 12 +++++++++- dlls/mshtml/pluginhost.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 2 + 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 1439d17..60f2125 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -303,8 +303,16 @@ static NPError CDECL NPP_Destroy(NPP instance, NPSavedData **save) static NPError CDECL NPP_SetWindow(NPP instance, NPWindow *window) { - FIXME("(%p %p)\n", instance, window); - return NPERR_GENERIC_ERROR; + PluginHost *host = instance->pdata; + RECT pos_rect = {0, 0, window->width, window->height}; + + TRACE("(%p %p)\n", instance, window); + + if(!host) + return NPERR_GENERIC_ERROR; + + update_plugin_window(host, window->window, &pos_rect); + return NPERR_NO_ERROR; } static NPError CDECL NPP_NewStream(NPP instance, NPMIMEType type, NPStream *stream, NPBool seekable, UINT16 *stype) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index b2f2f70..5b04399 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -36,6 +36,57 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static void activate_plugin(PluginHost *host) +{ + IClientSecurity *client_security; + IQuickActivate *quick_activate; + HRESULT hres; + + if(!host->plugin_unk) + return; + + /* Note native calls QI on plugin for an undocumented IID and CLSID_HTMLDocument */ + + /* FIXME: call FreezeEvents(TRUE) */ + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IClientSecurity, (void**)&client_security); + if(SUCCEEDED(hres)) { + FIXME("Handle IClientSecurity\n"); + IClientSecurity_Release(client_security); + return; + } + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IQuickActivate, (void**)&quick_activate); + if(SUCCEEDED(hres)) { + QACONTAINER container = {sizeof(container)}; + QACONTROL control = {sizeof(control)}; + + container.pClientSite = &host->IOleClientSite_iface; + container.dwAmbientFlags = QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE; + container.pAdviseSink = NULL; /* FIXME */ + container.pPropertyNotifySink = NULL; /* FIXME */ + + hres = IQuickActivate_QuickActivate(quick_activate, &container, &control); + if(FAILED(hres)) + FIXME("QuickActivate failed: %08x\n", hres); + }else { + FIXME("No IQuickActivate\n"); + } +} + +void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) +{ + if(!hwnd || (host->hwnd && host->hwnd != hwnd)) { + FIXME("unhandled hwnd\n"); + return; + } + + if(!host->hwnd) { + host->hwnd = hwnd; + activate_plugin(host); + } +} + static inline PluginHost *impl_from_IOleClientSite(IOleClientSite *iface) { return CONTAINING_RECORD(iface, PluginHost, IOleClientSite_iface); diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index a4624e3..5d53e08 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -24,6 +24,8 @@ typedef struct { LONG ref; IUnknown *plugin_unk; + HWND hwnd; } PluginHost; HRESULT create_plugin_host(IUnknown*,PluginHost**); +void update_plugin_window(PluginHost*,HWND,const RECT*);

1 0

Jacek Caban : mshtml: Added QuickActivate tests.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: c706bba6a83d75d39ffb7202819cbe6dc023cfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c706bba6a83d75d39ffb72028… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:48:42 2010 +0100 mshtml: Added QuickActivate tests. --- dlls/mshtml/tests/activex.c | 84 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index d62291a..dc3d903 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -59,6 +59,7 @@ DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(FreezeEvents_TRUE); DEFINE_EXPECT(FreezeEvents_FALSE); +DEFINE_EXPECT(QuickActivate); static HWND container_hwnd; @@ -142,6 +143,82 @@ static const IOleControlVtbl OleControlVtbl = { static IOleControl OleControl = { &OleControlVtbl }; +static HRESULT WINAPI QuickActivate_QueryInterface(IQuickActivate *iface, REFIID riid, void **ppv) +{ + return ax_qi(riid, ppv); +} + +static ULONG WINAPI QuickActivate_AddRef(IQuickActivate *iface) +{ + return 2; +} + +static ULONG WINAPI QuickActivate_Release(IQuickActivate *iface) +{ + return 1; +} + +static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTAINER *container, QACONTROL *control) +{ + CHECK_EXPECT(QuickActivate); + + 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"); + ok(!container->pUnkEventSink, "container->pUnkEventSink != NULL\n"); + ok(container->dwAmbientFlags == (QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE), + "container->dwAmbientFlags = %x\n", container->dwAmbientFlags); + ok(!container->colorFore, "container->colorFore == 0\n"); /* FIXME */ + todo_wine + ok(container->colorBack, "container->colorBack == 0\n"); /* FIXME */ + todo_wine + ok(container->pFont != NULL, "container->pFont == NULL\n"); + todo_wine + ok(container->pUndoMgr != NULL, "container->pUndoMgr == NULL\n"); + ok(!container->dwAppearance, "container->dwAppearance = %x\n", container->dwAppearance); + ok(!container->lcid, "container->lcid = %x\n", container->lcid); + ok(!container->hpal, "container->hpal = %p\n", container->hpal); + ok(!container->pBindHost, "container->pBindHost != NULL\n"); + ok(!container->pOleControlSite, "container->pOleControlSite != NULL\n"); + ok(!container->pServiceProvider, "container->pServiceProvider != NULL\n"); + + ok(control->cbSize == sizeof(*control), "control->cbSize = %d\n", control->cbSize); + ok(!control->dwMiscStatus, "control->dwMiscStatus = %x\n", control->dwMiscStatus); + ok(!control->dwViewStatus, "control->dwViewStatus = %x\n", control->dwViewStatus); + ok(!control->dwEventCookie, "control->dwEventCookie = %x\n", control->dwEventCookie); + ok(!control->dwPropNotifyCookie, "control->dwPropNotifyCookie = %x\n", control->dwPropNotifyCookie); + ok(!control->dwPointerActivationPolicy, "control->dwPointerActivationPolicy = %x\n", control->dwPointerActivationPolicy); + + return S_OK; +} + +static HRESULT WINAPI QuickActivate_SetContentExtent(IQuickActivate *iface, LPSIZEL pSizel) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI QuickActivate_GetContentExtent(IQuickActivate *iface, LPSIZEL pSizel) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IQuickActivateVtbl QuickActivateVtbl = { + QuickActivate_QueryInterface, + QuickActivate_AddRef, + QuickActivate_Release, + QuickActivate_QuickActivate, + QuickActivate_GetContentExtent, + QuickActivate_SetContentExtent +}; + +static IQuickActivate QuickActivate = { &QuickActivateVtbl }; + static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { @@ -149,6 +226,11 @@ static HRESULT ax_qi(REFIID riid, void **ppv) return S_OK; } + if(IsEqualGUID(riid, &IID_IQuickActivate)) { + *ppv = &QuickActivate; + return S_OK; + } + *ppv = NULL; return E_NOINTERFACE; } @@ -769,6 +851,7 @@ static void test_object_ax(void) */ SET_EXPECT(CreateInstance); SET_EXPECT(FreezeEvents_TRUE); + SET_EXPECT(QuickActivate); SET_EXPECT(FreezeEvents_FALSE); doc = create_doc(object_ax_str, &called_CreateInstance); @@ -776,6 +859,7 @@ static void test_object_ax(void) CHECK_CALLED(CreateInstance); todo_wine CHECK_CALLED(FreezeEvents_TRUE); + CHECK_CALLED(QuickActivate); todo_wine CHECK_CALLED(FreezeEvents_FALSE);

1 0

Jacek Caban : mshtml: Added PluginHost' s IOleControlSite stub implementation.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

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 IBindHost stub implementation.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

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 IOleControl calls test.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: 812330421ea9a337344668ecd34e293e491dcbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=812330421ea9a337344668ecd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:48:05 2010 +0100 mshtml: Added IOleControl calls test. --- dlls/mshtml/tests/activex.c | 82 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index f080c1d..d62291a 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -57,6 +57,8 @@ }while(0) DEFINE_EXPECT(CreateInstance); +DEFINE_EXPECT(FreezeEvents_TRUE); +DEFINE_EXPECT(FreezeEvents_FALSE); static HWND container_hwnd; @@ -84,6 +86,73 @@ static const char object_ax_str[] = "</object>" "</body></html>"; +static HRESULT ax_qi(REFIID,void**); + +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) +{ + return ax_qi(riid, ppv); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + return 2; +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + return 1; +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *mMsg) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL bFreeze) +{ + if(bFreeze) + CHECK_EXPECT2(FreezeEvents_TRUE); + else + CHECK_EXPECT2(FreezeEvents_FALSE); + return S_OK; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + +static IOleControl OleControl = { &OleControlVtbl }; + +static HRESULT ax_qi(REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { + *ppv = &OleControl; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -117,9 +186,12 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { CHECK_EXPECT(CreateInstance); + ok(!outer, "outer = %p\n", outer); ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid)); - return E_OUTOFMEMORY; + + *ppv = &OleControl; + return S_OK; } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -696,8 +768,16 @@ static void test_object_ax(void) * asynchronously and until we'll work around it, we need this hack. */ SET_EXPECT(CreateInstance); + SET_EXPECT(FreezeEvents_TRUE); + SET_EXPECT(FreezeEvents_FALSE); + doc = create_doc(object_ax_str, &called_CreateInstance); + CHECK_CALLED(CreateInstance); + todo_wine + CHECK_CALLED(FreezeEvents_TRUE); + todo_wine + CHECK_CALLED(FreezeEvents_FALSE); release_doc(doc); }

1 0

Jacek Caban : mshtml: Added plugin host' s IOleClientSite stub implementation.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: 5d0df14e77a2b64aa949925e2cd3b4e10ec03f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0df14e77a2b64aa949925e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:48:22 2010 +0100 mshtml: Added plugin host's IOleClientSite stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/npplugin.c | 23 ++++++- dlls/mshtml/pluginhost.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 29 ++++++++ 4 files changed, 212 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index cd06db9..a121909 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -62,6 +62,7 @@ C_SRCS = \ olewnd.c \ omnavigator.c \ persist.c \ + pluginhost.c \ protocol.c \ script.c \ secmgr.c \ diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index ba32205..1439d17 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -29,6 +29,7 @@ #include "shlobj.h" #include "mshtml_private.h" +#include "pluginhost.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -268,8 +269,16 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I obj = create_activex_object(window, nselem); if(obj) { - FIXME("Embed objet %p\n", obj); + PluginHost *host; + HRESULT hres; + + hres = create_plugin_host(obj, &host); + nsIDOMElement_Release(nselem); IUnknown_Release(obj); + if(SUCCEEDED(hres)) + instance->pdata = host; + else + err = NPERR_GENERIC_ERROR; }else { err = NPERR_GENERIC_ERROR; } @@ -280,8 +289,16 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I static NPError CDECL NPP_Destroy(NPP instance, NPSavedData **save) { - FIXME("(%p %p)\n", instance, save); - return NPERR_GENERIC_ERROR; + PluginHost *host = instance->pdata; + + TRACE("(%p %p)\n", instance, save); + + if(!host) + return NPERR_GENERIC_ERROR; + + IOleClientSite_Release(&host->IOleClientSite_iface); + instance->pdata = NULL; + return NPERR_NO_ERROR; } static NPError CDECL NPP_SetWindow(NPP instance, NPWindow *window) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c new file mode 100644 index 0000000..b2f2f70 --- /dev/null +++ b/dlls/mshtml/pluginhost.c @@ -0,0 +1,162 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "shlobj.h" + +#include "mshtml_private.h" +#include "pluginhost.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +static inline PluginHost *impl_from_IOleClientSite(IOleClientSite *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IOleClientSite_iface); +} + +static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IOleClientSite_iface; + }else if(IsEqualGUID(&IID_IOleClientSite, riid)) { + TRACE("(%p)->(IID_IOleClientSite %p)\n", This, ppv); + *ppv = &This->IOleClientSite_iface; + }else { + WARN("Unsupported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IOleClientSite_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PHClientSite_AddRef(IOleClientSite *iface) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI PHClientSite_Release(IOleClientSite *iface) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->plugin_unk) + IUnknown_Release(This->plugin_unk); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI PHClientSite_SaveObject(IOleClientSite *iface) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, + DWORD dwWhichMoniker, IMoniker **ppmk) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + FIXME("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + FIXME("(%p)->(%p)\n", This, ppContainer); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHClientSite_ShowObject(IOleClientSite *iface) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHClientSite_OnShowWindow(IOleClientSite *iface, BOOL fShow) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + FIXME("(%p)->(%x)\n", This, fShow); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHClientSite_RequestNewObjectLayout(IOleClientSite *iface) +{ + PluginHost *This = impl_from_IOleClientSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IOleClientSiteVtbl OleClientSiteVtbl = { + PHClientSite_QueryInterface, + PHClientSite_AddRef, + PHClientSite_Release, + PHClientSite_SaveObject, + PHClientSite_GetMoniker, + PHClientSite_GetContainer, + PHClientSite_ShowObject, + PHClientSite_OnShowWindow, + PHClientSite_RequestNewObjectLayout +}; + +HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) +{ + PluginHost *host; + + host = heap_alloc_zero(sizeof(*host)); + if(!host) + return E_OUTOFMEMORY; + + host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; + + host->ref = 1; + + IUnknown_AddRef(unk); + host->plugin_unk = unk; + + *ret = host; + return S_OK; +} diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h new file mode 100644 index 0000000..a4624e3 --- /dev/null +++ b/dlls/mshtml/pluginhost.h @@ -0,0 +1,29 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +typedef struct HTMLObjectElement HTMLObjectElement; + +typedef struct { + IOleClientSite IOleClientSite_iface; + + LONG ref; + + IUnknown *plugin_unk; +} PluginHost; + +HRESULT create_plugin_host(IUnknown*,PluginHost**);

1 0