December 2010 - Wine-Commits

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

Dec. 6, 2010

Module: wine Branch: master Commit: ec29487f1239f8f1f8315cee7e87fe5b92d5f5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec29487f1239f8f1f8315cee7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:49:49 2010 +0100 mshtml: Added PluginHost's IPropertyNotifySink stub implementation. --- dlls/mshtml/pluginhost.c | 55 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 3 +- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 1111071..7853899 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -64,7 +64,7 @@ static void activate_plugin(PluginHost *host) container.pClientSite = &host->IOleClientSite_iface; container.dwAmbientFlags = QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE; container.pAdviseSink = &host->IAdviseSinkEx_iface; - container.pPropertyNotifySink = NULL; /* FIXME */ + container.pPropertyNotifySink = &host->IPropertyNotifySink_iface; hres = IQuickActivate_QuickActivate(quick_activate, &container, &control); if(FAILED(hres)) @@ -108,6 +108,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IAdviseSinkEx, riid)) { TRACE("(%p)->(IID_IAdviseSinkEx %p)\n", This, ppv); *ppv = &This->IAdviseSinkEx_iface; + }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppv); + *ppv = &This->IPropertyNotifySink_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -270,6 +273,51 @@ static const IAdviseSinkExVtbl AdviseSinkExVtbl = { PHAdviseSinkEx_OnViewStatusChange }; +static inline PluginHost *impl_from_IPropertyNotifySink(IPropertyNotifySink *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IPropertyNotifySink_iface); +} + +static HRESULT WINAPI PHPropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHPropertyNotifySink_AddRef(IPropertyNotifySink *iface) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHPropertyNotifySink_Release(IPropertyNotifySink *iface) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHPropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHPropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) +{ + PluginHost *This = impl_from_IPropertyNotifySink(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { + PHPropertyNotifySink_QueryInterface, + PHPropertyNotifySink_AddRef, + PHPropertyNotifySink_Release, + PHPropertyNotifySink_OnChanged, + PHPropertyNotifySink_OnRequestEdit +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -278,8 +326,9 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) if(!host) return E_OUTOFMEMORY; - host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; - host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; + host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; + host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; + host->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 91c6323..236587a 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -21,6 +21,7 @@ typedef struct HTMLObjectElement HTMLObjectElement; typedef struct { IOleClientSite IOleClientSite_iface; IAdviseSinkEx IAdviseSinkEx_iface; + IPropertyNotifySink IPropertyNotifySink_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 384b738..4682c11 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -181,7 +181,6 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(container->cbSize == sizeof(*container), "container->cbSize = %d\n", container->cbSize); ok(container->pClientSite != NULL, "container->pClientSite == NULL\n"); ok(container->pAdviseSink != NULL, "container->pAdviseSink == NULL\n"); - todo_wine ok(container->pPropertyNotifySink != NULL, "container->pPropertyNotifySink == NULL\n"); ok(!container->pUnkEventSink, "container->pUnkEventSink != NULL\n"); ok(container->dwAmbientFlags == (QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE), @@ -209,6 +208,8 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pAdviseSink), "container->pClientSite != container->pAdviseSink\n"); + ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pPropertyNotifySink), + "container->pClientSite != container->pPropertyNotifySink\n"); return S_OK; }

1 0

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

Dec. 6, 2010

