wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

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

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLRect.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 28c0256635ad704c122b2c9231f730fdc45585d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c0256635ad704c122b2c923… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 16:44:58 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLRect. --- dlls/mshtml/htmlelem2.c | 51 +++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 0c20723..f6d7bfc 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -36,27 +36,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; - const IHTMLRectVtbl *lpIHTMLRectVtbl; + IHTMLRect IHTMLRect_iface; LONG ref; nsIDOMClientRect *nsrect; } HTMLRect; -#define HTMLRECT(x) ((IHTMLRect*) &(x)->lpIHTMLRectVtbl) - -#define HTMLRECT_THIS(iface) DEFINE_THIS(HTMLRect, IHTMLRect, iface) +static inline HTMLRect *impl_from_IHTMLRect(IHTMLRect *iface) +{ + return CONTAINING_RECORD(iface, HTMLRect, IHTMLRect_iface); +} static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, void **ppv) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLRECT(This); + *ppv = &This->IHTMLRect_iface; }else if(IsEqualGUID(&IID_IHTMLRect, riid)) { TRACE("(%p)->(IID_IHTMLRect %p)\n", This, ppv); - *ppv = HTMLRECT(This); + *ppv = &This->IHTMLRect_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -71,7 +72,7 @@ static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, voi static ULONG WINAPI HTMLRect_AddRef(IHTMLRect *iface) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -81,7 +82,7 @@ static ULONG WINAPI HTMLRect_AddRef(IHTMLRect *iface) static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -97,7 +98,7 @@ static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) static HRESULT WINAPI HTMLRect_GetTypeInfoCount(IHTMLRect *iface, UINT *pctinfo) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%p)\n", This, pctinfo); return E_NOTIMPL; } @@ -105,7 +106,7 @@ static HRESULT WINAPI HTMLRect_GetTypeInfoCount(IHTMLRect *iface, UINT *pctinfo) static HRESULT WINAPI HTMLRect_GetTypeInfo(IHTMLRect *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } @@ -113,7 +114,7 @@ static HRESULT WINAPI HTMLRect_GetTypeInfo(IHTMLRect *iface, UINT iTInfo, static HRESULT WINAPI HTMLRect_GetIDsOfNames(IHTMLRect *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -122,7 +123,7 @@ static HRESULT WINAPI HTMLRect_Invoke(IHTMLRect *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -130,14 +131,14 @@ static HRESULT WINAPI HTMLRect_Invoke(IHTMLRect *iface, DISPID dispIdMember, static HRESULT WINAPI HTMLRect_put_left(IHTMLRect *iface, LONG v) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLRect_get_left(IHTMLRect *iface, LONG *p) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); float left; nsresult nsres; @@ -155,14 +156,14 @@ static HRESULT WINAPI HTMLRect_get_left(IHTMLRect *iface, LONG *p) static HRESULT WINAPI HTMLRect_put_top(IHTMLRect *iface, LONG v) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLRect_get_top(IHTMLRect *iface, LONG *p) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); float top; nsresult nsres; @@ -180,14 +181,14 @@ static HRESULT WINAPI HTMLRect_get_top(IHTMLRect *iface, LONG *p) static HRESULT WINAPI HTMLRect_put_right(IHTMLRect *iface, LONG v) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLRect_get_right(IHTMLRect *iface, LONG *p) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); float right; nsresult nsres; @@ -205,14 +206,14 @@ static HRESULT WINAPI HTMLRect_get_right(IHTMLRect *iface, LONG *p) static HRESULT WINAPI HTMLRect_put_bottom(IHTMLRect *iface, LONG v) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); float bottom; nsresult nsres; @@ -228,8 +229,6 @@ static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) return S_OK; } -#undef HTMLRECT_THIS - static const IHTMLRectVtbl HTMLRectVtbl = { HTMLRect_QueryInterface, HTMLRect_AddRef, @@ -267,15 +266,15 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) if(!rect) return E_OUTOFMEMORY; - rect->lpIHTMLRectVtbl = &HTMLRectVtbl; + rect->IHTMLRect_iface.lpVtbl = &HTMLRectVtbl; rect->ref = 1; - init_dispex(&rect->dispex, (IUnknown*)HTMLRECT(rect), &HTMLRect_dispex); + init_dispex(&rect->dispex, (IUnknown*)&rect->IHTMLRect_iface, &HTMLRect_dispex); nsIDOMClientRect_AddRef(nsrect); rect->nsrect = nsrect; - *ret = HTMLRECT(rect); + *ret = &rect->IHTMLRect_iface; return S_OK; }

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLBodyElement.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: f419f8e0b7ecec9f42ff1c4f6d143e8a48c8220b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f419f8e0b7ecec9f42ff1c4f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 16:44:18 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLBodyElement. --- dlls/mshtml/htmlbody.c | 103 ++++++++++++++++++++++++------------------------ 1 files changed, 51 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f419f8e0b7ecec9f42ff1…

1 0

