winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
972 discussions
Start a n
N
ew thread
Jacek Caban : mshtml: Don' t use simplified fragment-only navigation if there is post data to send.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: c77ba794b7042611d6500a37fdd4263f04cab8a9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c77ba794b7042611d6500a37f…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 15:15:39 2012 +0100 mshtml: Don't use simplified fragment-only navigation if there is post data to send. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9b650f4..9950511 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1920,7 +1920,7 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE } } - if(window->uri && compare_ignoring_frag(window->uri, uri)) { + if(window->uri && !post_data_size && compare_ignoring_frag(window->uri, uri)) { TRACE("fragment navigate\n"); return navigate_fragment(window, uri); }
1
0
0
0
Jacek Caban : mshtml: Use helpers in IHTMLStyle::paddingLeft implementation .
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: dec3a9c7b04bf7496c5fc1fea733ac6b22457715 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dec3a9c7b04bf7496c5fc1fea…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:34:22 2012 +0100 mshtml: Use helpers in IHTMLStyle::paddingLeft implementation. --- dlls/mshtml/htmlstyle.c | 27 +++------------------------ dlls/mshtml/tests/style.c | 2 ++ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 684f744..0487992 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1611,39 +1611,18 @@ static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(vt=%d)\n", This, V_VT(&v)); - - switch(V_VT(&v)) { - case VT_I4: { - WCHAR buf[14]; - - wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, STYLEID_PADDING_LEFT, buf, 0); - } - case VT_BSTR: - return set_style_attr(This, STYLEID_PADDING_LEFT, V_BSTR(&v), 0); - default: - FIXME("unsupported vt=%d\n", V_VT(&v)); - } + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingLeft(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - BSTR ret; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = get_style_attr(This, STYLEID_PADDING_LEFT, &ret); - if(FAILED(hres)) - return hres; - - V_VT(p) = VT_BSTR; - V_BSTR(p) = ret; - return S_OK; + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, p, 0); } static HRESULT WINAPI HTMLStyle_put_padding(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 03a433f..793b51c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1289,6 +1289,8 @@ static void test_body_style(IHTMLStyle *style) /* PaddingLeft */ hres = IHTMLStyle_get_paddingLeft(style, &vDefault); ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + ok(V_VT(&vDefault) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&vDefault)); + ok(!strcmp_wa(V_BSTR(&vDefault), "1px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&vDefault))); V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("10");
1
0
0
0
Jacek Caban : mshtml: Added IHTMLStyle::paddingBottom implementation.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: 9fc673f48e0b9fccfbb5861fa0f5b51751f82890 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9fc673f48e0b9fccfbb5861fa…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:34:05 2012 +0100 mshtml: Added IHTMLStyle::paddingBottom implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3e328ba..684f744 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1592,15 +1592,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingRight(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingBottom(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingBottom(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index a6ac67a..03a433f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1260,6 +1260,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_get_paddingBottom(style, &v); + ok(hres == S_OK, "get_paddingBottom: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingBottom(style, v); + ok(hres == S_OK, "put_paddingBottom failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingBottom(style, &v); + ok(hres == S_OK, "get_paddingBottom: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);
1
0
0
0
Jacek Caban : mshtml: Added IHTMLStyle::paddingRight implementation.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: 2de64c8a26f40f1f290d39ce4526b920b5aa71b8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2de64c8a26f40f1f290d39ce4…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:57 2012 +0100 mshtml: Added IHTMLStyle::paddingRight implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 13c00a8..3e328ba 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1574,15 +1574,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingTop(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingRight(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_RIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingRight(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_RIGHT, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingBottom(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index dc7908f..a6ac67a 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1244,6 +1244,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_get_paddingRight(style, &v); + ok(hres == S_OK, "get_paddingRight: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingRight(style, v); + ok(hres == S_OK, "put_paddingRight failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingRight(style, &v); + ok(hres == S_OK, "get_paddingRight: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);
1
0
0
0
Jacek Caban : mshtml: Added IHTMLStyle::paddingTop implementation.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: f01571182293bf4f97231119d23f7e8ba45ef811 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f01571182293bf4f97231119d…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:47 2012 +0100 mshtml: Added IHTMLStyle::paddingTop implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 523fc8f..13c00a8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1556,15 +1556,19 @@ static HRESULT WINAPI HTMLStyle_get_marginLeft(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingTop(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_TOP, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingTop(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_TOP, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingRight(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e950f83..dc7908f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1228,6 +1228,22 @@ static void test_body_style(IHTMLStyle *style) ok(!str, "padding = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLStyle_get_paddingTop(style, &v); + ok(hres == S_OK, "get_paddingTop: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingTop(style, v); + ok(hres == S_OK, "put_paddingTop failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingTop(style, &v); + ok(hres == S_OK, "get_paddingTop: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);
1
0
0
0
Jacek Caban : mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle:: put_marginLeft implementation.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: 7d18377ba4b216509d1b1f86f358b77c2bde0923 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7d18377ba4b216509d1b1f86f…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:38 2012 +0100 mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginLeft implementation. --- dlls/mshtml/htmlstyle.c | 21 ++------------------- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 77b7da1..523fc8f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1523,26 +1523,9 @@ static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - switch(V_VT(&v)) { - case VT_NULL: - TRACE("(%p)->(NULL)\n", This); - return set_style_attr(This, STYLEID_MARGIN_LEFT, emptyW, 0); - case VT_I4: { - WCHAR buf[14]; - - TRACE("(%p)->(%d)\n", This, V_I4(&v)); - - wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, STYLEID_MARGIN_LEFT, buf, 0); - } - case VT_BSTR: - TRACE("(%p)->(%s)\n", This, debugstr_w(V_BSTR(&v))); - return set_style_attr(This, STYLEID_MARGIN_LEFT, V_BSTR(&v), 0); - default: - FIXME("Unsupported vt=%d\n", V_VT(&v)); - } + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_LEFT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_put_margin(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 9033c8c..e950f83 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -404,6 +404,17 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_marginLeft(style, v); + ok(hres == S_OK, "put_marginLeft failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginLeft(style, &v); + ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_fontFamily(style, &str); ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres);
1
0
0
0
Jacek Caban : mshtml: Added IHTMLStyle:: marginBottom property implementation.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: 737dba7ae37dd837c036fef07bc6df18faefcc62 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=737dba7ae37dd837c036fef07…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:24 2012 +0100 mshtml: Added IHTMLStyle::marginBottom property implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9602f5e..77b7da1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1504,15 +1504,19 @@ static HRESULT WINAPI HTMLStyle_get_marginRight(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_marginBottom(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_BOTTOM, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_marginBottom(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_BOTTOM, p, 0); } static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 183d3f4..9033c8c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -382,6 +382,23 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginBottom(style, &v); + ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_marginBottom(style, v); + ok(hres == S_OK, "put_marginBottom failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginBottom(style, &v); + ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginLeft(style, &v); ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v));
1
0
0
0
Jacek Caban : mshtml: Use ATTR_FIX_PX in IHTMLStyle::put_marginTop.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: 1ea652900767389816034f32bf93c19e21975ccf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1ea652900767389816034f32b…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:15 2012 +0100 mshtml: Use ATTR_FIX_PX in IHTMLStyle::put_marginTop. --- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/tests/style.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e21753b..9602f5e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1473,7 +1473,7 @@ static HRESULT WINAPI HTMLStyle_put_marginTop(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, &v, 0); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_marginTop(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 4a0b9fb..183d3f4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -729,6 +729,18 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_I4; + V_I4(&v) = 5; + hres = IHTMLStyle_put_marginTop(style, v); + ok(hres == S_OK, "put_marginTop failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_marginTop(style, &v); + ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "5px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = NULL; hres = IHTMLStyle_get_border(style, &str); ok(hres == S_OK, "get_border failed: %08x\n", hres);
1
0
0
0
Jacek Caban : mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle:: put_marginRight.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: 2858d44ed56e0b6bb2d6f64a25b08f43973eb99c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2858d44ed56e0b6bb2d6f64a2…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:02 2012 +0100 mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginRight. --- dlls/mshtml/htmlstyle.c | 17 +---------------- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f006193..e21753b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1491,22 +1491,7 @@ static HRESULT WINAPI HTMLStyle_put_marginRight(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(v(%d))\n", This, V_VT(&v)); - switch(V_VT(&v)) { - case VT_NULL: - return set_style_attr(This, STYLEID_MARGIN_RIGHT, emptyW, 0); - case VT_I4: { - WCHAR buf[14]; - - wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, STYLEID_MARGIN_RIGHT, buf, 0); - } - case VT_BSTR: - return set_style_attr(This, STYLEID_MARGIN_RIGHT, V_BSTR(&v), 0); - default: - FIXME("Unsupported vt=%d\n", V_VT(&v)); - } - - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_RIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_marginRight(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index bdb3dc2..4a0b9fb 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -370,6 +370,17 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_marginRight(style, v); + ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginRight(style, &v); + ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginLeft(style, &v); ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres);
1
0
0
0
Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixArray() test.
by Alexandre Julliard
26 Jan '12
26 Jan '12
Module: wine Branch: master Commit: 3efd2f9a1b03fa0c3deb8378533e61b7c8cab655 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3efd2f9a1b03fa0c3deb83785…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 26 11:40:57 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrixArray() test. --- dlls/d3dx9_36/tests/effect.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index e3c6dde..31edcb6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1931,6 +1931,47 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetMatrixArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < element * 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrixArray(effect, parameter, (D3DXMATRIX *)input_value, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) + { + UINT n; + + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l + m * 4 + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);
1
0
0
0
← Newer
1
...
10
11
12
13
14
15
16
...
98
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
Results per page:
10
25
50
100
200