Module: wine Branch: master Commit: 890dc6d6a05354991c832d5767228f083a01ae43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890dc6d6a05354991c832d576… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:50:35 2010 +0100 mshtml: Added PluginHost's IOleInPlaceSite stub implementation. --- dlls/mshtml/pluginhost.c | 161 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 3 + 3 files changed, 165 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7e0dd0c..db11c02 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -114,6 +114,15 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IDispatch_iface; + }else if(IsEqualGUID(&IID_IOleWindow, riid)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = &This->IOleInPlaceSiteEx_iface; + }else if(IsEqualGUID(&IID_IOleInPlaceSite, riid)) { + TRACE("(%p)->(IID_IOleInPlaceSite %p)\n", This, ppv); + *ppv = &This->IOleInPlaceSiteEx_iface; + }else if(IsEqualGUID(&IID_IOleInPlaceSiteEx, riid)) { + TRACE("(%p)->(IID_IOleInPlaceSiteEx %p)\n", This, ppv); + *ppv = &This->IOleInPlaceSiteEx_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -385,6 +394,157 @@ static const IDispatchVtbl DispatchVtbl = { PHDispatch_Invoke }; +static inline PluginHost *impl_from_IOleInPlaceSiteEx(IOleInPlaceSiteEx *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IOleInPlaceSiteEx_iface); +} + +static HRESULT WINAPI PHInPlaceSite_QueryInterface(IOleInPlaceSiteEx *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHInPlaceSite_AddRef(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHInPlaceSite_Release(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHInPlaceSite_GetWindow(IOleInPlaceSiteEx *iface, HWND *phwnd) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *iface, BOOL fEnterMode) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_CanInPlaceActivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnUIActivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface, + IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, RECT *lprcPosRect, + RECT *lprcClipRect, OLEINPLACEFRAMEINFO *frame_info) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%p %p %p %p %p)\n", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, frame_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_Scroll(IOleInPlaceSiteEx *iface, SIZE scrollExtent) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->({%d %d})\n", This, scrollExtent.cx, scrollExtent.cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnUIDeactivate(IOleInPlaceSiteEx *iface, BOOL fUndoable) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%x)\n", This, fUndoable); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnInPlaceDeactivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_DiscardUndoState(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_DeactivateAndUndo(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSite_OnPosRectChange(IOleInPlaceSiteEx *iface, LPCRECT lprcPosRect) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%p)\n", This, lprcPosRect); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSiteEx_OnInPlaceActivateEx(IOleInPlaceSiteEx *iface, BOOL *pfNoRedraw, DWORD dwFlags) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%p %x)\n", This, pfNoRedraw, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSiteEx_OnInPlaceDeactivateEx(IOleInPlaceSiteEx *iface, BOOL fNoRedraw) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)->(%x)\n", This, fNoRedraw); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHInPlaceSiteEx_RequestUIActivate(IOleInPlaceSiteEx *iface) +{ + PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IOleInPlaceSiteExVtbl OleInPlaceSiteExVtbl = { + PHInPlaceSite_QueryInterface, + PHInPlaceSite_AddRef, + PHInPlaceSite_Release, + PHInPlaceSite_GetWindow, + PHInPlaceSite_ContextSensitiveHelp, + PHInPlaceSite_CanInPlaceActivate, + PHInPlaceSite_OnInPlaceActivate, + PHInPlaceSite_OnUIActivate, + PHInPlaceSite_GetWindowContext, + PHInPlaceSite_Scroll, + PHInPlaceSite_OnUIDeactivate, + PHInPlaceSite_OnInPlaceDeactivate, + PHInPlaceSite_DiscardUndoState, + PHInPlaceSite_DeactivateAndUndo, + PHInPlaceSite_OnPosRectChange, + PHInPlaceSiteEx_OnInPlaceActivateEx, + PHInPlaceSiteEx_OnInPlaceDeactivateEx, + PHInPlaceSiteEx_RequestUIActivate +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -397,6 +557,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; host->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; host->IDispatch_iface.lpVtbl = &DispatchVtbl; + host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 4965d9a..077cf0c 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -23,6 +23,7 @@ typedef struct { IAdviseSinkEx IAdviseSinkEx_iface; IPropertyNotifySink IPropertyNotifySink_iface; IDispatch IDispatch_iface; + IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 55e4952..3842bbd 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -93,6 +93,9 @@ static const REFIID pluginhost_iids[] = { &IID_IAdviseSinkEx, &IID_IPropertyNotifySink, &IID_IDispatch, + &IID_IOleWindow, + &IID_IOleInPlaceSite, + &IID_IOleInPlaceSiteEx, NULL };

