December 2010 - Wine-commits

André Hentschel : Wine 1.3.9 freigegeben
by Jeremy Newman 13 Dec '10

13 Dec '10

Module: website Branch: master Commit: c76dcfea550b771c41737a6998081ec82599a1cb URL: http://source.winehq.org/git/website.git/?a=commit;h=c76dcfea550b771c41737a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 12 20:34:56 2010 +0100 Wine 1.3.9 freigegeben --- news/de/2010121001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2010121001.xml b/news/de/2010121001.xml new file mode 100644 index 0000000..558efa3 --- /dev/null +++ b/news/de/2010121001.xml @@ -0,0 +1,18 @@ +<news> +<date>10. Dezember 2010</date> +<title>Wine 1.3.9 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfängliche Unterstützung für ActiveX im eigenen Browser.</li> + <li>Icons für Internetverknüpfungen im Menü.</li> + <li>Standardisierung von COM Schnittstellencode.</li> + <li>DLL Registrierungen nach einem neuen Schema.</li> + <li>OpenCL Bibliotheks Wrapper.</li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.9.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.9
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: website Branch: master Commit: d18327a915585f4aec40158f5606f1d95a8d7700 URL: http://source.winehq.org/git/website.git/?a=commit;h=d18327a915585f4aec4015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 20:43:34 2010 +0100 Wine release 1.3.9 --- news/en/2010121001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2010121001.xml b/news/en/2010121001.xml new file mode 100644 index 0000000..c4624b2 --- /dev/null +++ b/news/en/2010121001.xml @@ -0,0 +1,18 @@ +<news> +<date>December 10, 2010</date> +<title>Wine 1.3.9 Released</title> +<body> + The Wine development release 1.3.9 is now available. + <a href="{$root}/announce/1.3.9">What's new</a> in this release: +<ul> + <li>Beginnings of support for ActiveX in built-in browser.</li> + <li>Icons on Internet shortcut menu entries.</li> + <li>Standardization of code implementing COM interfaces.</li> + <li>New scheme for auto-generated DLL registrations.</li> + <li>OpenCL library wrapper.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.9.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.9.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: ab8959a0503efef032235acbabc0fcbe81fcd1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8959a0503efef032235acba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 20:33:07 2010 +0100 Release 1.3.9. --- ANNOUNCE | 1077 +++++++++++++++++++++++++++++++++++-------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 628 insertions(+), 469 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab8959a0503efef032235…

1 0

Tag wine-1.3.9 : Alexandre Julliard : Release 1.3.9
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: refs/tags/wine-1.3.9 Tag: 77bdf75529d0527702a22bf6f484e1124789a668 URL: http://source.winehq.org/git/wine.git/?a=tag;h=77bdf75529d0527702a22bf6f484… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 20:33:13 2010 +0100 Release 1.3.9

1 0

