wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

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 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 IPersistPropertyBag calls test.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: cc88c5a3312a5de11e7eb618a0570865397bf694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc88c5a3312a5de11e7eb618a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:35:59 2010 +0100 mshtml: Added IPersistPropertyBag calls test. --- dlls/mshtml/tests/activex.c | 84 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 69 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 9984ae0..8e46a25 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -60,6 +60,8 @@ DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(FreezeEvents_TRUE); DEFINE_EXPECT(FreezeEvents_FALSE); DEFINE_EXPECT(QuickActivate); +DEFINE_EXPECT(IPersistPropertyBag_InitNew); +DEFINE_EXPECT(IPersistPropertyBag_Load); static HWND container_hwnd; @@ -68,18 +70,6 @@ static HWND container_hwnd; static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xf6,0x68,0x07,0x46}}; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static const char object_ax_str[] = "<html><head></head><body>" "<object classid=\"clsid:" TESTACTIVEX_CLSID "\" width=\"300\" height=\"200\" id=\"objid\">" @@ -102,7 +92,7 @@ static const REFIID pluginhost_iids[] = { NULL }; -static const char *dbgstr_guid(REFIID riid) +static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -138,7 +128,7 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) for(piid = iids; *piid; piid++) { hres = IDispatch_QueryInterface(iface, *piid, (void**)&unk); - ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08x\n", dbgstr_guid(*piid), hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08x\n", debugstr_guid(*piid), hres); if(SUCCEEDED(hres)) IUnknown_Release(unk); } @@ -280,6 +270,62 @@ static const IQuickActivateVtbl QuickActivateVtbl = { static IQuickActivate QuickActivate = { &QuickActivateVtbl }; +static HRESULT WINAPI PersistPropertyBag_QueryInterface(IPersistPropertyBag *iface, REFIID riid, void **ppv) +{ + return ax_qi(riid, ppv); +} + +static ULONG WINAPI PersistPropertyBag_AddRef(IPersistPropertyBag *iface) +{ + return 2; +} + +static ULONG WINAPI PersistPropertyBag_Release(IPersistPropertyBag *iface) +{ + return 1; +} + +static HRESULT WINAPI PersistPropertyBag_GetClassID(IPersistPropertyBag *face, CLSID *pClassID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistPropertyBag_InitNew(IPersistPropertyBag *face) +{ + CHECK_EXPECT(IPersistPropertyBag_InitNew); + return S_OK; +} + +static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IPropertyBag *pPropBag, IErrorLog *pErrorLog) +{ + CHECK_EXPECT(IPersistPropertyBag_Load); + + ok(pPropBag != NULL, "pPropBag == NULL\n"); + ok(!pErrorLog, "pErrorLog != NULL\n"); + + return S_OK; +} + +static HRESULT WINAPI PersistPropertyBag_Save(IPersistPropertyBag *face, IPropertyBag *pPropBag, BOOL fClearDisrty, BOOL fSaveAllProperties) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { + PersistPropertyBag_QueryInterface, + PersistPropertyBag_AddRef, + PersistPropertyBag_Release, + PersistPropertyBag_GetClassID, + PersistPropertyBag_InitNew, + PersistPropertyBag_Load, + PersistPropertyBag_Save + +}; + +static IPersistPropertyBag PersistPropertyBag = { &PersistPropertyBagVtbl }; + static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { @@ -292,6 +338,11 @@ static HRESULT ax_qi(REFIID riid, void **ppv) return S_OK; } + if(IsEqualGUID(riid, &IID_IPersistPropertyBag)) { + *ppv = &PersistPropertyBag; + return S_OK; + } + *ppv = NULL; return E_NOINTERFACE; } @@ -351,6 +402,8 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { ClassFactory_LockServer }; +static IClassFactory activex_cf = { &ClassFactoryVtbl }; + static HRESULT cs_qi(REFIID,void **); static IOleDocumentView *view; @@ -726,7 +779,6 @@ static HRESULT cs_qi(REFIID riid, void **ppv) return *ppv ? S_OK : E_NOINTERFACE; } -static IClassFactory activex_cf = { &ClassFactoryVtbl }; static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -914,6 +966,7 @@ static void test_object_ax(void) SET_EXPECT(FreezeEvents_TRUE); SET_EXPECT(QuickActivate); SET_EXPECT(FreezeEvents_FALSE); + SET_EXPECT(IPersistPropertyBag_Load); doc = create_doc(object_ax_str, &called_CreateInstance); @@ -923,6 +976,7 @@ static void test_object_ax(void) CHECK_CALLED(QuickActivate); todo_wine CHECK_CALLED(FreezeEvents_FALSE); + CHECK_CALLED(IPersistPropertyBag_Load); release_doc(doc); }