1 0

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

Dec. 6, 2010

Module: wine Branch: master Commit: 06aa58f44be8d2d0fde3eb91fb27089a3e45b37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=06aa58f44be8d2d0fde3eb91f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:50:12 2010 +0100 mshtml: Added PluginHost's IDispatch stub implementation. --- dlls/mshtml/pluginhost.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 37 +++++++++++++++++++++++ 3 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7853899..7e0dd0c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -111,6 +111,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppv); *ppv = &This->IPropertyNotifySink_iface; + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = &This->IDispatch_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -318,6 +321,70 @@ static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PHPropertyNotifySink_OnRequestEdit }; +static inline PluginHost *impl_from_IDispatch(IDispatch *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IDispatch_iface); +} + +static HRESULT WINAPI PHDispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IDispatch(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHDispatch_AddRef(IDispatch *iface) +{ + PluginHost *This = impl_from_IDispatch(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHDispatch_Release(IDispatch *iface) +{ + PluginHost *This = impl_from_IDispatch(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + PluginHost *This = impl_from_IDispatch(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHDispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + PluginHost *This = impl_from_IDispatch(iface); + FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + PluginHost *This = impl_from_IDispatch(iface); + FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHDispatch_Invoke(IDispatch *iface, DISPID dispid, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + PluginHost *This = impl_from_IDispatch(iface); + FIXME("(%p)->(%d %x %p %p)\n", This, dispid, wFlags, pDispParams, pVarResult); + return E_NOTIMPL; +} + +static const IDispatchVtbl DispatchVtbl = { + PHDispatch_QueryInterface, + PHDispatch_AddRef, + PHDispatch_Release, + PHDispatch_GetTypeInfoCount, + PHDispatch_GetTypeInfo, + PHDispatch_GetIDsOfNames, + PHDispatch_Invoke +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -329,6 +396,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; host->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; + host->IDispatch_iface.lpVtbl = &DispatchVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 236587a..4965d9a 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -22,6 +22,7 @@ typedef struct { IOleClientSite IOleClientSite_iface; IAdviseSinkEx IAdviseSinkEx_iface; IPropertyNotifySink IPropertyNotifySink_iface; + IDispatch IDispatch_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 4682c11..55e4952 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -87,6 +87,27 @@ static const char object_ax_str[] = "</object>" "</body></html>"; +static const REFIID pluginhost_iids[] = { + &IID_IOleClientSite, + &IID_IAdviseSink, + &IID_IAdviseSinkEx, + &IID_IPropertyNotifySink, + &IID_IDispatch, + NULL +}; + +static const char *dbgstr_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 BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) { IUnknown *unk1, *unk2; @@ -102,6 +123,21 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } +#define test_ifaces(i,ids) _test_ifaces(__LINE__,i,ids) +static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) +{ + const IID * const *piid; + IUnknown *unk; + HRESULT hres; + + 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); + if(SUCCEEDED(hres)) + IUnknown_Release(unk); + } +} + static HRESULT ax_qi(REFIID,void**); static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) @@ -210,6 +246,7 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA "container->pClientSite != container->pAdviseSink\n"); ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pPropertyNotifySink), "container->pClientSite != container->pPropertyNotifySink\n"); + test_ifaces((IUnknown*)container->pClientSite, pluginhost_iids); return S_OK; }

1 0

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

Dec. 6, 2010

