January 2016 - Wine-commits

Jacek Caban : mshtml: Added IHTMLCurrentStyle::overflowY implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 4ee484c2ebea86f9ec61d7dcf7ac9849b9815fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee484c2ebea86f9ec61d7dcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 13:51:56 2016 +0100 mshtml: Added IHTMLCurrentStyle::overflowY implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index cace5ba..b7f9731 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -788,8 +788,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_overflowX(IHTMLCurrentStyle *iface, B static HRESULT WINAPI HTMLCurrentStyle_get_overflowY(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_Y, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_textTransform(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e5f9619..d568a2f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2909,6 +2909,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCurrentStyle_get_overflowY(current_style, &str); + ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowY = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style); b = 100;

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle4:: get_maxHeight implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 27182667ccbe6f903ab1986bf89f9e4b392c9fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27182667ccbe6f903ab1986bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 13:52:07 2016 +0100 mshtml: Added IHTMLCurrentStyle4::get_maxHeight implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index b7f9731..df3281d 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1281,8 +1281,8 @@ static HRESULT WINAPI HTMLCurrentStyle4_get_maxHeight(IHTMLCurrentStyle4 *iface, static HRESULT WINAPI HTMLCurrentStyle4_get_minWidth(IHTMLCurrentStyle4 *iface, VARIANT *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle4(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MIN_WIDTH, p, 0); } static HRESULT WINAPI HTMLCurrentStyle4_get_maxWidth(IHTMLCurrentStyle4 *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index d568a2f..94ccc76 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2634,6 +2634,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) { IHTMLCurrentStyle2 *current_style2; IHTMLCurrentStyle3 *current_style3; + IHTMLCurrentStyle4 *current_style4; VARIANT_BOOL b; BSTR str; HRESULT hres; @@ -2932,6 +2933,16 @@ static void test_current_style(IHTMLCurrentStyle *current_style) SysFreeString(str); IHTMLCurrentStyle3_Release(current_style3); + + hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle4, (void**)&current_style4); + ok(hres == S_OK, "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); + + hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); + VariantClear(&v); + + IHTMLCurrentStyle4_Release(current_style4); } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName interface stub implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 40b2deb843301987c89a912014226afcda280825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b2deb843301987c89a91201… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:24 2016 +0100 mshtml: Added IHTMLUniqueName interface stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 1 + 3 files changed, 83 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e5ae4e0..defa10a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3791,6 +3791,84 @@ static const IHTMLElement4Vtbl HTMLElement4Vtbl = { HTMLElement4_get_onfocusout }; +static inline HTMLElement *impl_from_IHTMLUniqueName(IHTMLUniqueName *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IHTMLUniqueName_iface); +} + +static HRESULT WINAPI HTMLUniqueName_QueryInterface(IHTMLUniqueName *iface, REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI HTMLUniqueName_AddRef(IHTMLUniqueName *iface) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI HTMLUniqueName_Release(IHTMLUniqueName *iface) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI HTMLUniqueName_GetTypeInfoCount(IHTMLUniqueName *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLUniqueName_GetTypeInfo(IHTMLUniqueName *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLUniqueName_GetIDsOfNames(IHTMLUniqueName *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LONG *p) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLUniqueNameVtbl HTMLUniqueNameVtbl = { + HTMLUniqueName_QueryInterface, + HTMLUniqueName_AddRef, + HTMLUniqueName_Release, + HTMLUniqueName_GetTypeInfoCount, + HTMLUniqueName_GetTypeInfo, + HTMLUniqueName_GetIDsOfNames, + HTMLUniqueName_Invoke, + HTMLUniqueName_get_uniqueNumber, + HTMLUniqueName_get_uniqueID +}; + static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLElement, node); @@ -3812,6 +3890,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLElement3_iface; }else if(IsEqualGUID(&IID_IHTMLElement4, riid)) { *ppv = &This->IHTMLElement4_iface; + }else if(IsEqualGUID(&IID_IHTMLUniqueName, riid)) { + *ppv = &This->IHTMLUniqueName_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { *ppv = &This->cp_container.IConnectionPointContainer_iface; }else { @@ -4072,6 +4152,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IHTMLElement2_iface.lpVtbl = &HTMLElement2Vtbl; This->IHTMLElement3_iface.lpVtbl = &HTMLElement3Vtbl; This->IHTMLElement4_iface.lpVtbl = &HTMLElement4Vtbl; + This->IHTMLUniqueName_iface.lpVtbl = &HTMLUniqueNameVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2b8fa82..b613f70 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -706,6 +706,7 @@ typedef struct { IHTMLElement2 IHTMLElement2_iface; IHTMLElement3 IHTMLElement3_iface; IHTMLElement4 IHTMLElement4_iface; + IHTMLUniqueName IHTMLUniqueName_iface; nsIDOMHTMLElement *nselem; HTMLStyle *style; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e90fc70..9a9cc85 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -179,6 +179,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLElement2, \ &IID_IHTMLElement3, \ &IID_IHTMLElement4, \ + &IID_IHTMLUniqueName, \ &IID_IDispatchEx static const IID * const elem_iids[] = {

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName:: get_uniqueNumber implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 881b2f08d900c1a497dbd9006535ae4ba4401cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=881b2f08d900c1a497dbd9006… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:38 2016 +0100 mshtml: Added IHTMLUniqueName::get_uniqueNumber implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index defa10a..61110c5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3843,11 +3843,21 @@ static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispI wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +static void ensure_unique_id(HTMLElement *elem) +{ + if(!elem->unique_id) + elem->unique_id = ++elem->node.doc->unique_id; +} + static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLUniqueName(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + ensure_unique_id(This); + *p = This->unique_id; + return S_OK; } static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName::get_uniqueID implementation.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: a52cb2b87a8f74af7c7d40c413557f5f826cf690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52cb2b87a8f74af7c7d40c41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:57 2016 +0100 mshtml: Added IHTMLUniqueName::get_uniqueID implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 +------ dlls/mshtml/htmlelem.c | 18 ++++++++++++++++-- dlls/mshtml/mshtml_private.h | 3 +++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 30236aa..87be653 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2021,15 +2021,10 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I static HRESULT WINAPI HTMLDocument3_get_uniqueID(IHTMLDocument3 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - WCHAR buf[32]; - - static const WCHAR formatW[] = {'m','s','_','_','i','d','%','u',0}; TRACE("(%p)->(%p)\n", This, p); - sprintfW(buf, formatW, ++This->doc_node->unique_id); - *p = SysAllocString(buf); - return *p ? S_OK : E_OUTOFMEMORY; + return elem_unique_id(++This->doc_node->unique_id, p); } static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR event, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 61110c5..cb0b864 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3843,6 +3843,17 @@ static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispI wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +HRESULT elem_unique_id(unsigned id, BSTR *p) +{ + WCHAR buf[32]; + + static const WCHAR formatW[] = {'m','s','_','_','i','d','%','u',0}; + + sprintfW(buf, formatW, id); + *p = SysAllocString(buf); + return *p ? S_OK : E_OUTOFMEMORY; +} + static void ensure_unique_id(HTMLElement *elem) { if(!elem->unique_id) @@ -3863,8 +3874,11 @@ static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LO static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLUniqueName(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + ensure_unique_id(This); + return elem_unique_id(This->unique_id, p); } static const IHTMLUniqueNameVtbl HTMLUniqueNameVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b613f70..51adb38 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -713,6 +713,7 @@ typedef struct { HTMLStyle *runtime_style; HTMLAttributeCollection *attrs; WCHAR *filter; + unsigned unique_id; } HTMLElement; #define HTMLELEMENT_TIDS \ @@ -1019,6 +1020,8 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PR HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; HRESULT elem_string_attr_setter(HTMLElement*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT elem_unique_id(unsigned id, BSTR *p) DECLSPEC_HIDDEN; + /* commands */ typedef struct { DWORD id;

1 0

Jacek Caban : mshtml/tests: Added IHTMLUniqueName tests.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: eb54df637470048212763e1e440b68e97c93cd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb54df637470048212763e1e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:02:02 2016 +0100 mshtml/tests: Added IHTMLUniqueName tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9a9cc85..2940cee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6209,10 +6209,13 @@ static void test_default_selection(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } -static void test_unique_id(IHTMLDocument2 *doc) +static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) { IHTMLDocument3 *doc3 = get_doc3_iface(doc); + IHTMLUniqueName *unique_name; + char buf[32]; BSTR id, id2; + LONG num; HRESULT hres; static const WCHAR prefixW[] = {'m','s','_','_','i','d',0}; @@ -6235,6 +6238,30 @@ static void test_unique_id(IHTMLDocument2 *doc) SysFreeString(id); SysFreeString(id2); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLUniqueName, (void**)&unique_name); + ok(hres == S_OK, "Could not get IHTMLUniqueName iface: %08x\n", hres); + + hres = IHTMLUniqueName_get_uniqueID(unique_name, &id); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + trace("id %s\n", wine_dbgstr_w(id)); + + hres = IHTMLUniqueName_get_uniqueID(unique_name, &id2); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(!lstrcmpW(id, id2), "unique names differ\n"); + trace("id %s\n", wine_dbgstr_w(id2)); + + hres = IHTMLUniqueName_get_uniqueNumber(unique_name, &num); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(num, "num = 0\n"); + + sprintf(buf, "ms__id%u", num); + ok(!strcmp_wa(id, buf), "unexpected id %s\n", wine_dbgstr_w(id)); + trace("num %d\n", num); + + SysFreeString(id); + SysFreeString(id2); + + IHTMLUniqueName_Release(unique_name); IHTMLDocument3_Release(doc3); } @@ -6272,10 +6299,9 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLDocument2_Release(doc_node); test_elem_client_rect((IUnknown*)elem); + test_unique_id(doc, elem); IHTMLElement_Release(elem); - - test_unique_id(doc); } static void test_default_body(IHTMLBodyElement *body)

1 0

Jacek Caban : mshtml: Expose IHTMLUniqueName for IDispatch of all element objects.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: 0987f7fdea8190b2a9ec32327b543519362009f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0987f7fdea8190b2a9ec32327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:02:11 2016 +0100 mshtml: Expose IHTMLUniqueName for IDispatch of all element objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 684f3ae..6405f9f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -801,7 +801,6 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { static const tid_t HTMLAnchorElement_iface_tids[] = { IHTMLAnchorElement_tid, HTMLELEMENT_TIDS, - IHTMLUniqueName_tid, 0 }; diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e4b7990..39b1faf 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -871,7 +871,6 @@ static const tid_t HTMLBodyElement_iface_tids[] = { IHTMLBodyElement2_tid, HTMLELEMENT_TIDS, IHTMLTextContainer_tid, - IHTMLUniqueName_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51adb38..2f03501 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -722,7 +722,8 @@ typedef struct { IHTMLElement_tid, \ IHTMLElement2_tid, \ IHTMLElement3_tid, \ - IHTMLElement4_tid + IHTMLElement4_tid, \ + IHTMLUniqueName_tid extern cp_static_data_t HTMLElementEvents2_data DECLSPEC_HIDDEN; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data}

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb immediately on TBM_SETPOS.
by Alexandre Julliard 11 Jan '16

11 Jan '16

Module: wine Branch: master Commit: a65ddbf153b8865e0565bf210e637bf2b0053196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65ddbf153b8865e0565bf210… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 9 23:45:20 2016 +0300 comctl32/trackbar: Update thumb immediately on TBM_SETPOS. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 7 ++++-- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index e496572..7c04d15 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -32,6 +32,16 @@ static const DWORD defaultstyle = WS_VISIBLE | TBS_TOOLTIPS | TBS_ENABLESELRANGE | TBS_FIXEDLENGTH | TBS_AUTOTICKS; static HWND hWndParent; +static LRESULT WINAPI trackbar_no_wmpaint_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == WM_PAINT) + return 0; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; static const struct message empty_seq[] = { @@ -465,6 +475,15 @@ static HWND create_trackbar(DWORD style, HWND parent){ return hWndTrack; } +static HWND create_trackbar2(DWORD style, HWND parent) +{ + RECT rect; + GetClientRect(parent, &rect); + return CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", style, + rect.right, rect.bottom, 100, 50, + parent, NULL, GetModuleHandleA(NULL), NULL); +} + /* test functions for setters, getters, and sequences */ static void test_trackbar_buddy(void) @@ -595,6 +614,8 @@ static void test_page_size(void) static void test_position(void) { HWND hWndTrackbar; + RECT rect, rect2; + WNDPROC oldproc; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -626,6 +647,34 @@ static void test_position(void) ok_sequence(sequences, PARENT_SEQ_INDEX, parent_position_test_seq, "parent position test sequence", TRUE); DestroyWindow(hWndTrackbar); + + hWndTrackbar = create_trackbar2(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + /* subclassing procedure blocks WM_PAINT */ + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + memset(&rect, 0, sizeof(rect)); + memset(&rect2, 0, sizeof(rect2)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + + /* without repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left == rect2.left, "got %d\n", rect.left); + + /* with repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 30); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 30, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left != rect2.left, "got %d\n", rect.left); + + DestroyWindow(hWndTrackbar); } static void test_range(void) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 6d092a3..c0f58db 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1229,9 +1229,12 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - if (fPosition && oldPos != lPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + if (fPosition && oldPos != lPosition) + { + TRACKBAR_UpdateThumb(infoPtr); + TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + } return 0; }

1 0

Alexandre Julliard : Wine release 1.9.1
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: website Branch: master Commit: 1b148c2a6658a5276b555edfa5b7ed2797329356 URL: http://source.winehq.org/git/website.git/?a=commit;h=1b148c2a6658a5276b555e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 9 18:32:28 2016 +0900 Wine release 1.9.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016010901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016010901.xml b/news/en/2016010901.xml new file mode 100644 index 0000000..f84c468 --- /dev/null +++ b/news/en/2016010901.xml @@ -0,0 +1,16 @@ +<news> +<date>January 9, 2016</date> +<title>Wine 1.9.1 Released</title> +<body> +<p> The Wine development release 1.9.1 is now available.</p> +<p> <a href="{$root}/announce/1.9.1">What's new</a> in this release: +<ul> + <li>A few more deferred fixes.</li> + <li>Support for debug registers on x86-64.</li> + <li>More Shader Model 4 instructions.</li> + <li>Support for the Mingw ARM toolchain.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Christian Costa : d3dx9: Improve generated DDS file header.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: d2307b1ffcf9ad935376078eb1f3d8f8c6aebcb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2307b1ffcf9ad935376078eb… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Dec 22 18:26:32 2015 +1100 d3dx9: Improve generated DDS file header. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 8 +++----- dlls/d3dx9_36/tests/surface.c | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index b14f5e7..4fa2a76 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -487,13 +487,11 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur memset(header, 0, sizeof(*header)); header->signature = MAKEFOURCC('D','D','S',' '); - header->size = sizeof(*header); - header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT | DDS_MIPMAPCOUNT; + /* The signature is not really part of the DDS header */ + header->size = sizeof(*header) - FIELD_OFFSET(struct dds_header, size); + header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT; header->height = src_desc.Height; header->width = src_desc.Width; - header->pitch_or_linear_size = dst_pitch; - header->depth = 1; - header->miplevels = 1; header->caps = DDS_CAPS_TEXTURE; hr = d3dformat_to_dds_pixel_format(&header->pixel_format, src_desc.Format); if (FAILED(hr)) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index f22bf21..183086f 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1277,14 +1277,14 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) header = ID3DXBuffer_GetBufferPointer(buffer); ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); - todo_wine ok(header->size == 124, "Invalid DDS size %u.\n", header->size); + ok(header->size == 124, "Invalid DDS size %u.\n", header->size); ok(header->height == 4, "Got unexpected height %u.\n", header->height); ok(header->width == 4, "Got unexpected width %u.\n", header->width); - todo_wine ok(!header->depth, "Got unexpected depth %u.\n", header->depth); - todo_wine ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); - todo_wine ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); + ok(!header->depth, "Got unexpected depth %u.\n", header->depth); + ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); + ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); todo_wine ok(header->caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %x.\n", header->caps); - todo_wine ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), + ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), "Got unexpected flags %x.\n", header->flags); ID3DXBuffer_Release(buffer);

1 0