October 2008 - Wine-Commits

Dylan Smith : runtest: More helpful error when top of wine directory isn' t found.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 8d88fe6d4d5b94552497e68e806f2eeed1efff66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d88fe6d4d5b94552497e68e8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Oct 7 12:16:36 2008 -0400 runtest: More helpful error when top of wine directory isn't found. --- tools/runtest | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/runtest b/tools/runtest index a3c9331..483872c 100755 --- a/tools/runtest +++ b/tools/runtest @@ -106,6 +106,9 @@ else elif [ -f "../server/wineserver" ]; then topobjdir=".." elif [ -f "../../server/wineserver" ]; then topobjdir="../.." elif [ -f "../../../server/wineserver" ]; then topobjdir="../../.." + else + echo "Can't find the top of the Wine tree (use the -T argument)" 2>&1 + usage fi fi

1 0

Jacek Caban : mshtml: Added IHTMLStyle::[get|put]_filter implementation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 7918196ee8a73023f79ef89fc22e4b6ed203fec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7918196ee8a73023f79ef89fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:45:46 2008 -0500 mshtml: Added IHTMLStyle::[get|put]_filter implementation. --- dlls/mshtml/htmlstyle.c | 17 +++++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 10 ++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b315f55..48ae2fe 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -50,6 +50,8 @@ static const WCHAR attrCursor[] = {'c','u','r','s','o','r',0}; static const WCHAR attrDisplay[] = {'d','i','s','p','l','a','y',0}; +static const WCHAR attrFilter[] = + {'f','i','l','e','t','e','r',0}; static const WCHAR attrFontFamily[] = {'f','o','n','t','-','f','a','m','i','l','y',0}; static const WCHAR attrFontSize[] = @@ -99,6 +101,7 @@ static const struct{ {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, + {attrFilter, DISPID_IHTMLSTYLE_FILTER}, {attrFontFamily, DISPID_IHTMLSTYLE_FONTFAMILY}, {attrFontSize, DISPID_IHTMLSTYLE_FONTSIZE}, {attrFontStyle, DISPID_IHTMLSTYLE_FONTSTYLE}, @@ -1873,15 +1876,21 @@ static HRESULT WINAPI HTMLStyle_get_clip(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_filter(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + WARN("(%p)->(%s)\n", This, debugstr_w(v)); + + /* FIXME: Handle MS-style filters */ + return set_style_attr(This, STYLEID_FILTER, v, 0); } static HRESULT WINAPI HTMLStyle_get_filter(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + WARN("(%p)->(%p)\n", This, p); + + /* FIXME: Handle MS-style filters */ + return get_style_attr(This, STYLEID_FILTER, p); } static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 0ed7d6d..5c1dfe3 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -39,6 +39,7 @@ typedef enum { STYLEID_COLOR, STYLEID_CURSOR, STYLEID_DISPLAY, + STYLEID_FILTER, STYLEID_FONT_FAMILY, STYLEID_FONT_SIZE, STYLEID_FONT_STYLE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c23a6fb..82dd655 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2266,6 +2266,16 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(str, "center"), "textAlign = %s\n", dbgstr_w(V_BSTR(&v))); SysFreeString(str); + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_filter(style, &str); + ok(hres == S_OK, "get_filter failed: %08x\n", hres); + ok(!str, "filter != NULL\n"); + + str = a2bstr("alpha(opacity=100)"); + hres = IHTMLStyle_put_filter(style, str); + ok(hres == S_OK, "put_filter failed: %08x\n", hres); + SysFreeString(str); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_zIndex(style, &v); ok(hres == S_OK, "get_zIndex failed: %08x\n", hres);

1 0

Dylan Smith : runtest: Modified the default program so that it might find the test program.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 634052e4d8fb39b492a5341b69cd59a226529f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634052e4d8fb39b492a5341b6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Oct 7 12:17:39 2008 -0400 runtest: Modified the default program so that it might find the test program. --- tools/runtest | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/runtest b/tools/runtest index 483872c..378270e 100755 --- a/tools/runtest +++ b/tools/runtest @@ -89,16 +89,28 @@ done # we must have found an input file if [ ! -f "$infile" ]; then usage; fi -# set program to the .c file base name if not specified otherwise if [ -z "$program" ]; then - program=`basename "$infile" .c` + # try to autodetect the test program name based on the working directory + working_path=`pwd` + working_basename=`basename "$working_path"` + if [ "$working_basename" = "tests" ]; then + parent_path=`dirname "$working_path"` + parent_basename=`basename "$parent_path"` + program="${parent_basename}_test.exe.so" + elif [ -d "tests" ]; then + program="tests/${working_basename}_test.exe.so" + fi +fi +if [ ! -f "$program" ]; then + echo "Can't find the test program, use the -p argument to specify one" 1>&2 + usage fi # check/detect topobjdir if [ -n "$topobjdir" ]; then if [ ! -f "$topobjdir/server/wineserver" ] then - echo "Wrong -T argument, $topobjdir/server/wineserver does not exist" 2>&1 + echo "Wrong -T argument, $topobjdir/server/wineserver does not exist" 1>&2 usage fi else @@ -107,7 +119,7 @@ else elif [ -f "../../server/wineserver" ]; then topobjdir="../.." elif [ -f "../../../server/wineserver" ]; then topobjdir="../../.." else - echo "Can't find the top of the Wine tree (use the -T argument)" 2>&1 + echo "Can't find the top of the Wine tree (use the -T argument)" 1>&2 usage fi fi

1 0

Jacek Caban : mshtml: Added IHTMLStyle::[get|put]_zIndex implementation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 844d1cfc15f01bfb4c919fea6f0de8640f642727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=844d1cfc15f01bfb4c919fea6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:45:05 2008 -0500 mshtml: Added IHTMLStyle::[get|put]_zIndex implementation. --- dlls/mshtml/htmlstyle.c | 79 +++++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/htmlstyle.h | 3 +- dlls/mshtml/tests/dom.c | 20 ++++++++++++ 3 files changed, 95 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 34ae105..f2b98cd 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -81,6 +81,8 @@ static const WCHAR attrVisibility[] = {'v','i','s','i','b','i','l','i','t','y',0}; static const WCHAR attrWidth[] = {'w','i','d','t','h',0}; +static const WCHAR attrZIndex[] = + {'z','-','i','n','d','e','x',0}; static const LPCWSTR style_strings[] = { attrBackground, @@ -107,6 +109,7 @@ static const LPCWSTR style_strings[] = { attrVerticalAlign, attrVisibility, attrWidth, + attrZIndex }; static const WCHAR valLineThrough[] = @@ -172,8 +175,9 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -#define ATTR_FIX_PX 1 -#define ATTR_FIX_URL 2 +#define ATTR_FIX_PX 1 +#define ATTR_FIX_URL 2 +#define ATTR_STR_TO_INT 4 HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LPCWSTR value, DWORD flags) { @@ -245,6 +249,57 @@ HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR return S_OK; } +HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) +{ + nsAString str_value; + const PRUnichar *value; + BOOL set = FALSE; + + nsAString_Init(&str_value, NULL); + + get_nsstyle_attr_nsval(nsstyle, sid, &str_value); + + nsAString_GetData(&str_value, &value); + + if(flags & ATTR_STR_TO_INT) { + const PRUnichar *ptr = value; + BOOL neg = FALSE; + INT i = 0; + + if(*ptr == '-') { + neg = TRUE; + ptr++; + } + + while(isdigitW(*ptr)) + i = i*10 + (*ptr++ - '0'); + + if(!*ptr) { + V_VT(p) = VT_I4; + V_I4(p) = neg ? -i : i; + set = TRUE; + } + } + + if(!set) { + BSTR str = NULL; + + if(*value) { + str = SysAllocString(value); + if(!str) + return E_OUTOFMEMORY; + } + + V_VT(p) = VT_BSTR; + V_BSTR(p) = str; + } + + nsAString_Finish(&str_value); + + TRACE("%s -> %s\n", debugstr_w(style_strings[sid]), debugstr_variant(p)); + return S_OK; +} + static inline HRESULT get_style_attr(HTMLStyle *This, styleid_t sid, BSTR *p) { return get_nsstyle_attr(This->nsstyle, sid, p); @@ -1581,15 +1636,27 @@ static HRESULT WINAPI HTMLStyle_get_position(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_zIndex(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + switch(V_VT(&v)) { + case VT_BSTR: + return set_style_attr(This, STYLEID_Z_INDEX, V_BSTR(&v), 0); + default: + FIXME("unimplemented vt %d\n", V_VT(&v)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI HTMLStyle_get_zIndex(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_Z_INDEX, p, ATTR_STR_TO_INT); } static HRESULT WINAPI HTMLStyle_put_overflow(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 38bfdb1..a6d1a4a 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -54,7 +54,8 @@ typedef enum { STYLEID_TOP, STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, - STYLEID_WIDTH + STYLEID_WIDTH, + STYLEID_Z_INDEX } styleid_t; void HTMLStyle2_Init(HTMLStyle*); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 925d98f..973c17f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2250,6 +2250,26 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "middle"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_zIndex(style, &v); + ok(hres == S_OK, "get_zIndex failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v)=%d\n", V_VT(&v)); + ok(!V_I4(&v), "V_I4(v) != 0\n"); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("1"); + hres = IHTMLStyle_put_zIndex(style, v); + ok(hres == S_OK, "put_zIndex failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_zIndex(style, &v); + ok(hres == S_OK, "get_zIndex failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v)=%d\n", V_VT(&v)); + ok(V_I4(&v) == 1, "V_I4(v) = %d\n", V_I4(&v)); + VariantClear(&v); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Added IHTMLStyle::[get|put]_textAlign implementation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 4d822f4408805b26e7d7e554466b91111900b9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d822f4408805b26e7d7e5544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:45:31 2008 -0500 mshtml: Added IHTMLStyle::[get|put]_textAlign implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 61a644d..b315f55 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -72,6 +72,8 @@ static const WCHAR attrPaddingLeft[] = {'p','a','d','d','i','n','g','-','l','e','f','t',0}; static const WCHAR attrPosition[] = {'p','o','s','i','t','i','o','n',0}; +static const WCHAR attrTextAlign[] = + {'t','e','x','t','-','a','l','i','g','n',0}; static const WCHAR attrTextDecoration[] = {'t','e','x','t','-','d','e','c','o','r','a','t','i','o','n',0}; static const WCHAR attrTop[] = @@ -108,6 +110,7 @@ static const struct{ {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, {attrPosition, DISPID_IHTMLSTYLE2_POSITION}, + {attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN}, {attrTextDecoration, DISPID_IHTMLSTYLE_TEXTDECORATION}, {attrTop, DISPID_IHTMLSTYLE_TOP}, {attrVerticalAlign, DISPID_IHTMLSTYLE_VERTICALALIGN}, @@ -847,15 +850,19 @@ static HRESULT WINAPI HTMLStyle_get_textTransform(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_textAlign(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_TEXT_ALIGN, v, 0); } static HRESULT WINAPI HTMLStyle_get_textAlign(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_TEXT_ALIGN, p); } static HRESULT WINAPI HTMLStyle_put_textIndent(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index e07f48b..0ed7d6d 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -50,6 +50,7 @@ typedef enum { STYLEID_MARGIN_RIGHT, STYLEID_PADDING_LEFT, STYLEID_POSITION, + STYLEID_TEXT_ALIGN, STYLEID_TEXT_DECORATION, STYLEID_TOP, STYLEID_VERTICAL_ALIGN, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 973c17f..c23a6fb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2250,6 +2250,22 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "middle"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_textAlign(style, &str); + ok(hres == S_OK, "get_textAlign failed: %08x\n", hres); + ok(!str, "textAlign != NULL\n"); + + str = a2bstr("center"); + hres = IHTMLStyle_put_textAlign(style, str); + ok(hres == S_OK, "put_textAlign failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle_get_textAlign(style, &str); + ok(hres == S_OK, "get_textAlign failed: %08x\n", hres); + ok(!strcmp_wa(str, "center"), "textAlign = %s\n", dbgstr_w(V_BSTR(&v))); + SysFreeString(str); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_zIndex(style, &v); ok(hres == S_OK, "get_zIndex failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added support for accessing style attributes by CSS syntax.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: cbc186b8652cf7da159cb2c52c5fd72d0b6afd78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc186b8652cf7da159cb2c52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:45:21 2008 -0500 mshtml: Added support for accessing style attributes by CSS syntax. --- dlls/mshtml/htmlstyle.c | 95 +++++++++++++++++++++++++++++++---------------- dlls/mshtml/htmlstyle.h | 2 +- 2 files changed, 64 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f2b98cd..61a644d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "mshtmdid.h" #include "mshtml_private.h" #include "htmlstyle.h" @@ -84,32 +85,35 @@ static const WCHAR attrWidth[] = static const WCHAR attrZIndex[] = {'z','-','i','n','d','e','x',0}; -static const LPCWSTR style_strings[] = { - attrBackground, - attrBackgroundColor, - attrBackgroundImage, - attrBorder, - attrBorderLeft, - attrColor, - attrCursor, - attrDisplay, - attrFontFamily, - attrFontSize, - attrFontStyle, - attrFontWeight, - attrHeight, - attrLeft, - attrMargin, - attrMarginLeft, - attrMarginRight, - attrPaddingLeft, - attrPosition, - attrTextDecoration, - attrTop, - attrVerticalAlign, - attrVisibility, - attrWidth, - attrZIndex +static const struct{ + const WCHAR *name; + DISPID dispid; +} style_tbl[] = { + {attrBackground, DISPID_IHTMLSTYLE_BACKGROUND}, + {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, + {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, + {attrBorder, DISPID_IHTMLSTYLE_BORDER}, + {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, + {attrColor, DISPID_IHTMLSTYLE_COLOR}, + {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, + {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, + {attrFontFamily, DISPID_IHTMLSTYLE_FONTFAMILY}, + {attrFontSize, DISPID_IHTMLSTYLE_FONTSIZE}, + {attrFontStyle, DISPID_IHTMLSTYLE_FONTSTYLE}, + {attrFontWeight, DISPID_IHTMLSTYLE_FONTWEIGHT}, + {attrHeight, DISPID_IHTMLSTYLE_HEIGHT}, + {attrLeft, DISPID_IHTMLSTYLE_LEFT}, + {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, + {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, + {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, + {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, + {attrPosition, DISPID_IHTMLSTYLE2_POSITION}, + {attrTextDecoration, DISPID_IHTMLSTYLE_TEXTDECORATION}, + {attrTop, DISPID_IHTMLSTYLE_TOP}, + {attrVerticalAlign, DISPID_IHTMLSTYLE_VERTICALALIGN}, + {attrVisibility, DISPID_IHTMLSTYLE_VISIBILITY}, + {attrWidth, DISPID_IHTMLSTYLE_WIDTH}, + {attrZIndex, DISPID_IHTMLSTYLE_ZINDEX} }; static const WCHAR valLineThrough[] = @@ -192,7 +196,7 @@ HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LPCW if(flags & ATTR_FIX_URL) val = fix_url_value(value); - nsAString_Init(&str_name, style_strings[sid]); + nsAString_Init(&str_name, style_tbl[sid].name); nsAString_Init(&str_value, val ? val : value); nsAString_Init(&str_empty, wszEmpty); heap_free(val); @@ -218,7 +222,7 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsAString str_name; nsresult nsres; - nsAString_Init(&str_name, style_strings[sid]); + nsAString_Init(&str_name, style_tbl[sid].name); nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(nsstyle, &str_name, value); if(NS_FAILED(nsres)) { @@ -245,7 +249,7 @@ HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR nsAString_Finish(&str_value); - TRACE("%s -> %s\n", debugstr_w(style_strings[sid]), debugstr_w(*p)); + TRACE("%s -> %s\n", debugstr_w(style_tbl[sid].name), debugstr_w(*p)); return S_OK; } @@ -296,7 +300,7 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, nsAString_Finish(&str_value); - TRACE("%s -> %s\n", debugstr_w(style_strings[sid]), debugstr_variant(p)); + TRACE("%s -> %s\n", debugstr_w(style_tbl[sid].name), debugstr_variant(p)); return S_OK; } @@ -318,7 +322,7 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex *p = strcmpW(value, exval) ? VARIANT_FALSE : VARIANT_TRUE; nsAString_Finish(&str_value); - TRACE("%s -> %x\n", debugstr_w(style_strings[sid]), *p); + TRACE("%s -> %x\n", debugstr_w(style_tbl[sid].name), *p); return S_OK; } @@ -1907,6 +1911,28 @@ static HRESULT WINAPI HTMLStyle_toString(IHTMLStyle *iface, BSTR *String) return E_NOTIMPL; } +static HRESULT HTMLStyle_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) +{ + int c, i, min=0, max = sizeof(style_tbl)/sizeof(*style_tbl)-1; + + while(min <= max) { + i = (min+max)/2; + + c = strcmpW(style_tbl[i].name, name); + if(!c) { + *dispid = style_tbl[i].dispid; + return S_OK; + } + + if(c > 0) + max = i-1; + else + min = i+1; + } + + return DISP_E_UNKNOWNNAME; +} + static const IHTMLStyleVtbl HTMLStyleVtbl = { HTMLStyle_QueryInterface, HTMLStyle_AddRef, @@ -2096,13 +2122,18 @@ static const IHTMLStyleVtbl HTMLStyleVtbl = { HTMLStyle_toString }; +static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { + HTMLStyle_get_dispid, + NULL +}; + static const tid_t HTMLStyle_iface_tids[] = { IHTMLStyle_tid, IHTMLStyle2_tid, 0 }; static dispex_static_data_t HTMLStyle_dispex = { - NULL, + &HTMLStyle_dispex_vtbl, DispHTMLStyle_tid, NULL, HTMLStyle_iface_tids diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index a6d1a4a..e07f48b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -29,7 +29,7 @@ typedef struct { #define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl) #define HTMLSTYLE2(x) ((IHTMLStyle2*) &(x)->lpHTMLStyle2Vtbl) -/* NOTE: Make sure to keep in sync with stryle_strings in htmlstrle.c */ +/* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { STYLEID_BACKGROUND, STYLEID_BACKGROUND_COLOR,

1 0

Jacek Caban : mshtml: Added IDispatchEx support for HTMLIFrame.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 712c4d9af2728e95427bba541aaed31e8b060b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=712c4d9af2728e95427bba541… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:44:50 2008 -0500 mshtml: Added IDispatchEx support for HTMLIFrame. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmliframe.c | 18 ++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a55ef74..9d77f97 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -73,6 +73,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLDOMTextNode, &DIID_DispHTMLElementCollection, &DIID_DispHTMLGenericElement, + &DIID_DispHTMLIFrame, &DIID_DispHTMLImg, &DIID_DispHTMLInputElement, &DIID_DispHTMLOptionElement, @@ -99,6 +100,7 @@ static REFIID tid_ids[] = { &IID_IHTMLElement3, &IID_IHTMLElement4, &IID_IHTMLElementCollection, + &IID_IHTMLFrameBase2, &IID_IHTMLGenericElement, &IID_IHTMLImgElement, &IID_IHTMLInputElement, diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 5d1fff7..232cbfb 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -209,6 +209,23 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { HTMLIFrame_destructor }; +static const tid_t HTMLIFrame_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLElement3_tid, + IHTMLFrameBase2_tid, + 0 +}; + +static dispex_static_data_t HTMLIFrame_dispex = { + NULL, + DispHTMLIFrame_tid, + NULL, + HTMLIFrame_iface_tids +}; + HTMLElement *HTMLIFrame_Create(nsIDOMHTMLElement *nselem) { HTMLIFrame *ret; @@ -219,6 +236,7 @@ HTMLElement *HTMLIFrame_Create(nsIDOMHTMLElement *nselem) ret->lpIHTMLFrameBase2Vtbl = &HTMLIFrameBase2Vtbl; ret->element.node.vtbl = &HTMLIFrameImplVtbl; + init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLFRAMEBASE2(ret), &HTMLIFrame_dispex); HTMLElement_Init(&ret->element); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&ret->nsiframe); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 55ea9c5..b90d07a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -69,6 +69,7 @@ typedef enum { DispHTMLDOMTextNode_tid, DispHTMLElementCollection_tid, DispHTMLGenericElement_tid, + DispHTMLIFrame_tid, DispHTMLImg_tid, DispHTMLInputElement_tid, DispHTMLOptionElement_tid, @@ -95,6 +96,7 @@ typedef enum { IHTMLElement3_tid, IHTMLElement4_tid, IHTMLElementCollection_tid, + IHTMLFrameBase2_tid, IHTMLGenericElement_tid, IHTMLImgElement_tid, IHTMLInputElement_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0415d08..925d98f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -344,7 +344,7 @@ static const elem_type_info_t elem_type_infos[] = { {"IMG", img_iids, &DIID_DispHTMLImg}, {"TR", tr_iids, &DIID_DispHTMLTableRow}, {"TD", td_iids, NULL}, - {"IFRAME", iframe_iids, NULL} + {"IFRAME", iframe_iids, &DIID_DispHTMLIFrame} }; static const char *dbgstr_w(LPCWSTR str)

1 0

Jacek Caban : mshtml: Added IHTMLElement3 stub implementation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 536fac7c1b4ef7f6f124d7f3100d3284313f3018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536fac7c1b4ef7f6f124d7f31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:44:18 2008 -0500 mshtml: Added IHTMLElement3 stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 4 + dlls/mshtml/htmlelem3.c | 447 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 14 ++ 5 files changed, 469 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=536fac7c1b4ef7f6f124d…

1 0

Jacek Caban : mshtml: Added HTMLIFrame stub implementation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 2e52c61c4c08291710c2b4c320517b0ffd723a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e52c61c4c08291710c2b4c32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:44:36 2008 -0500 mshtml: Added HTMLIFrame stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmliframe.c | 229 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 31 ++++++ dlls/mshtml/tests/dom.c | 22 ++++- 6 files changed, 284 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e52c61c4c08291710c2b…

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_offsetWidth implementation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: c67952ae1484d9475e127889181e1c613084aa2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67952ae1484d9475e1278891… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 14:43:30 2008 -0500 mshtml: Added IHTMLElement::get_offsetWidth implementation. --- dlls/mshtml/htmlelem.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d3c0633..bed5f59 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -707,8 +707,27 @@ static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, long *p) static HRESULT WINAPI HTMLElement_get_offsetWidth(IHTMLElement *iface, long *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 offset = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSHTMLElement_GetOffsetWidth(nselem, &offset); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) { + ERR("GetOffsetWidth failed: %08x\n", nsres); + return E_FAIL; + } + + *p = offset; + return S_OK; } static HRESULT WINAPI HTMLElement_get_offsetHeight(IHTMLElement *iface, long *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ee7f3ea..9ce91ba 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -541,6 +541,9 @@ static void _test_elem_offset(unsigned line, IUnknown *unk) hres = IHTMLElement_get_offsetHeight(elem, &l); ok_(__FILE__,line) (hres == S_OK, "get_offsetHeight failed: %08x\n", hres); + hres = IHTMLElement_get_offsetWidth(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_offsetWidth failed: %08x\n", hres); + IHTMLElement_Release(elem); }

1 0