Module: wine Branch: master Commit: 546f4bf5e3c87690a2638efa916f3f542d74c106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546f4bf5e3c87690a2638efa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:49:16 2010 +0100 mshtml: Added PluginHost's IAdviseSinkEx stub implementation. --- dlls/mshtml/pluginhost.c | 80 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 19 ++++++++++- 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 5b04399..1111071 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -63,7 +63,7 @@ static void activate_plugin(PluginHost *host) container.pClientSite = &host->IOleClientSite_iface; container.dwAmbientFlags = QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE; - container.pAdviseSink = NULL; /* FIXME */ + container.pAdviseSink = &host->IAdviseSinkEx_iface; container.pPropertyNotifySink = NULL; /* FIXME */ hres = IQuickActivate_QuickActivate(quick_activate, &container, &control); @@ -102,6 +102,12 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IOleClientSite, riid)) { TRACE("(%p)->(IID_IOleClientSite %p)\n", This, ppv); *ppv = &This->IOleClientSite_iface; + }else if(IsEqualGUID(&IID_IAdviseSink, riid)) { + TRACE("(%p)->(IID_IAdviseSink %p)\n", This, ppv); + *ppv = &This->IAdviseSinkEx_iface; + }else if(IsEqualGUID(&IID_IAdviseSinkEx, riid)) { + TRACE("(%p)->(IID_IAdviseSinkEx %p)\n", This, ppv); + *ppv = &This->IAdviseSinkEx_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -193,6 +199,77 @@ static const IOleClientSiteVtbl OleClientSiteVtbl = { PHClientSite_RequestNewObjectLayout }; +static inline PluginHost *impl_from_IAdviseSinkEx(IAdviseSinkEx *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IAdviseSinkEx_iface); +} + +static HRESULT WINAPI PHAdviseSinkEx_QueryInterface(IAdviseSinkEx *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHAdviseSinkEx_AddRef(IAdviseSinkEx *iface) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHAdviseSinkEx_Release(IAdviseSinkEx *iface) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static void WINAPI PHAdviseSinkEx_OnDataChange(IAdviseSinkEx *iface, FORMATETC *pFormatetc, STGMEDIUM *pStgMedium) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)->(%p %p)\n", This, pFormatetc, pStgMedium); +} + +static void WINAPI PHAdviseSinkEx_OnViewChange(IAdviseSinkEx *iface, DWORD dwAspect, LONG lindex) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)->(%d %d)\n", This, dwAspect, lindex); +} + +static void WINAPI PHAdviseSinkEx_OnRename(IAdviseSinkEx *iface, IMoniker *pmk) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)->(%p)\n", This, pmk); +} + +static void WINAPI PHAdviseSinkEx_OnSave(IAdviseSinkEx *iface) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)\n", This); +} + +static void WINAPI PHAdviseSinkEx_OnClose(IAdviseSinkEx *iface) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)\n", This); +} + +static void WINAPI PHAdviseSinkEx_OnViewStatusChange(IAdviseSinkEx *iface, DWORD dwViewStatus) +{ + PluginHost *This = impl_from_IAdviseSinkEx(iface); + FIXME("(%p)->(%d)\n", This, dwViewStatus); +} + +static const IAdviseSinkExVtbl AdviseSinkExVtbl = { + PHAdviseSinkEx_QueryInterface, + PHAdviseSinkEx_AddRef, + PHAdviseSinkEx_Release, + PHAdviseSinkEx_OnDataChange, + PHAdviseSinkEx_OnViewChange, + PHAdviseSinkEx_OnRename, + PHAdviseSinkEx_OnSave, + PHAdviseSinkEx_OnClose, + PHAdviseSinkEx_OnViewStatusChange +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -202,6 +279,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) return E_OUTOFMEMORY; host->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; + host->IAdviseSinkEx_iface.lpVtbl = &AdviseSinkExVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 5d53e08..91c6323 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -20,6 +20,7 @@ typedef struct HTMLObjectElement HTMLObjectElement; typedef struct { IOleClientSite IOleClientSite_iface; + IAdviseSinkEx IAdviseSinkEx_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index dc3d903..384b738 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -87,6 +87,21 @@ static const char object_ax_str[] = "</object>" "</body></html>"; +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + + if(iface1 == iface2) + return TRUE; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_Release(unk1); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + IUnknown_Release(unk2); + + return unk1 == unk2; +} + static HRESULT ax_qi(REFIID,void**); static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) @@ -165,7 +180,6 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(container != NULL, "container == NULL\n"); ok(container->cbSize == sizeof(*container), "container->cbSize = %d\n", container->cbSize); ok(container->pClientSite != NULL, "container->pClientSite == NULL\n"); - todo_wine ok(container->pAdviseSink != NULL, "container->pAdviseSink == NULL\n"); todo_wine ok(container->pPropertyNotifySink != NULL, "container->pPropertyNotifySink == NULL\n"); @@ -193,6 +207,9 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(!control->dwPropNotifyCookie, "control->dwPropNotifyCookie = %x\n", control->dwPropNotifyCookie); ok(!control->dwPointerActivationPolicy, "control->dwPointerActivationPolicy = %x\n", control->dwPointerActivationPolicy); + ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pAdviseSink), + "container->pClientSite != container->pAdviseSink\n"); + return S_OK; }

