December 2010 - Wine-commits

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 : 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 : strmbase: Use advise functions in WaitFor.
by Alexandre Julliard 06 Dec '10

06 Dec '10

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

Andrew Bogott : shdocvw: Add reading of iconfile and iconframe via IPersistFile.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 3d5b3bef8bb0fe96f7977eabc60e7888499a2567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5b3bef8bb0fe96f7977eabc… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Wed Nov 24 16:47:50 2010 -0600 shdocvw: Add reading of iconfile and iconframe via IPersistFile. --- dlls/shdocvw/intshcut.c | 124 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 100 insertions(+), 24 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index a335540..e400f0d 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -411,10 +411,37 @@ static HRESULT WINAPI PersistFile_IsDirty(IPersistFile *pFile) return This->isDirty ? S_OK : S_FALSE; } +/* A helper function: Allocate and fill rString. Return number of bytes read. */ +static DWORD get_profile_string(LPCWSTR lpAppName, LPCWSTR lpKeyName, + LPCWSTR lpFileName, WCHAR **rString ) +{ + DWORD r = 0; + DWORD len=128; + + *rString = CoTaskMemAlloc(len*sizeof(WCHAR)); + if (rString != NULL) + { + r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, *rString, len, lpFileName); + while (r == len-1) + { + CoTaskMemFree(rString); + len *= 2; + rString = CoTaskMemAlloc(len*sizeof(WCHAR)); + if (rString == NULL) + break; + r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, *rString, len, lpFileName); + } + } + + return r; +} + static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileName, DWORD dwMode) { WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; WCHAR str_URL[] = {'U','R','L',0}; + WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; + WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; WCHAR *filename = NULL; HRESULT hr; InternetShortcut *This = impl_from_IPersistFile(pFile); @@ -424,39 +451,88 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam filename = co_strdupW(pszFileName); if (filename != NULL) { - DWORD len = 128; DWORD r; - WCHAR *url = CoTaskMemAlloc(len*sizeof(WCHAR)); - if (url != NULL) + WCHAR *url; + + r = get_profile_string(str_header, str_URL, pszFileName, &url); + + if (r == 0) + { + hr = E_FAIL; + CoTaskMemFree(filename); + } + else if (url != NULL) + { + hr = S_OK; + CoTaskMemFree(This->currentFile); + This->currentFile = filename; + CoTaskMemFree(This->url); + This->url = url; + This->isDirty = FALSE; + } + else { - r = GetPrivateProfileStringW(str_header, str_URL, NULL, url, len, pszFileName); - while (r == len-1) + hr = E_OUTOFMEMORY; + CoTaskMemFree(filename); + } + + /* Now we're going to read in the iconfile and iconindex. + If we don't find them, that's not a failure case -- it's possible + that they just aren't in there. */ + if (SUCCEEDED(hr)) + { + IPropertyStorage *pPropStg; + WCHAR *iconfile; + WCHAR *iconindexstring; + hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, + &pPropStg); + + r = get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); + if (iconfile != NULL) { - CoTaskMemFree(url); - len *= 2; - url = CoTaskMemAlloc(len*sizeof(WCHAR)); - if (url == NULL) - break; - r = GetPrivateProfileStringW(str_header, str_URL, NULL, url, len, pszFileName); + PROPSPEC ps; + PROPVARIANT pv; + ps.ulKind = PRSPEC_PROPID; + ps.propid = PID_IS_ICONFILE; + pv.vt = VT_LPWSTR; + pv.pwszVal = iconfile; + hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); + if (FAILED(hr)) + { + TRACE("Failed to store the iconfile to our property storage. hr = 0x%x\n", hr); + } + + CoTaskMemFree(iconfile); } - if (r == 0) - hr = E_FAIL; - else if (url != NULL) + + r = get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); + + if (iconindexstring != NULL) { - CoTaskMemFree(This->currentFile); - This->currentFile = filename; - CoTaskMemFree(This->url); - This->url = url; - This->isDirty = FALSE; - return S_OK; + int iconindex; + PROPSPEC ps; + PROPVARIANT pv; + char *iconindexastring = co_strdupWtoA(iconindexstring); + sscanf(iconindexastring, "%d", &iconindex); + CoTaskMemFree(iconindexastring); + ps.ulKind = PRSPEC_PROPID; + ps.propid = PID_IS_ICONINDEX; + pv.vt = VT_I4; + pv.iVal = iconindex; + hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); + if (FAILED(hr)) + { + TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); + } + + CoTaskMemFree(iconfile); } - else - hr = E_OUTOFMEMORY; - CoTaskMemFree(url); + + IPropertyStorage_Release(pPropStg); } else hr = E_OUTOFMEMORY; - CoTaskMemFree(filename); } else hr = E_OUTOFMEMORY;

1 0

Jacek Caban : mshtml: Added IOleControl calls test.
by Alexandre Julliard 06 Dec '10

06 Dec '10

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 06 Dec '10

06 Dec '10

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

Jacek Caban : mshtml: Added QuickActivate tests.
by Alexandre Julliard 06 Dec '10

06 Dec '10

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 QuickActivation support.
by Alexandre Julliard 06 Dec '10

06 Dec '10

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 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

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