Jacek Caban : mshtml: Added IPropertyBag2 stub implementation.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 9fa8afd095e613b682516fb3d860f9484df78086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa8afd095e613b682516fb3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:36:13 2010 +0100 mshtml: Added IPropertyBag2 stub implementation. --- dlls/mshtml/propbag.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/activex.c | 8 ++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index fd44f03..f52396c 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { IPropertyBag IPropertyBag_iface; + IPropertyBag2 IPropertyBag2_iface; LONG ref; } PropertyBag; @@ -57,6 +58,9 @@ static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *iface, REFIID rii }else if(IsEqualGUID(&IID_IPropertyBag, riid)) { TRACE("(%p)->(IID_IPropertyBag %p)\n", This, ppv); *ppv = &This->IPropertyBag_iface; + }else if(IsEqualGUID(&IID_IPropertyBag2, riid)) { + TRACE("(%p)->(IID_IPropertyBag2 %p)\n", This, ppv); + *ppv = &This->IPropertyBag2_iface; }else { WARN("Unsopported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -112,6 +116,78 @@ static const IPropertyBagVtbl PropertyBagVtbl = { PropertyBag_Write }; +static inline PropertyBag *impl_from_IPropertyBag2(IPropertyBag2 *iface) +{ + return CONTAINING_RECORD(iface, PropertyBag, IPropertyBag2_iface); +} + +static HRESULT WINAPI PropertyBag2_QueryInterface(IPropertyBag2 *iface, REFIID riid, void **ppv) +{ + PropertyBag *This = impl_from_IPropertyBag2(iface); + return IPropertyBag_QueryInterface(&This->IPropertyBag_iface, riid, ppv); +} + +static ULONG WINAPI PropertyBag2_AddRef(IPropertyBag2 *iface) +{ + PropertyBag *This = impl_from_IPropertyBag2(iface); + return IPropertyBag_AddRef(&This->IPropertyBag_iface); +} + +static ULONG WINAPI PropertyBag2_Release(IPropertyBag2 *iface) +{ + PropertyBag *This = impl_from_IPropertyBag2(iface); + return IPropertyBag_Release(&This->IPropertyBag_iface); +} + +static HRESULT WINAPI PropertyBag2_Read(IPropertyBag2 *iface, ULONG cProperties, PROPBAG2 *pPropBag, + IErrorLog *pErrLog, VARIANT *pvarValue, HRESULT *phrError) +{ + PropertyBag *This = impl_from_IPropertyBag2(iface); + FIXME("(%p)->(%d %p %p %p %p)\n", This, cProperties, pPropBag, pErrLog, pvarValue, phrError); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyBag2_Write(IPropertyBag2 *iface, ULONG cProperties, PROPBAG2 *pPropBag, VARIANT *pvarValue) +{ + PropertyBag *This = impl_from_IPropertyBag2(iface); + FIXME("(%p)->(%d %p %s)\n", This, cProperties, pPropBag, debugstr_variant(pvarValue)); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyBag2_CountProperties(IPropertyBag2 *iface, ULONG *pcProperties) +{ + PropertyBag *This = impl_from_IPropertyBag2(iface); + FIXME("(%p)->(%p)\n", This, pcProperties); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyBag2_GetPropertyInfo(IPropertyBag2 *iface, ULONG iProperty, ULONG cProperties, + PROPBAG2 *pPropBag, ULONG *pcProperties) +{ + PropertyBag *This = impl_from_IPropertyBag2(iface); + FIXME("(%p)->(%u %u %p %p)\n", This, iProperty, cProperties, pPropBag, pcProperties); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyBag2_LoadObject(IPropertyBag2 *iface, LPCOLESTR pstrName, DWORD dwHint, + IUnknown *pUnkObject, IErrorLog *pErrLog) +{ + PropertyBag *This = impl_from_IPropertyBag2(iface); + FIXME("(%p)->(%s %x %p %p)\n", This, debugstr_w(pstrName), dwHint, pUnkObject, pErrLog); + return E_NOTIMPL; +} + +static const IPropertyBag2Vtbl PropertyBag2Vtbl = { + PropertyBag2_QueryInterface, + PropertyBag2_AddRef, + PropertyBag2_Release, + PropertyBag2_Read, + PropertyBag2_Write, + PropertyBag2_CountProperties, + PropertyBag2_GetPropertyInfo, + PropertyBag2_LoadObject +}; + HRESULT create_param_prop_bag(IPropertyBag **ret) { PropertyBag *prop_bag; @@ -121,6 +197,7 @@ HRESULT create_param_prop_bag(IPropertyBag **ret) return E_OUTOFMEMORY; prop_bag->IPropertyBag_iface.lpVtbl = &PropertyBagVtbl; + prop_bag->IPropertyBag2_iface.lpVtbl = &PropertyBag2Vtbl; prop_bag->ref = 1; *ret = &prop_bag->IPropertyBag_iface; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 8e46a25..ee921c5 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -299,11 +299,19 @@ static HRESULT WINAPI PersistPropertyBag_InitNew(IPersistPropertyBag *face) static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IPropertyBag *pPropBag, IErrorLog *pErrorLog) { + static const IID *propbag_ifaces[] = { + &IID_IPropertyBag, + &IID_IPropertyBag2, + NULL + }; + CHECK_EXPECT(IPersistPropertyBag_Load); ok(pPropBag != NULL, "pPropBag == NULL\n"); ok(!pErrorLog, "pErrorLog != NULL\n"); + test_ifaces((IUnknown*)pPropBag, propbag_ifaces); + return S_OK; }

1 0

Jacek Caban : mshtml: Added IPropertyBag::Read implementation.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 0849079287df4e6b6b556fed65f1c77677421929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0849079287df4e6b6b556fed6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:36:41 2010 +0100 mshtml: Added IPropertyBag::Read implementation. --- dlls/mshtml/nsiface.idl | 17 +++++ dlls/mshtml/pluginhost.c | 2 +- dlls/mshtml/pluginhost.h | 2 +- dlls/mshtml/propbag.c | 163 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/activex.c | 48 +++++++++++++ 5 files changed, 226 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0849079287df4e6b6b556…

1 0

Jacek Caban : mshtml: Added OnChanged(DISPID_READYSTATE) semi-stub implementation.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 06f3b1a34380490636824eee2f62df3ca1307203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f3b1a34380490636824eee2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:37:08 2010 +0100 mshtml: Added OnChanged(DISPID_READYSTATE) semi-stub implementation. --- dlls/mshtml/pluginhost.c | 43 +++++++++++++++- dlls/mshtml/tests/activex.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index d1932de..d7a83e7 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -60,6 +60,34 @@ static BOOL check_load_safety(PluginHost *host) return policy == URLPOLICY_ALLOW; } +static void update_readystate(PluginHost *host) +{ + DISPPARAMS params = {NULL,NULL,0,0}; + IDispatchEx *dispex; + IDispatch *disp; + ULONG err = 0; + VARIANT v; + HRESULT hres; + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + FIXME("Use IDispatchEx\n"); + IDispatchEx_Release(dispex); + } + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + return; + + hres = IDispatch_Invoke(disp, DISPID_READYSTATE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, &v, NULL, &err); + IDispatch_Release(disp); + if(SUCCEEDED(hres)) { + /* FIXME: make plugin readystate affect document readystate */ + TRACE("readystate = %s\n", debugstr_variant(&v)); + VariantClear(&v); + } +} + static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag) { IPropertyBag *prop_bag; @@ -399,8 +427,19 @@ static ULONG WINAPI PHPropertyNotifySink_Release(IPropertyNotifySink *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; + + TRACE("(%p)->(%d)\n", This, dispID); + + switch(dispID) { + case DISPID_READYSTATE: + update_readystate(This); + break; + default : + FIXME("Unimplemented dispID %d\n", dispID); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI PHPropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 2229d51..9d8e668 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -62,6 +62,7 @@ DEFINE_EXPECT(FreezeEvents_FALSE); DEFINE_EXPECT(QuickActivate); DEFINE_EXPECT(IPersistPropertyBag_InitNew); DEFINE_EXPECT(IPersistPropertyBag_Load); +DEFINE_EXPECT(Invoke_READYSTATE); static HWND container_hwnd; @@ -142,6 +143,25 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static IOleClientSite *client_site; +static READYSTATE plugin_readystate = READYSTATE_UNINITIALIZED; + +static void set_plugin_readystate(READYSTATE state) +{ + IPropertyNotifySink *prop_notif; + HRESULT hres; + + plugin_readystate = state; + + hres = IOleClientSite_QueryInterface(client_site, &IID_IPropertyNotifySink, (void**)&prop_notif); + ok(hres == S_OK, "Could not get IPropertyNotifySink iface: %08x\n", hres); + + hres = IPropertyNotifySink_OnChanged(prop_notif, DISPID_READYSTATE); + ok(hres == S_OK, "OnChanged(DISPID_READYSTATE) failed: %08x\n", hres); + + IPropertyNotifySink_Release(prop_notif); +} + static HRESULT ax_qi(REFIID,void**); static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) @@ -252,6 +272,9 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA "container->pClientSite != container->pPropertyNotifySink\n"); test_ifaces((IUnknown*)container->pClientSite, pluginhost_iids); + IOleClientSite_AddRef(container->pClientSite); + client_site = container->pClientSite; + return S_OK; } @@ -360,6 +383,9 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_BSTR(&v) == (BSTR)0xdeadbeef, "V_BSTR(v) = %p\n", V_BSTR(&v)); + set_plugin_readystate(READYSTATE_INTERACTIVE); + set_plugin_readystate(READYSTATE_COMPLETE); + return S_OK; } @@ -382,6 +408,82 @@ static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { static IPersistPropertyBag PersistPropertyBag = { &PersistPropertyBagVtbl }; +static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + return ax_qi(riid, ppv); +} + +static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI Dispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(IsEqualGUID(riid, &IID_NULL), "riid = %s\n", debugstr_guid(riid)); + ok(pDispParams != NULL, "pDispParams == NULL\n"); + ok(!pDispParams->cNamedArgs, "pDispParams->cNamedArgs = %d\n", pDispParams->cNamedArgs); + ok(!pDispParams->rgdispidNamedArgs, "pDispParams->rgdispidNamedArgs != NULL\n"); + ok(pVarResult != NULL, "pVarResult == NULL\n"); + ok(!pExcepInfo, "pExcepInfo != NULL\n"); + ok(puArgErr != NULL, "puArgErr == NULL\n"); + + switch(dispIdMember) { + case DISPID_READYSTATE: + CHECK_EXPECT2(Invoke_READYSTATE); + ok(wFlags == DISPATCH_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(!pDispParams->cArgs, "pDispParams->cArgs = %d\n", pDispParams->cArgs); + ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); + + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = plugin_readystate; + return S_OK; + default: + ok(0, "unexpected call %d\n", dispIdMember); + } + + return E_NOTIMPL; +} + +static const IDispatchVtbl DispatchVtbl = { + Dispatch_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + Dispatch_Invoke +}; + +static IDispatch Dispatch = { &DispatchVtbl }; + static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { @@ -399,6 +501,11 @@ static HRESULT ax_qi(REFIID riid, void **ppv) return S_OK; } + if(IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = &Dispatch; + return S_OK; + } + *ppv = NULL; return E_NOINTERFACE; } @@ -1004,6 +1111,11 @@ static void release_doc(IHTMLDocument2 *doc) { ULONG ref; + if(client_site) { + IOleClientSite_Release(client_site); + client_site = NULL; + } + set_client_site(doc, FALSE); ref = IHTMLDocument2_Release(doc); ok(!ref, "ref = %d\n", ref); @@ -1023,6 +1135,7 @@ static void test_object_ax(void) SET_EXPECT(QuickActivate); SET_EXPECT(FreezeEvents_FALSE); SET_EXPECT(IPersistPropertyBag_Load); + SET_EXPECT(Invoke_READYSTATE); doc = create_doc(object_ax_str, &called_CreateInstance); @@ -1033,6 +1146,7 @@ static void test_object_ax(void) todo_wine CHECK_CALLED(FreezeEvents_FALSE); CHECK_CALLED(IPersistPropertyBag_Load); + CHECK_CALLED(Invoke_READYSTATE); release_doc(doc); }