1 0

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

10 Dec '10

Module: wine Branch: master Commit: 067092c22354b6f16da95955a100c2d5eb21c81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=067092c22354b6f16da95955a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:35:40 2010 +0100 mshtml: IPropertyBag stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/pluginhost.c | 7 +-- dlls/mshtml/pluginhost.h | 2 + dlls/mshtml/propbag.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 2b4e66d..9ea7512 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -62,6 +62,7 @@ C_SRCS = \ omnavigator.c \ persist.c \ pluginhost.c \ + propbag.c \ protocol.c \ script.c \ secmgr.c \ diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index cfd40fa..f58b765 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -60,17 +60,12 @@ static BOOL check_load_safety(PluginHost *host) return policy == URLPOLICY_ALLOW; } -static HRESULT create_prop_bag(IPropertyBag **ret) { - *ret = NULL; - return S_OK; -} - static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag) { IPropertyBag *prop_bag; HRESULT hres; - hres = create_prop_bag(&prop_bag); + hres = create_param_prop_bag(&prop_bag); if(FAILED(hres)) return; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 7b88612..b9a9c1b 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -52,3 +52,5 @@ extern const IID IID_HTMLPluginContainer; HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,const CLSID*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); void detach_plugin_hosts(HTMLDocumentNode*); + +HRESULT create_param_prop_bag(IPropertyBag**); diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c new file mode 100644 index 0000000..fd44f03 --- /dev/null +++ b/dlls/mshtml/propbag.c @@ -0,0 +1,128 @@ +/* + * 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); + +typedef struct { + IPropertyBag IPropertyBag_iface; + + LONG ref; +} PropertyBag; + +static inline PropertyBag *impl_from_IPropertyBag(IPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, PropertyBag, IPropertyBag_iface); +} + +static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IPropertyBag_iface; + }else if(IsEqualGUID(&IID_IPropertyBag, riid)) { + TRACE("(%p)->(IID_IPropertyBag %p)\n", This, ppv); + *ppv = &This->IPropertyBag_iface; + }else { + WARN("Unsopported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PropertyBag_AddRef(IPropertyBag *iface) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI PropertyBag_Release(IPropertyBag *iface) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI PropertyBag_Read(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(pszPropName), pVar, pErrorLog); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyBag_Write(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + FIXME("(%p)->(%s %s)\n", This, debugstr_w(pszPropName), debugstr_variant(pVar)); + return E_NOTIMPL; +} + +static const IPropertyBagVtbl PropertyBagVtbl = { + PropertyBag_QueryInterface, + PropertyBag_AddRef, + PropertyBag_Release, + PropertyBag_Read, + PropertyBag_Write +}; + +HRESULT create_param_prop_bag(IPropertyBag **ret) +{ + PropertyBag *prop_bag; + + prop_bag = heap_alloc(sizeof(*prop_bag)); + if(!prop_bag) + return E_OUTOFMEMORY; + + prop_bag->IPropertyBag_iface.lpVtbl = &PropertyBagVtbl; + prop_bag->ref = 1; + + *ret = &prop_bag->IPropertyBag_iface; + return S_OK; +}

1 0

Jacek Caban : mshtml: Added beginning support for loading data by an ActiveX object.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: dbbcbd59a5df92e46ac6ba29c4802db292e962bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbcbd59a5df92e46ac6ba29c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:35:15 2010 +0100 mshtml: Added beginning support for loading data by an ActiveX object. --- dlls/mshtml/npplugin.c | 16 ++++---- dlls/mshtml/pluginhost.c | 81 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/pluginhost.h | 4 ++- 3 files changed, 91 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 93e22da..ad88da2 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -203,31 +203,30 @@ static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) return ret; } -static IUnknown *create_activex_object(HTMLWindow *window, nsIDOMElement *nselem) +static IUnknown *create_activex_object(HTMLWindow *window, nsIDOMElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; IClassFactory *cf; IUnknown *obj; DWORD policy; - CLSID guid; HRESULT hres; - if(!get_elem_clsid(nselem, &guid)) { + if(!get_elem_clsid(nselem, clsid)) { WARN("Could not determine element CLSID\n"); return NULL; } - TRACE("clsid %s\n", debugstr_guid(&guid)); + TRACE("clsid %s\n", debugstr_guid(clsid)); policy = 0; hres = IInternetHostSecurityManager_ProcessUrlAction(HOSTSECMGR(window->doc), URLACTION_ACTIVEX_RUN, - (BYTE*)&policy, sizeof(policy), (BYTE*)&guid, sizeof(GUID), 0, 0); + (BYTE*)&policy, sizeof(policy), (BYTE*)clsid, sizeof(GUID), 0, 0); if(FAILED(hres) || policy != URLPOLICY_ALLOW) { WARN("ProcessUrlAction returned %08x %x\n", hres, policy); return NULL; } - hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); + hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); if(FAILED(hres)) return NULL; @@ -250,6 +249,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I nsIDOMElement *nselem; HTMLWindow *window; IUnknown *obj; + CLSID clsid; NPError err = NPERR_NO_ERROR; TRACE("(%s %p %x %d %p %p %p)\n", debugstr_a(pluginType), instance, mode, argc, argn, argv, saved); @@ -267,12 +267,12 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I return NPERR_GENERIC_ERROR; } - obj = create_activex_object(window, nselem); + obj = create_activex_object(window, nselem, &clsid); if(obj) { PluginHost *host; HRESULT hres; - hres = create_plugin_host(window->doc, nselem, obj, &host); + hres = create_plugin_host(window->doc, nselem, obj, &clsid, &host); nsIDOMElement_Release(nselem); IUnknown_Release(obj); if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 785abdd..cfd40fa 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -39,6 +39,81 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); const IID IID_HTMLPluginContainer = {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}}; +static BOOL check_load_safety(PluginHost *host) +{ + DWORD policy_size, policy; + struct CONFIRMSAFETY cs; + BYTE *ppolicy; + HRESULT hres; + + cs.clsid = host->clsid; + cs.pUnk = host->plugin_unk; + cs.dwFlags = CONFIRMSAFETYACTION_LOADOBJECT; + + hres = IInternetHostSecurityManager_QueryCustomPolicy(HOSTSECMGR(host->doc), + &GUID_CUSTOM_CONFIRMOBJECTSAFETY, &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + if(FAILED(hres)) + return FALSE; + + policy = *(DWORD*)ppolicy; + CoTaskMemFree(ppolicy); + return policy == URLPOLICY_ALLOW; +} + +static HRESULT create_prop_bag(IPropertyBag **ret) { + *ret = NULL; + return S_OK; +} + +static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag) +{ + IPropertyBag *prop_bag; + HRESULT hres; + + hres = create_prop_bag(&prop_bag); + if(FAILED(hres)) + return; + + if(prop_bag && !check_load_safety(host)) { + IPropertyBag_Release(prop_bag); + prop_bag = NULL; + } + + if(prop_bag) { + hres = IPersistPropertyBag_Load(persist_prop_bag, prop_bag, NULL); + IPropertyBag_Release(prop_bag); + if(FAILED(hres)) + WARN("Load failed: %08x\n", hres); + }else { + hres = IPersistPropertyBag_InitNew(persist_prop_bag); + if(FAILED(hres)) + WARN("InitNew failed: %08x\n", hres); + } +} + +static void load_plugin(PluginHost *host) +{ + IPersistPropertyBag2 *persist_prop_bag2; + IPersistPropertyBag *persist_prop_bag; + HRESULT hres; + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IPersistPropertyBag2, (void**)&persist_prop_bag2); + if(SUCCEEDED(hres)) { + FIXME("Use IPersistPropertyBag2 iface\n"); + IPersistPropertyBag2_Release(persist_prop_bag2); + return; + } + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IPersistPropertyBag, (void**)&persist_prop_bag); + if(SUCCEEDED(hres)) { + load_prop_bag(host, persist_prop_bag); + IPersistPropertyBag_Release(persist_prop_bag); + return; + } + + FIXME("No IPersistPeropertyBag iface \n"); +} + static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; @@ -74,7 +149,10 @@ static void activate_plugin(PluginHost *host) FIXME("QuickActivate failed: %08x\n", hres); }else { FIXME("No IQuickActivate\n"); + return; } + + load_plugin(host); } void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) @@ -769,7 +847,7 @@ void detach_plugin_hosts(HTMLDocumentNode *doc) } } -HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknown *unk, PluginHost **ret) +HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknown *unk, const CLSID *clsid, PluginHost **ret) { PluginHost *host; HRESULT hres; @@ -797,6 +875,7 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknow IUnknown_AddRef(unk); host->plugin_unk = unk; + host->clsid = *clsid; host->doc = doc; list_add_tail(&doc->plugin_hosts, &host->entry); diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index d030a3e..7b88612 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -31,7 +31,9 @@ typedef struct { LONG ref; IUnknown *plugin_unk; + CLSID clsid; HWND hwnd; + RECT rect; HTMLDocumentNode *doc; struct list entry; @@ -47,6 +49,6 @@ struct HTMLPluginContainer { extern const IID IID_HTMLPluginContainer; -HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,PluginHost**); +HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,const CLSID*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); void detach_plugin_hosts(HTMLDocumentNode*);

1 0

Marcus Meissner : ntdll: Report a failed executable mmap on nonexec filesystems.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: e7cb2d35f0bac1f4e9c7969e66e3013118802279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cb2d35f0bac1f4e9c7969e6… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Dec 10 15:51:43 2010 +0100 ntdll: Report a failed executable mmap on nonexec filesystems. --- dlls/ntdll/virtual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d7a04c3..6f8b9a3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -877,6 +877,9 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; + if ((errno == EPERM) && (prot & PROT_EXEC)) + ERR( "failed to set %08x protection on file map, noexec filesystem?\n", prot ); + /* mmap() failed; if this is because the file offset is not */ /* page-aligned (EINVAL), or because the underlying filesystem */ /* does not support mmap() (ENOEXEC,ENODEV), we do it by hand. */