Michael Stefaniuc : mshtml: Use an iface instead of an vtbl pointer in HTMLAnchorElement.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: c9195b9f02e5777af7d4171605a8f7ce2b916bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9195b9f02e5777af7d417160… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 12:34:31 2010 +0100 mshtml: Use an iface instead of an vtbl pointer in HTMLAnchorElement. --- dlls/mshtml/htmlanchor.c | 115 +++++++++++++++++++++++----------------------- 1 files changed, 57 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9195b9f02e5777af7d41…

1 0

Michael Stefaniuc : itss: Use ifaces instead of vtbl pointers in ITSProtocol.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 872e3f3a2592f476f13364db098373393350b147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872e3f3a2592f476f13364db0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 10:19:33 2010 +0100 itss: Use ifaces instead of vtbl pointers in ITSProtocol. --- dlls/itss/itsstor.h | 2 - dlls/itss/protocol.c | 83 ++++++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=872e3f3a2592f476f1336…

1 0

Hans Leidekker : msi: Map neutral parts of package language ids to the system default language id .
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 23169289e6a2f43b256a3b2c8626bfe3dc3e864f URL: http://source.winehq.org/git/wine.git/?a=commit;h=23169289e6a2f43b256a3b2c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 6 13:20:02 2010 +0100 msi: Map neutral parts of package language ids to the system default language id. --- dlls/msi/package.c | 12 +++++++++++- dlls/msi/tests/install.c | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a81d0bd..907768b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1402,7 +1402,17 @@ static UINT validate_package( MSIPACKAGE *package ) } for (i = 0; i < package->num_langids; i++) { - if (!package->langids[i] || IsValidLocale( package->langids[i], LCID_INSTALLED )) + LANGID langid = package->langids[i]; + + if (PRIMARYLANGID( langid ) == LANG_NEUTRAL) + { + langid = MAKELANGID( PRIMARYLANGID( GetSystemDefaultLangID() ), SUBLANGID( langid ) ); + } + if (SUBLANGID( langid ) == SUBLANG_NEUTRAL) + { + langid = MAKELANGID( PRIMARYLANGID( langid ), SUBLANGID( GetSystemDefaultLangID() ) ); + } + if (IsValidLocale( langid, LCID_INSTALLED )) return ERROR_SUCCESS; } return ERROR_INSTALL_LANGUAGE_UNSUPPORTED; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 58bc681..211d6a8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6057,6 +6057,23 @@ static void test_package_validation(void) ok(!delete_pf("msitest\\maximus", TRUE), "file exists\n"); ok(!delete_pf("msitest", FALSE), "directory exists\n"); + if (GetSystemDefaultLangID() == MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US )) + { + DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;9"); + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n"); + ok(delete_pf("msitest", FALSE), "directory does not exist\n"); + + DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;1024"); + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n"); + ok(delete_pf("msitest", FALSE), "directory does not exist\n"); + } + DeleteFile(msifile); create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel32;0");

1 0

Hans Leidekker : programs: Add a stub implementation of netsh.exe.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 8ad7d2e81415a35f39d2703d94faf625a2f76a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad7d2e81415a35f39d2703d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 6 13:19:41 2010 +0100 programs: Add a stub implementation of netsh.exe. --- configure | 1 + configure.ac | 1 + programs/netsh/Makefile.in | 7 +++++++ programs/netsh/netsh.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 503c838..ea28639 100755 --- a/configure +++ b/configure @@ -15347,6 +15347,7 @@ wine_fn_config_program mofcomp enable_mofcomp install wine_fn_config_program mshta enable_mshta install wine_fn_config_program msiexec enable_msiexec installbin wine_fn_config_program net enable_net install +wine_fn_config_program netsh enable_netsh install wine_fn_config_program ngen enable_ngen install wine_fn_config_program notepad enable_notepad installbin wine_fn_config_program oleview enable_oleview install diff --git a/configure.ac b/configure.ac index 2dd5831..bb3237d 100644 --- a/configure.ac +++ b/configure.ac @@ -2869,6 +2869,7 @@ WINE_CONFIG_PROGRAM(mofcomp,install) WINE_CONFIG_PROGRAM(mshta,install) WINE_CONFIG_PROGRAM(msiexec,installbin) WINE_CONFIG_PROGRAM(net,install) +WINE_CONFIG_PROGRAM(netsh,install) WINE_CONFIG_PROGRAM(ngen,install) WINE_CONFIG_PROGRAM(notepad,installbin) WINE_CONFIG_PROGRAM(oleview,install) diff --git a/programs/netsh/Makefile.in b/programs/netsh/Makefile.in new file mode 100644 index 0000000..80fb197 --- /dev/null +++ b/programs/netsh/Makefile.in @@ -0,0 +1,7 @@ +MODULE = netsh.exe +APPMODE = -mconsole -municode +EXTRADEFS = -DWINE_NO_UNICODE_MACROS + +C_SRCS = netsh.c + +@MAKE_PROG_RULES@ diff --git a/programs/netsh/netsh.c b/programs/netsh/netsh.c new file mode 100644 index 0000000..1ea3ecf --- /dev/null +++ b/programs/netsh/netsh.c @@ -0,0 +1,33 @@ +/* + * Copyright 2010 Hans Leidekker 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netsh); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

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