September 2012 - Wine-commits

Alexandre Julliard : winex11: Move the GL drawable management to opengl.c.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: 9f042298f793d5a2f6687e323cc6ef903a990a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f042298f793d5a2f6687e323… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 31 12:22:03 2012 +0200 winex11: Move the GL drawable management to opengl.c. --- dlls/winex11.drv/opengl.c | 303 ++++++++++++++++++++++++++++++++++----- dlls/winex11.drv/window.c | 230 +------------------------------ dlls/winex11.drv/x11drv.h | 24 +--- dlls/winex11.drv/x11drv_main.c | 1 - 4 files changed, 270 insertions(+), 288 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f042298f793d5a2f6687…

1 0

Jacek Caban : mshtml: Moved getting frame by name to separated function.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: d3b77c4507fccfeeb7cf18e4e915be17426be6b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b77c4507fccfeeb7cf18e4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 17:34:44 2012 +0200 mshtml: Moved getting frame by name to separated function. --- dlls/mshtml/htmlwindow.c | 127 ++++++++++++++++++++++++++------------------- 1 files changed, 73 insertions(+), 54 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c45df2c..a95425a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -322,108 +322,127 @@ static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } -static HRESULT get_frame_by_index(nsIDOMWindowCollection *nsFrames, PRUint32 index, HTMLOuterWindow **ret) +static HRESULT get_frame_by_index(HTMLOuterWindow *This, PRUint32 index, HTMLOuterWindow **ret) { + nsIDOMWindowCollection *nsframes; + nsIDOMWindow *nswindow; PRUint32 length; - nsIDOMWindow *nsWindow; nsresult nsres; - nsres = nsIDOMWindowCollection_GetLength(nsFrames, &length); + nsres = nsIDOMWindow_GetFrames(This->nswindow, &nsframes); if(NS_FAILED(nsres)) { - FIXME("nsIDOMWindowCollection_GetLength failed: 0x%08x\n", nsres); + FIXME("nsIDOMWindow_GetFrames failed: 0x%08x\n", nsres); return E_FAIL; } - if(index >= length) + nsres = nsIDOMWindowCollection_GetLength(nsframes, &length); + assert(nsres == NS_OK); + + if(index >= length) { + nsIDOMWindowCollection_Release(nsframes); return DISP_E_MEMBERNOTFOUND; + } - nsres = nsIDOMWindowCollection_Item(nsFrames, index, &nsWindow); + nsres = nsIDOMWindowCollection_Item(nsframes, index, &nswindow); + nsIDOMWindowCollection_Release(nsframes); if(NS_FAILED(nsres)) { FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres); return E_FAIL; } - *ret = nswindow_to_window(nsWindow); - - nsIDOMWindow_Release(nsWindow); + *ret = nswindow_to_window(nswindow); + nsIDOMWindow_Release(nswindow); return S_OK; } -static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) +static HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, HTMLOuterWindow **ret) { - HTMLWindow *This = impl_from_IHTMLWindow2(iface); - nsIDOMWindowCollection *nsFrames; + nsIDOMWindowCollection *nsframes; HTMLOuterWindow *window = NULL; - HRESULT hres = S_OK; + PRUint32 length, i; nsresult nsres; + HRESULT hres = S_OK; - TRACE("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); - - nsres = nsIDOMWindow_GetFrames(This->outer_window->nswindow, &nsFrames); + nsres = nsIDOMWindow_GetFrames(This->nswindow, &nsframes); if(NS_FAILED(nsres)) { FIXME("nsIDOMWindow_GetFrames failed: 0x%08x\n", nsres); return E_FAIL; } + nsres = nsIDOMWindowCollection_GetLength(nsframes, &length); + assert(nsres == NS_OK); + + for(i = 0; i < length && !window; ++i) { + HTMLOuterWindow *window_iter; + nsIDOMWindow *nswindow; + BSTR id; + + nsres = nsIDOMWindowCollection_Item(nsframes, i, &nswindow); + if(NS_FAILED(nsres)) { + FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres); + hres = E_FAIL; + break; + } + + window_iter = nswindow_to_window(nswindow); + + nsIDOMWindow_Release(nswindow); + + hres = IHTMLElement_get_id(&window_iter->frame_element->element.IHTMLElement_iface, &id); + if(FAILED(hres)) { + FIXME("IHTMLElement_get_id failed: 0x%08x\n", hres); + break; + } + + if(id && !strcmpiW(id, name)) + window = window_iter; + + SysFreeString(id); + } + + nsIDOMWindowCollection_Release(nsframes); + if(FAILED(hres)) + return hres; + + *ret = window; + return NS_OK; +} + +static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) +{ + HTMLWindow *This = impl_from_IHTMLWindow2(iface); + HTMLOuterWindow *window = NULL; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); + switch(V_VT(pvarIndex)) { case VT_I4: { int index = V_I4(pvarIndex); TRACE("Getting index %d\n", index); if(index < 0) - break; - hres = get_frame_by_index(nsFrames, index, &window); + return DISP_E_MEMBERNOTFOUND; + hres = get_frame_by_index(This->outer_window, index, &window); break; } case VT_UINT: { unsigned int index = V_UINT(pvarIndex); TRACE("Getting index %u\n", index); - hres = get_frame_by_index(nsFrames, index, &window); + hres = get_frame_by_index(This->outer_window, index, &window); break; } case VT_BSTR: { BSTR str = V_BSTR(pvarIndex); - PRUint32 length, i; - TRACE("Getting name %s\n", wine_dbgstr_w(str)); - - nsIDOMWindowCollection_GetLength(nsFrames, &length); - - window = NULL; - for(i = 0; i < length && !window; ++i) { - HTMLOuterWindow *cur_window; - nsIDOMWindow *nsWindow; - BSTR id; - - nsres = nsIDOMWindowCollection_Item(nsFrames, i, &nsWindow); - if(NS_FAILED(nsres)) { - FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres); - hres = E_FAIL; - break; - } - - cur_window = nswindow_to_window(nsWindow); - - nsIDOMWindow_Release(nsWindow); - - hres = IHTMLElement_get_id(&cur_window->frame_element->element.IHTMLElement_iface, &id); - if(FAILED(hres)) { - FIXME("IHTMLElement_get_id failed: 0x%08x\n", hres); - break; - } - - if(!strcmpW(id, str)) - window = cur_window; - - SysFreeString(id); - } + hres = get_frame_by_name(This->outer_window, str, &window); break; } default: - hres = E_INVALIDARG; + WARN("Invalid index %s\n", debugstr_variant(pvarIndex)); + return E_INVALIDARG; } - nsIDOMWindowCollection_Release(nsFrames); if(FAILED(hres)) return hres; if(!window)

1 0

Jacek Caban : mshtml: Open targeted anchors in existing frames if available .
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: a5354174437aca0fc4c11da8d411bd7e710c44c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5354174437aca0fc4c11da8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 12:52:15 2012 +0200 mshtml: Open targeted anchors in existing frames if available. --- dlls/mshtml/htmlanchor.c | 13 +++++++++++-- dlls/mshtml/htmlwindow.c | 7 +++++-- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 4575d14..d9b9417 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -96,9 +96,18 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_Finish(&target_str); return S_OK; }else { - hres = navigate_anchor_window(This, target); + HTMLOuterWindow *top_window; + + get_top_window(This->element.node.doc->basedoc.window, &top_window); + + hres = get_frame_by_name(top_window, target, TRUE, &window); + if(FAILED(hres) || !window) { + hres = navigate_anchor_window(This, target); + nsAString_Finish(&target_str); + return hres; + } + nsAString_Finish(&target_str); - return hres; } } } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a95425a..1a12acc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -356,7 +356,7 @@ static HRESULT get_frame_by_index(HTMLOuterWindow *This, PRUint32 index, HTMLOut return S_OK; } -static HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, HTMLOuterWindow **ret) +HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, HTMLOuterWindow **ret) { nsIDOMWindowCollection *nsframes; HTMLOuterWindow *window = NULL; @@ -399,6 +399,9 @@ static HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, HTMLO window = window_iter; SysFreeString(id); + + if(!window && deep) + get_frame_by_name(window_iter, name, TRUE, &window); } nsIDOMWindowCollection_Release(nsframes); @@ -435,7 +438,7 @@ static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, case VT_BSTR: { BSTR str = V_BSTR(pvarIndex); TRACE("Getting name %s\n", wine_dbgstr_w(str)); - hres = get_frame_by_name(This->outer_window, str, &window); + hres = get_frame_by_name(This->outer_window, str, FALSE, &window); break; } default: diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 39b491e..2fecc12 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -906,6 +906,7 @@ void set_script_mode(HTMLOuterWindow*,SCRIPTMODE) DECLSPEC_HIDDEN; BOOL find_global_prop(HTMLInnerWindow*,BSTR,DWORD,ScriptHost**,DISPID*) DECLSPEC_HIDDEN; IDispatch *get_script_disp(ScriptHost*) DECLSPEC_HIDDEN; HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN; +HRESULT get_frame_by_name(HTMLOuterWindow*,const WCHAR*,BOOL,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Use nsIDOMWindowCollection:: NamedItem in get_window_by_name.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: 2dcb37e5203c68c4db99f7045729639021d0357a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcb37e5203c68c4db99f7045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 12:52:27 2012 +0200 mshtml: Use nsIDOMWindowCollection::NamedItem in get_window_by_name. --- dlls/mshtml/htmlwindow.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1a12acc..2ec4a7f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -360,6 +360,8 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H { nsIDOMWindowCollection *nsframes; HTMLOuterWindow *window = NULL; + nsIDOMWindow *nswindow; + nsAString name_str; PRUint32 length, i; nsresult nsres; HRESULT hres = S_OK; @@ -370,12 +372,24 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H return E_FAIL; } + nsAString_InitDepend(&name_str, name); + nsres = nsIDOMWindowCollection_NamedItem(nsframes, &name_str, &nswindow); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + nsIDOMWindowCollection_Release(nsframes); + return E_FAIL; + } + + if(nswindow) { + *ret = nswindow_to_window(nswindow); + return S_OK; + } + nsres = nsIDOMWindowCollection_GetLength(nsframes, &length); assert(nsres == NS_OK); for(i = 0; i < length && !window; ++i) { HTMLOuterWindow *window_iter; - nsIDOMWindow *nswindow; BSTR id; nsres = nsIDOMWindowCollection_Item(nsframes, i, &nswindow);

1 0

Jacek Caban : mshtml.idl: Added IHTMLIFrameElement2 and IHTMLIFrameElement3 declarations.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: d71ce1a282bd9b188fff467c4cfd77739bc7e613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71ce1a282bd9b188fff467c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 12:52:42 2012 +0200 mshtml.idl: Added IHTMLIFrameElement2 and IHTMLIFrameElement3 declarations. --- include/mshtmdid.h | 6 ++++ include/mshtml.idl | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index ade23f4..9e33845 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2884,6 +2884,12 @@ #define DISPID_IHTMLIFRAMEELEMENT2_HEIGHT STDPROPID_XOBJ_HEIGHT #define DISPID_IHTMLIFRAMEELEMENT2_WIDTH STDPROPID_XOBJ_WIDTH +/* IHTMLIFrameElement3 */ +#define DISPID_IHTMLIFRAMEELEMENT3_CONTENTDOCUMENT DISPID_IE8_IFRAME +#define DISPID_IHTMLIFRAMEELEMENT3_IE8_SRC DISPID_IE8_IFRAME+1 +#define DISPID_IHTMLIFRAMEELEMENT3_IE8_LONGDESC DISPID_IE8_IFRAME+2 +#define DISPID_IHTMLIFRAMEELEMENT3_IE8_FRAMEBORDER DISPID_IE8_IFRAME+3 + /* IHTMLStyleElement */ #define DISPID_IHTMLSTYLEELEMENT_TYPE DISPID_STYLEELEMENT+2 #define DISPID_IHTMLSTYLEELEMENT_READYSTATE DISPID_A_READYSTATE diff --git a/include/mshtml.idl b/include/mshtml.idl index 6618ac3..f71ecac 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -17159,6 +17159,63 @@ interface IHTMLIFrameElement : IDispatch } /***************************************************************************** + * IHTMLIFrameElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4e6-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLIFrameElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLIFRAMEELEMENT2_HEIGHT)] + HRESULT height([in] VARIANT v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT2_HEIGHT)] + HRESULT height([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT2_WIDTH)] + HRESULT width([in] VARIANT v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT2_WIDTH)] + HRESULT width([out, retval] VARIANT *p); +} + +/***************************************************************************** + * IHTMLIFrameElement3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510433-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLIFrameElement3 : IDispatch +{ + [propget, id(DISPID_IHTMLIFRAMEELEMENT3_CONTENTDOCUMENT)] + HRESULT contentDocument([out, retval] IDispatch **p); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_SRC)] + HRESULT src([in] BSTR v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_SRC)] + HRESULT src([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_LONGDESC)] + HRESULT longDesc([in] BSTR v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_LONGDESC)] + HRESULT longDesc([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_FRAMEBORDER)] + HRESULT frameBorder([in] BSTR v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_FRAMEBORDER)] + HRESULT frameBorder([out, retval] BSTR *p); +} + +/***************************************************************************** * DispHTMLIFrame dispinterface */ [ @@ -17200,6 +17257,27 @@ methods: [propget, id(DISPID_IHTMLIFRAMEELEMENT2_WIDTH)] VARIANT width(); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT3_CONTENTDOCUMENT)] + IDispatch *contentDocument(); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_SRC)] + void ie8_src(BSTR v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_SRC)] + BSTR ie8_src(); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_LONGDESC)] + void ie8_longDesc(BSTR v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_LONGDESC)] + BSTR ie8_longDesc(); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_FRAMEBORDER)] + void ie8_frameBorder(BSTR v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT3_IE8_FRAMEBORDER)] + BSTR ie8_frameBorder(); } /*****************************************************************************

1 0

Jacek Caban : mshtml: Added IHTMLIFrameElement2 stub implementation.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: 12a35ac9de888a303580629c6204bbfb4ad5c9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a35ac9de888a303580629c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 12:52:53 2012 +0200 mshtml: Added IHTMLIFrameElement2 stub implementation. --- dlls/mshtml/htmliframe.c | 107 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 1 + 3 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 3cae237..dccc7d0 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLFrameBase framebase; IHTMLIFrameElement IHTMLIFrameElement_iface; + IHTMLIFrameElement2 IHTMLIFrameElement2_iface; } HTMLIFrame; static inline HTMLIFrame *impl_from_IHTMLIFrameElement(IHTMLIFrameElement *iface) @@ -153,6 +154,107 @@ static const IHTMLIFrameElementVtbl HTMLIFrameElementVtbl = { HTMLIFrameElement_get_align }; +static inline HTMLIFrame *impl_from_IHTMLIFrameElement2(IHTMLIFrameElement2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLIFrame, IHTMLIFrameElement2_iface); +} + +static HRESULT WINAPI HTMLIFrameElement2_QueryInterface(IHTMLIFrameElement2 *iface, + REFIID riid, void **ppv) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + + return IHTMLDOMNode_QueryInterface(&This->framebase.element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLIFrameElement2_AddRef(IHTMLIFrameElement2 *iface) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + + return IHTMLDOMNode_AddRef(&This->framebase.element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLIFrameElement2_Release(IHTMLIFrameElement2 *iface) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + + return IHTMLDOMNode_Release(&This->framebase.element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLIFrameElement2_GetTypeInfoCount(IHTMLIFrameElement2 *iface, UINT *pctinfo) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + return IDispatchEx_GetTypeInfoCount(&This->framebase.element.node.dispex.IDispatchEx_iface, + pctinfo); +} + +static HRESULT WINAPI HTMLIFrameElement2_GetTypeInfo(IHTMLIFrameElement2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + return IDispatchEx_GetTypeInfo(&This->framebase.element.node.dispex.IDispatchEx_iface, iTInfo, + lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLIFrameElement2_GetIDsOfNames(IHTMLIFrameElement2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + return IDispatchEx_GetIDsOfNames(&This->framebase.element.node.dispex.IDispatchEx_iface, riid, + rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLIFrameElement2_Invoke(IHTMLIFrameElement2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + return IDispatchEx_Invoke(&This->framebase.element.node.dispex.IDispatchEx_iface, dispIdMember, + riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLIFrameElement2_put_height(IHTMLIFrameElement2 *iface, VARIANT v) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement2_get_height(IHTMLIFrameElement2 *iface, VARIANT *p) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement2_put_width(IHTMLIFrameElement2 *iface, VARIANT v) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement2_get_width(IHTMLIFrameElement2 *iface, VARIANT *p) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLIFrameElement2Vtbl HTMLIFrameElement2Vtbl = { + HTMLIFrameElement2_QueryInterface, + HTMLIFrameElement2_AddRef, + HTMLIFrameElement2_Release, + HTMLIFrameElement2_GetTypeInfoCount, + HTMLIFrameElement2_GetTypeInfo, + HTMLIFrameElement2_GetIDsOfNames, + HTMLIFrameElement2_Invoke, + HTMLIFrameElement2_put_height, + HTMLIFrameElement2_get_height, + HTMLIFrameElement2_put_width, + HTMLIFrameElement2_get_width +}; + static inline HTMLIFrame *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLIFrame, framebase.element.node); @@ -165,6 +267,9 @@ static HRESULT HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHTMLIFrameElement, riid)) { TRACE("(%p)->(IID_IHTMLIFrameElement %p)\n", This, ppv); *ppv = &This->IHTMLIFrameElement_iface; + }else if(IsEqualGUID(&IID_IHTMLIFrameElement2, riid)) { + TRACE("(%p)->(IID_IHTMLIFrameElement2 %p)\n", This, ppv); + *ppv = &This->IHTMLIFrameElement2_iface; }else { return HTMLFrameBase_QI(&This->framebase, riid, ppv); } @@ -266,6 +371,7 @@ static const tid_t HTMLIFrame_iface_tids[] = { IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLIFrameElement_tid, + IHTMLIFrameElement2_tid, 0 }; @@ -285,6 +391,7 @@ HRESULT HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTML return E_OUTOFMEMORY; ret->IHTMLIFrameElement_iface.lpVtbl = &HTMLIFrameElementVtbl; + ret->IHTMLIFrameElement2_iface.lpVtbl = &HTMLIFrameElement2Vtbl; ret->framebase.element.node.vtbl = &HTMLIFrameImplVtbl; HTMLFrameBase_Init(&ret->framebase, doc, nselem, &HTMLIFrame_dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2fecc12..8b5f841 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -146,6 +146,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLGenericElement) \ XIID(IHTMLHeadElement) \ XIID(IHTMLIFrameElement) \ + XIID(IHTMLIFrameElement2) \ XIID(IHTMLImageElementFactory) \ XIID(IHTMLImgElement) \ XIID(IHTMLInputElement) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 760580e..1b7de75 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -336,6 +336,7 @@ static const IID * const iframe_iids[] = { &IID_IHTMLFrameBase, &IID_IHTMLFrameBase2, &IID_IHTMLIFrameElement, + &IID_IHTMLIFrameElement2, &IID_IConnectionPointContainer, NULL };

1 0

Dan Kegel : msvcr100: Add wmemmove_s and wmemcpy_s.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: 481a8036ea8193743a7f8c87b3d1a667917093fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=481a8036ea8193743a7f8c87b… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Aug 31 08:00:24 2012 -0700 msvcr100: Add wmemmove_s and wmemcpy_s. --- configure | 1 + configure.ac | 1 + dlls/msvcr100/msvcr100.c | 55 +++++++++ dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr100/tests/Makefile.in | 9 ++ dlls/msvcr100/tests/msvcr100.c | 257 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 325 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=481a8036ea8193743a7f8…

1 0

Daniel Jelinski : comctl32/listview: Do not draw unnecessary grid lines.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: e389326bddcf42915e436ed030c1a12d9e982c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e389326bddcf42915e436ed03… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Aug 31 21:15:32 2012 +0200 comctl32/listview: Do not draw unnecessary grid lines. --- dlls/comctl32/listview.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e1b9a71..3c9a0cb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4943,10 +4943,7 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) itemheight = LISTVIEW_CalculateItemHeight(infoPtr); rcItem.left = infoPtr->rcList.left; rcItem.right = infoPtr->rcList.right; - rcItem.bottom = rcItem.top = Origin.y - 1; - MoveToEx(hdc, rcItem.left, rcItem.top, NULL); - LineTo(hdc, rcItem.right, rcItem.top); - for(y=itemheight-1+Origin.y; y<=infoPtr->rcList.bottom; y+=itemheight) + for(y = Origin.y > 1 ? Origin.y - 1 : itemheight - 1 + Origin.y % itemheight; y<=infoPtr->rcList.bottom; y+=itemheight) { rcItem.bottom = rcItem.top = y; TRACE("horz rcItem=%s\n", wine_dbgstr_rect(&rcItem));

1 0

Alexandre Julliard : winex11: Only create the client window when the pixel format is changed.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: d596b62d95f20d59e13e76aaac5e9652e4dda8cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d596b62d95f20d59e13e76aaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 30 16:18:46 2012 +0200 winex11: Only create the client window when the pixel format is changed. --- dlls/winex11.drv/systray.c | 3 +-- dlls/winex11.drv/window.c | 12 ++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 89b89a4..7efc63d 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -542,7 +542,6 @@ static void dock_systray_icon( Display *display, struct tray_icon *icon, Window attr.background_pixmap = ParentRelative; attr.bit_gravity = ForgetGravity; XChangeWindowAttributes( display, data->whole_window, CWBackPixmap | CWBitGravity, &attr ); - XChangeWindowAttributes( display, data->client_window, CWBackPixmap | CWBitGravity, &attr ); } /* dock systray windows again with the new owner */ @@ -619,7 +618,7 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) else { struct x11drv_win_data *data = X11DRV_get_win_data( icon->window ); - if (data) XClearArea( gdi_display, data->client_window, 0, 0, 0, 0, True ); + if (data) XClearArea( gdi_display, data->whole_window, 0, 0, 0, 0, True ); } } } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 52c18cf..ec51d37 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1697,13 +1697,6 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat visual, mask, &attr ); if (!data->whole_window) goto done; - if (!create_client_window( display, data, NULL )) - { - XDestroyWindow( display, data->whole_window ); - data->whole_window = 0; - goto done; - } - set_initial_wm_hints( display, data ); set_wm_hints( display, data ); @@ -1758,7 +1751,7 @@ static void destroy_whole_window( Display *display, struct x11drv_win_data *data TRACE( "win %p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); XDeleteContext( display, data->whole_window, winContext ); - XDeleteContext( display, data->client_window, winContext ); + if (data->client_window) XDeleteContext( display, data->client_window, winContext ); if (!already_destroyed) XDestroyWindow( display, data->whole_window ); data->whole_window = data->client_window = 0; data->wm_state = WithdrawnState; @@ -1886,11 +1879,10 @@ static struct x11drv_win_data *create_desktop_win_data( Display *display, HWND h struct x11drv_win_data *data; if (!(data = alloc_win_data( display, hwnd ))) return NULL; - data->whole_window = data->client_window = root_window; + data->whole_window = root_window; data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); - SetPropA( data->hwnd, client_window_prop, (HANDLE)root_window ); set_initial_wm_hints( display, data ); return data; }

1 0

Alexandre Julliard : winex11: Store the OpenGL drawable in a separate structure with its own context.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: fbac3194a5b90fd05fc3c367ed797a592a9be7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbac3194a5b90fd05fc3c367e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 30 17:46:33 2012 +0200 winex11: Store the OpenGL drawable in a separate structure with its own context. --- dlls/winex11.drv/window.c | 247 ++++++++++++++++++++-------------------- dlls/winex11.drv/x11drv.h | 5 +- dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 125 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbac3194a5b90fd05fc3c…

1 0