1 0

Eryk Wieliczko : msvcrt/tests: Add _ecvt_s tests.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: a2af7ccd9909323ccf1f915663b60283da21d5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2af7ccd9909323ccf1f91566… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Fri Dec 10 15:00:59 2010 +0100 msvcrt/tests: Add _ecvt_s tests. --- dlls/msvcrt/tests/printf.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 4386bf1..3d61f3d 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -38,6 +38,8 @@ static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer, size_t count, const wchar_t *format, __ms_va_list valist); +static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, + int ndigits, int *decpt, int *sign); static void init( void ) { @@ -46,6 +48,7 @@ static void init( void ) p__vscprintf = (void *)GetProcAddress(hmod, "_vscprintf"); p__vscwprintf = (void *)GetProcAddress(hmod, "_vscwprintf"); p__vsnwprintf_s = (void *)GetProcAddress(hmod, "_vsnwprintf_s"); + p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); } static void test_sprintf( void ) @@ -766,7 +769,7 @@ static struct { static void test_xcvt(void) { char *str; - int i, decpt, sign; + int i, decpt, sign, err; for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; str = _ecvt( test_cvt_testcases[i].value, @@ -779,6 +782,9 @@ static void test_xcvt(void) ok( decpt == test_cvt_testcases[i].expdecpt_e, "_ecvt() decimal point wrong, got %d expected %d\n", decpt, test_cvt_testcases[i].expdecpt_e); + ok( sign == test_cvt_testcases[i].expsign, + "_ecvt() sign wrong, got %d expected %d\n", sign, + test_cvt_testcases[i].expsign); } for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; @@ -796,6 +802,28 @@ static void test_xcvt(void) "_ecvt() sign wrong, got %d expected %d\n", sign, test_cvt_testcases[i].expsign); } + + if (p__ecvt_s) + { + str = malloc(1024); + for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ + decpt = sign = 100; + err = p__ecvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); + ok(err == 0, "_ecvt_s() failed with error code %d", err); + ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_e, 15), + "_ecvt_s() bad return, got \n'%s' expected \n'%s'\n", str, + test_cvt_testcases[i].expstr_e); + ok( decpt == test_cvt_testcases[i].expdecpt_e, + "_ecvt_s() decimal point wrong, got %d expected %d\n", decpt, + test_cvt_testcases[i].expdecpt_e); + ok( sign == test_cvt_testcases[i].expsign, + "_ecvt_s() sign wrong, got %d expected %d\n", sign, + test_cvt_testcases[i].expsign); + } + free(str); + } + else + win_skip("_ecvt_s not available\n"); } static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)