1 0

Jacek Caban : mshtml: Added QueryService(SID_SBindHost) implementation.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 3314bd8f8aeacbd88f33c1534bdbbec9d4bb0d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3314bd8f8aeacbd88f33c1534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:37:39 2010 +0100 mshtml: Added QueryService(SID_SBindHost) implementation. --- dlls/mshtml/pluginhost.c | 6 ++++++ dlls/mshtml/tests/activex.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index d7a83e7..7b7e210 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -838,6 +838,12 @@ static ULONG WINAPI PHServiceProvider_Release(IServiceProvider *iface) static HRESULT WINAPI PHServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { PluginHost *This = impl_from_IServiceProvider(iface); + + if(IsEqualGUID(guidService, &SID_SBindHost)) { + TRACE("SID_SBindHost service\n"); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 9d8e668..3e5f7b8 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -330,6 +330,8 @@ static HRESULT WINAPI PersistPropertyBag_InitNew(IPersistPropertyBag *face) static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IPropertyBag *pPropBag, IErrorLog *pErrorLog) { + IBindHost *bind_host, *bind_host2; + IServiceProvider *sp; VARIANT v; HRESULT hres; @@ -384,6 +386,21 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper ok(V_BSTR(&v) == (BSTR)0xdeadbeef, "V_BSTR(v) = %p\n", V_BSTR(&v)); set_plugin_readystate(READYSTATE_INTERACTIVE); + + hres = IOleClientSite_QueryInterface(client_site, &IID_IBindHost, (void**)&bind_host); + ok(hres == S_OK, "Could not get IBindHost iface: %08x\n", hres); + + hres = IOleClientSite_QueryInterface(client_site, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(sp, &IID_IBindHost, &SID_SBindHost, (void**)&bind_host2); + ok(hres == S_OK, "QueryService(SID_SBindHost) failed: %08x\n", hres); + IServiceProvider_Release(sp); + + ok(iface_cmp((IUnknown*)bind_host, (IUnknown*)bind_host2), "bind_host != bind_host2\n"); + IBindHost_Release(bind_host2); + IBindHost_Release(bind_host); + set_plugin_readystate(READYSTATE_COMPLETE); return S_OK;

1 0

Jacek Caban : mshtml: Added PluginHost::GetMoniker implementation.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: d43fb00eafe21eba34ae721125b5ba494909a867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43fb00eafe21eba34ae72112… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:37:53 2010 +0100 mshtml: Added PluginHost::GetMoniker implementation. --- dlls/mshtml/pluginhost.c | 23 ++++++++++++++++++++--- dlls/mshtml/tests/activex.c | 25 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7b7e210..9f6f2d5 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -283,11 +283,28 @@ static HRESULT WINAPI PHClientSite_SaveObject(IOleClientSite *iface) } static HRESULT WINAPI PHClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, - DWORD dwWhichMoniker, IMoniker **ppmk) + DWORD dwWhichMoniker, IMoniker **ppmk) { PluginHost *This = impl_from_IOleClientSite(iface); - FIXME("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk); - return E_NOTIMPL; + + TRACE("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk); + + switch(dwWhichMoniker) { + case OLEWHICHMK_CONTAINER: + if(!This->doc || !This->doc->basedoc.window || !This->doc->basedoc.window->mon) { + FIXME("no moniker\n"); + return E_UNEXPECTED; + } + + *ppmk = This->doc->basedoc.window->mon; + IMoniker_AddRef(*ppmk); + break; + default: + FIXME("which %d\n", dwWhichMoniker); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI PHClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 3e5f7b8..89b8af4 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -162,6 +162,22 @@ static void set_plugin_readystate(READYSTATE state) IPropertyNotifySink_Release(prop_notif); } +static void test_mon_displayname(IMoniker *mon, const char *exname) +{ + LPOLESTR display_name; + DWORD mksys; + HRESULT hres; + + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + ok(!strcmp_wa(display_name, exname), "display_name = %s\n", wine_dbgstr_w(display_name)); + CoTaskMemFree(display_name); + + hres = IMoniker_IsSystemMoniker(mon, &mksys); + ok(hres == S_OK, "IsSystemMoniker failed: %08x\n", hres); + ok(mksys == MKSYS_URLMONIKER, "mksys = %d\n", mksys); +} + static HRESULT ax_qi(REFIID,void**); static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) @@ -332,6 +348,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper { IBindHost *bind_host, *bind_host2; IServiceProvider *sp; + IMoniker *mon; VARIANT v; HRESULT hres; @@ -399,6 +416,14 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper ok(iface_cmp((IUnknown*)bind_host, (IUnknown*)bind_host2), "bind_host != bind_host2\n"); IBindHost_Release(bind_host2); + + mon = NULL; + hres = IOleClientSite_GetMoniker(client_site, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &mon); + ok(hres == S_OK, "GetMoniker failed: %08x\n", hres); + ok(mon != NULL, "mon == NULL\n"); + test_mon_displayname(mon, "about:blank"); + IMoniker_Release(mon); + IBindHost_Release(bind_host); set_plugin_readystate(READYSTATE_COMPLETE);

1 0

Jacek Caban : mshtml: Added IBindHost::CreateMoniker implementation.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: b3f0f07d70d007886adaca89bf27665aa73f7350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f0f07d70d007886adaca89b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:38:03 2010 +0100 mshtml: Added IBindHost::CreateMoniker implementation. --- dlls/mshtml/pluginhost.c | 11 +++++++++-- dlls/mshtml/tests/activex.c | 12 ++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 9f6f2d5..7d667a4 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -800,8 +800,15 @@ static ULONG WINAPI PHBindHost_Release(IBindHost *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; + + TRACE("(%p)->(%s %p %p %x)\n", This, debugstr_w(szName), pBC, ppmk, dwReserved); + + if(!This->doc || !This->doc->basedoc.window || !This->doc->basedoc.window->mon) { + FIXME("no moniker\n"); + return E_UNEXPECTED; + } + + return CreateURLMoniker(This->doc->basedoc.window->mon, szName, ppmk); } static HRESULT WINAPI PHBindHost_MonikerBindToStorage(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC, diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 89b8af4..16c91ec 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -355,6 +355,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper static const WCHAR param_nameW[] = {'p','a','r','a','m','_','n','a','m','e',0}; static const WCHAR num_paramW[] = {'n','u','m','_','p','a','r','a','m',0}; static const WCHAR no_paramW[] = {'n','o','_','p','a','r','a','m',0}; + static WCHAR test_swfW[] = {'t','e','s','t','.','s','w','f',0}; static const IID *propbag_ifaces[] = { &IID_IPropertyBag, @@ -418,14 +419,21 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper IBindHost_Release(bind_host2); mon = NULL; + hres = IBindHost_CreateMoniker(bind_host, test_swfW, NULL, &mon, 0); + ok(hres == S_OK, "CreateMoniker failed: %08x\n", hres); + ok(mon != NULL, "mon == NULL\n"); + test_mon_displayname(mon, "about:test.swf"); + IMoniker_Release(mon); + + IBindHost_Release(bind_host); + + mon = NULL; hres = IOleClientSite_GetMoniker(client_site, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &mon); ok(hres == S_OK, "GetMoniker failed: %08x\n", hres); ok(mon != NULL, "mon == NULL\n"); test_mon_displayname(mon, "about:blank"); IMoniker_Release(mon); - IBindHost_Release(bind_host); - set_plugin_readystate(READYSTATE_COMPLETE); return S_OK;

1 0