1 0

Hans Leidekker : msi: Map neutral parts of package language ids to the system default language id .
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

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

Michael Stefaniuc : mshtml: Use an iface instead of an vtbl pointer in HTMLAnchorElement.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

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 : mshtml: Use an iface instead of a vtbl pointer in HTMLRect.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

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

Dec. 6, 2010

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

Henri Verbeet : wined3d: Explicitly pass shader_data, reg_maps and gl_info to vshader_add_footer().
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: 78652a5fe86392e3c3641afcd6d927924aa08c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=78652a5fe86392e3c3641afcd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 5 23:46:55 2010 +0100 wined3d: Explicitly pass shader_data, reg_maps and gl_info to vshader_add_footer(). --- dlls/wined3d/arb_program_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d7626af..53541ea 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3097,13 +3097,11 @@ static void shader_hw_label(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "l%u:\n", ins->src[0].reg.idx); } -static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_shader_buffer *buffer, - const struct arb_vs_compile_args *args, struct shader_arb_ctx_priv *priv_ctx) +static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, + const struct arb_vshader_private *shader_data, const struct arb_vs_compile_args *args, + const struct shader_reg_maps *reg_maps, const struct wined3d_gl_info *gl_info, + struct wined3d_shader_buffer *buffer) { - const struct arb_vshader_private *shader_data = This->baseShader.backend_data; - const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; unsigned int i; /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used @@ -3200,7 +3198,8 @@ static void shader_hw_ret(const struct wined3d_shader_instruction *ins) if(vshader) { - if(priv->in_main_func) vshader_add_footer((IWineD3DVertexShaderImpl *) shader, buffer, priv->cur_vs_args, priv); + if (priv->in_main_func) vshader_add_footer(priv, shader->baseShader.backend_data, + priv->cur_vs_args, ins->ctx->reg_maps, ins->ctx->gl_info, buffer); } shader_addline(buffer, "RET;\n"); @@ -4183,7 +4182,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); - if(!priv_ctx.footer_written) vshader_add_footer(This, buffer, args, &priv_ctx); + if (!priv_ctx.footer_written) vshader_add_footer(&priv_ctx, + shader_data, args, reg_maps, gl_info, buffer); shader_addline(buffer, "END\n");

1 0

Aric Stewart : wineqtdecoder: Initial version of the video decoder using Mac OS/X QuickTime Framework.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: eefe6f65c1ba208e32e9dad836c885347cda7e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefe6f65c1ba208e32e9dad83… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 3 07:33:08 2010 -0600 wineqtdecoder: Initial version of the video decoder using Mac OS/X QuickTime Framework. --- configure | 6 + configure.ac | 4 + dlls/wineqtdecoder/Makefile.in | 9 + dlls/wineqtdecoder/main.c | 135 ++++++++ dlls/wineqtdecoder/qtvdecoder.c | 609 +++++++++++++++++++++++++++++++++ dlls/wineqtdecoder/wineqtdecoder.spec | 4 + 6 files changed, 767 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eefe6f65c1ba208e32e9d…

1 0