1 0

Eryk Wieliczko : msvcrt: Implement ecvt_s.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 1ade6c2bc8e3e895992accf4aca098b0f8d0fb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ade6c2bc8e3e895992accf4a… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Fri Dec 10 14:46:36 2010 +0100 msvcrt: Implement ecvt_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 66 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9f2a147..82606e2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -583,7 +583,7 @@ @ cdecl _dup2(long long) msvcrt._dup2 @ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt -@ stub _ecvt_s +@ cdecl _ecvt_s(str long double long ptr ptr) msvcrt._ecvt_s @ cdecl _encoded_null() msvcr90._encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1512347..e54eea6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -423,7 +423,7 @@ @ cdecl _dup2(long long) msvcrt._dup2 @ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt -@ stub _ecvt_s +@ cdecl _ecvt_s(str long double long ptr ptr) msvcrt._ecvt_s @ cdecl _encode_pointer(ptr) msvcr90._encode_pointer @ cdecl _encoded_null() msvcr90._encoded_null @ cdecl _endthread() msvcrt._endthread diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index feaf80e..5baee98 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -415,7 +415,7 @@ @ cdecl _dup2(long long) msvcrt._dup2 @ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt -@ stub _ecvt_s +@ cdecl _ecvt_s(str long double long ptr ptr) msvcrt._ecvt_s @ cdecl _encode_pointer(ptr) MSVCR90_encode_pointer @ cdecl _encoded_null() @ cdecl _endthread() msvcrt._endthread diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6fb0549..d2110cb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1104,6 +1104,72 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) return data->efcvt_buffer; } +/********************************************************************* + * _ecvt_s (MSVCRT.@) + */ +int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigits, int *decpt, int *sign ) +{ + int prec, len; + char *result; + const char infret[] = "1#INF"; + + if(!MSVCRT_CHECK_PMT(buffer != NULL) || !MSVCRT_CHECK_PMT(decpt != NULL) || !MSVCRT_CHECK_PMT(sign != NULL)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + if(!MSVCRT_CHECK_PMT(length > 2) || !MSVCRT_CHECK_PMT(ndigits < (int)length - 1)) + { + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + /* special case - inf */ + if(number == HUGE_VAL || number == -HUGE_VAL) + { + memset(buffer, '0', ndigits); + memcpy(buffer, infret, min(ndigits, sizeof(infret) - 1 ) ); + buffer[ndigits] = '\0'; + (*decpt) = 1; + if(number == -HUGE_VAL) + (*sign) = 1; + else + (*sign) = 0; + return 0; + } + result = (char*)MSVCRT_malloc(max(ndigits + 7, 7)); + + if( number < 0) { + *sign = TRUE; + number = -number; + } else + *sign = FALSE; + /* handle cases with zero ndigits or less */ + prec = ndigits; + if( prec < 1) prec = 2; + len = snprintf(result, 80, "%.*le", prec - 1, number); + /* take the decimal "point away */ + if( prec != 1) + memmove( result + 1, result + 2, len - 1 ); + /* take the exponential "e" out */ + result[ prec] = '\0'; + /* read the exponent */ + sscanf( result + prec + 1, "%d", decpt); + (*decpt)++; + /* adjust for some border cases */ + if( result[0] == '0')/* value is zero */ + *decpt = 0; + /* handle cases with zero ndigits or less */ + if( ndigits < 1){ + if( result[ 0] >= '5') + (*decpt)++; + result[ 0] = '\0'; + } + memcpy( buffer, result, max(ndigits + 1, 1) ); + MSVCRT_free( result ); + return 0; +} + /*********************************************************************** * _fcvt (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9fe5f64..ba8c9ea 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -378,7 +378,7 @@ @ cdecl _dup (long) MSVCRT__dup @ cdecl _dup2 (long long) MSVCRT__dup2 @ cdecl _ecvt(double long ptr ptr) -# stub _ecvt_s +@ cdecl _ecvt_s(str long double long ptr ptr) @ cdecl _endthread () @ cdecl _endthreadex(long) @ extern _environ MSVCRT__environ

1 0

Alexandre Julliard : explorerframe: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: a967d985c2618b585e5c2f0cebccd02e7d4db7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a967d985c2618b585e5c2f0ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 15:02:43 2010 +0100 explorerframe: Convert dll registration to the IRegistrar mechanism. --- dlls/explorerframe/Makefile.in | 3 +- .../explorerframe/{eframe.rc => explorerframe.idl} | 12 +++- dlls/explorerframe/explorerframe.inf | 17 ----- dlls/explorerframe/explorerframe_main.c | 67 +------------------- 4 files changed, 13 insertions(+), 86 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index af92758..975f197 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -6,8 +6,9 @@ C_SRCS = \ explorerframe_main.c \ nstc.c +IDL_R_SRCS = explorerframe.idl + RC_SRCS = \ - eframe.rc \ version.rc @MAKE_DLL_RULES@ diff --git a/dlls/explorerframe/eframe.rc b/dlls/explorerframe/explorerframe.idl similarity index 74% rename from dlls/explorerframe/eframe.rc rename to dlls/explorerframe/explorerframe.idl index 25619de..8171396 100644 --- a/dlls/explorerframe/eframe.rc +++ b/dlls/explorerframe/explorerframe.idl @@ -1,7 +1,7 @@ /* - * ExplorerFrame main resource file + * COM Classes for explorerframe * - * Copyright 2010 David Hedberg + * Copyright 2010 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,5 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: explorerframe.inf */ -REGINST REGINST explorerframe.inf +[ + helpstring("Shell Name Space ListView"), + threading(apartment), + uuid(ae054212-3535-4430-83ed-d501aa6680e6) +] +coclass NamespaceTreeControl { interface INameSpaceTreeControl2; } diff --git a/dlls/explorerframe/explorerframe.inf b/dlls/explorerframe/explorerframe.inf deleted file mode 100644 index 7d6ba63..0000000 --- a/dlls/explorerframe/explorerframe.inf +++ /dev/null @@ -1,17 +0,0 @@ -[version] -Signature="$CHICAGO$" - -[RegisterDll] -AddReg=Classes.Reg - -[UnregisterDll] -DelReg=Classes.Reg - -[Classes.Reg] -; For some reason called "ListView" in the registry. -HKCR,"CLSID\%CLSID_NamespaceTreeControl%",,,"Shell Name Space ListView" -HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32",,,"%MODULE%" -HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32","ThreadingModel",,"Apartment" - -[Strings] -MODULE="explorerframe.dll" diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index cc535e7..365898f 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -30,8 +30,8 @@ #include "winuser.h" #include "winreg.h" #include "shlwapi.h" -#include "advpub.h" #include "shobjidl.h" +#include "rpcproxy.h" #include "wine/debug.h" @@ -209,72 +209,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) } /************************************************************************* - * Register/Unregister DLL, based on shdocvw/factory.c - */ -static HRESULT reg_install(LPCSTR section, const STRTABLEA *strtable) -{ - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - HMODULE hadvpack; - HRESULT hres; - - static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - hadvpack = LoadLibraryW(advpackW); - pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall"); - - hres = pRegInstall(explorerframe_hinstance, section, strtable); - - FreeLibrary(hadvpack); - return hres; -} - -#define INF_SET_CLSID(clsid) \ - do \ - { \ - static CHAR name[] = "CLSID_" #clsid; \ - \ - pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ - } while (0) - -static HRESULT register_server(BOOL doregister) -{ - STRTABLEA strtable; - STRENTRYA pse[1]; - static CLSID const *clsids[1]; - unsigned int i = 0; - HRESULT hres; - - INF_SET_CLSID(NamespaceTreeControl); - - for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) - { - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], - clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], - clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); - } - - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); - strtable.pse = pse; - - hres = reg_install(doregister ? "RegisterDll" : "UnregisterDll", &strtable); - - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) - HeapFree(GetProcessHeap(), 0, pse[i].pszValue); - - return hres; -} - -#undef INF_SET_CLSID - -/************************************************************************* * DllRegisterServer (ExplorerFrame.@) */ HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources( explorerframe_hinstance, NULL ); } /************************************************************************* @@ -282,5 +221,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources( explorerframe_hinstance, NULL ); }

1 0

Alexandre Julliard : mstask: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: ba709a1d4551a91f4719202dae754c935bc5971b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba709a1d4551a91f4719202da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 14:55:46 2010 +0100 mstask: Convert dll registration to the IRegistrar mechanism. --- dlls/mstask/Makefile.in | 3 +- dlls/mstask/mstask.inf | 16 -------- dlls/mstask/mstask_main.c | 93 ++------------------------------------------- dlls/mstask/rsrc.rc | 20 ---------- include/mstask.idl | 8 ++++ 5 files changed, 13 insertions(+), 127 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index ed1c9ee..a4559d1 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -8,8 +8,7 @@ C_SRCS = \ task_scheduler.c \ task_trigger.c -RC_SRCS = rsrc.rc - IDL_I_SRCS = mstask_local.idl +IDL_R_SRCS = mstask_local.idl @MAKE_DLL_RULES@ diff --git a/dlls/mstask/mstask.inf b/dlls/mstask/mstask.inf deleted file mode 100644 index 1056093..0000000 --- a/dlls/mstask/mstask.inf +++ /dev/null @@ -1,16 +0,0 @@ -[version] -Signature="$CHICAGO$" - -[RegisterDll] -AddReg=Classes.Reg - -[UnregisterDll] -DelReg=Classes.Reg - -[Classes.Reg] -HKCR,"CLSID\%CLSID_CTaskScheduler%",,,"CTaskScheduler" -HKCR,"CLSID\%CLSID_CTaskScheduler%\InProcServer32",,,"mstask.dll" -HKCR,"CLSID\%CLSID_CTaskScheduler%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_CTask%",,,"CTask" -HKCR,"CLSID\%CLSID_CTask%\InProcServer32",,,"mstask.dll" -HKCR,"CLSID\%CLSID_CTask%\InProcServer32","ThreadingModel",,"Both" diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index df1f1d8..000833d 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -19,8 +19,8 @@ #include <stdio.h> #include "mstask_private.h" -#include "winreg.h" -#include "advpub.h" +#include "objbase.h" +#include "rpcproxy.h" #include "wine/debug.h" @@ -66,97 +66,12 @@ HRESULT WINAPI DllCanUnloadNow(void) return dll_ref != 0 ? S_FALSE : S_OK; } -static inline char *mstask_strdup(const char *s) -{ - size_t n = strlen(s) + 1; - char *d = HeapAlloc(GetProcessHeap(), 0, n); - return d ? memcpy(d, s, n) : NULL; -} - -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct - { - const char *name; - const CLSID *clsid; - } - expns[] = - { - CLSID_EXPANSION_ENTRY(CTaskScheduler), - CLSID_EXPANSION_ENTRY(CTask) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - unsigned int i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) - { - static const char dummy_sample[] = - "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = mstask_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, - "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], - clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - unsigned int i; - for (i = 0; i < strtable->cEntries; i++) - { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -static HRESULT register_mstask(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, - LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = - {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - WINE_ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_mstask(TRUE); + return __wine_register_resources( hInst, NULL ); } HRESULT WINAPI DllUnregisterServer(void) { - return register_mstask(FALSE); + return __wine_unregister_resources( hInst, NULL ); } diff --git a/dlls/mstask/rsrc.rc b/dlls/mstask/rsrc.rc deleted file mode 100644 index 9915e02..0000000 --- a/dlls/mstask/rsrc.rc +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2008 Google (Roy Shea) - * - * 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 - */ - -/* @makedep: mstask.inf */ -REGINST REGINST mstask.inf diff --git a/include/mstask.idl b/include/mstask.idl index cc70cce..ecff641 100644 --- a/include/mstask.idl +++ b/include/mstask.idl @@ -22,6 +22,12 @@ import "oaidl.idl"; import "oleidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + cpp_quote("#define TASK_SUNDAY 0x1") cpp_quote("#define TASK_MONDAY 0x2") cpp_quote("#define TASK_TUESDAY 0x4") @@ -368,6 +374,7 @@ interface ITaskScheduler : IUnknown } [ + threading(both), uuid(148BD52A-A2AB-11CE-B11F-00AA00530503) ] coclass CTaskScheduler @@ -377,6 +384,7 @@ coclass CTaskScheduler [ + threading(both), uuid(148BD520-A2AB-11CE-B11F-00AA00530503) ] coclass CTask

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010