December 2010 - Wine-commits

Jacek Caban : mshtml: Added PluginHost's IDispatch stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

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 IOleInPlaceSite stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

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 IOleControlSite stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: dc062aee5a18e0884cd19157d738acca21bb2675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc062aee5a18e0884cd19157d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:50:52 2010 +0100 mshtml: Added PluginHost's IOleControlSite stub implementation. --- dlls/mshtml/pluginhost.c | 89 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 1 + 3 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index db11c02..4b8f1b1 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -123,6 +123,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IOleInPlaceSiteEx, riid)) { TRACE("(%p)->(IID_IOleInPlaceSiteEx %p)\n", This, ppv); *ppv = &This->IOleInPlaceSiteEx_iface; + }else if(IsEqualGUID(&IID_IOleControlSite, riid)) { + TRACE("(%p)->(IID_IOleControlSite %p)\n", This, ppv); + *ppv = &This->IOleControlSite_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -545,6 +548,91 @@ static const IOleInPlaceSiteExVtbl OleInPlaceSiteExVtbl = { PHInPlaceSiteEx_RequestUIActivate }; +static inline PluginHost *impl_from_IOleControlSite(IOleControlSite *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IOleControlSite_iface); +} + +static HRESULT WINAPI PHControlSite_QueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHControlSite_AddRef(IOleControlSite *iface) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHControlSite_Release(IOleControlSite *iface) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHControlSite_OnControlInfoChanged(IOleControlSite *iface) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_LockInPlaceActive(IOleControlSite *iface, BOOL fLock) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%x)\n", This, fLock); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_GetExtendedControl(IOleControlSite *iface, IDispatch **ppDisp) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%p)\n", This, ppDisp); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_TransformCoords(IOleControlSite *iface, POINTL *pPtlHimetric, POINTF *pPtfContainer, DWORD dwFlags) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%p %p %x)\n", This, pPtlHimetric, pPtfContainer, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_TranslateAccelerator(IOleControlSite *iface, MSG *pMsg, DWORD grfModifiers) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%x)\n", This, grfModifiers); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_OnFocus(IOleControlSite *iface, BOOL fGotFocus) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%x)\n", This, fGotFocus); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHControlSite_ShowPropertyFrame(IOleControlSite *iface) +{ + PluginHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IOleControlSiteVtbl OleControlSiteVtbl = { + PHControlSite_QueryInterface, + PHControlSite_AddRef, + PHControlSite_Release, + PHControlSite_OnControlInfoChanged, + PHControlSite_LockInPlaceActive, + PHControlSite_GetExtendedControl, + PHControlSite_TransformCoords, + PHControlSite_TranslateAccelerator, + PHControlSite_OnFocus, + PHControlSite_ShowPropertyFrame +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -558,6 +646,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; host->IDispatch_iface.lpVtbl = &DispatchVtbl; host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; + host->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 077cf0c..316ce57 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -24,6 +24,7 @@ typedef struct { IPropertyNotifySink IPropertyNotifySink_iface; IDispatch IDispatch_iface; IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; + IOleControlSite IOleControlSite_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 3842bbd..aa8c0e1 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -96,6 +96,7 @@ static const REFIID pluginhost_iids[] = { &IID_IOleWindow, &IID_IOleInPlaceSite, &IID_IOleInPlaceSiteEx, + &IID_IOleControlSite, NULL };

1 0

Jacek Caban : mshtml: Added PluginHost's IBindHost stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 4479194e48dfa55c2f277db0a1f8ef8c753aca6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4479194e48dfa55c2f277db0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:51:05 2010 +0100 mshtml: Added PluginHost's IBindHost stub implementation. --- dlls/mshtml/pluginhost.c | 59 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 1 + 3 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 4b8f1b1..f652b82 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -126,6 +126,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IOleControlSite, riid)) { TRACE("(%p)->(IID_IOleControlSite %p)\n", This, ppv); *ppv = &This->IOleControlSite_iface; + }else if(IsEqualGUID(&IID_IBindHost, riid)) { + TRACE("(%p)->(IID_IBindHost %p)\n", This, ppv); + *ppv = &This->IBindHost_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -633,6 +636,61 @@ static const IOleControlSiteVtbl OleControlSiteVtbl = { PHControlSite_ShowPropertyFrame }; +static inline PluginHost *impl_from_IBindHost(IBindHost *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IBindHost_iface); +} + +static HRESULT WINAPI PHBindHost_QueryInterface(IBindHost *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IBindHost(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHBindHost_AddRef(IBindHost *iface) +{ + PluginHost *This = impl_from_IBindHost(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHBindHost_Release(IBindHost *iface) +{ + PluginHost *This = impl_from_IBindHost(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHBindHost_CreateMoniker(IBindHost *iface, LPOLESTR szName, IBindCtx *pBC, IMoniker **ppmk, DWORD dwReserved) +{ + PluginHost *This = impl_from_IBindHost(iface); + FIXME("(%p)->(%s %p %p %x)\n", This, debugstr_w(szName), pBC, ppmk, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHBindHost_MonikerBindToStorage(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC, + IBindStatusCallback *pBSC, REFIID riid, void **ppvObj) +{ + PluginHost *This = impl_from_IBindHost(iface); + FIXME("(%p)->(%p %p %p %s %p)\n", This, pMk, pBC, pBSC, debugstr_guid(riid), ppvObj); + return E_NOTIMPL; +} + +static HRESULT WINAPI PHBindHost_MonikerBindToObject(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC, + IBindStatusCallback *pBSC, REFIID riid, void **ppvObj) +{ + PluginHost *This = impl_from_IBindHost(iface); + FIXME("(%p)->(%p %p %p %s %p)\n", This, pMk, pBC, pBSC, debugstr_guid(riid), ppvObj); + return E_NOTIMPL; +} + +static const IBindHostVtbl BindHostVtbl = { + PHBindHost_QueryInterface, + PHBindHost_AddRef, + PHBindHost_Release, + PHBindHost_CreateMoniker, + PHBindHost_MonikerBindToStorage, + PHBindHost_MonikerBindToObject +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -647,6 +705,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IDispatch_iface.lpVtbl = &DispatchVtbl; host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; host->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl; + host->IBindHost_iface.lpVtbl = &BindHostVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 316ce57..2e87ea3 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -25,6 +25,7 @@ typedef struct { IDispatch IDispatch_iface; IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; IOleControlSite IOleControlSite_iface; + IBindHost IBindHost_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index aa8c0e1..51a6b84 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -97,6 +97,7 @@ static const REFIID pluginhost_iids[] = { &IID_IOleInPlaceSite, &IID_IOleInPlaceSiteEx, &IID_IOleControlSite, + &IID_IBindHost, NULL };

1 0

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

06 Dec '10

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

06 Dec '10

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

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 + +(a)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

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

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

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