August 2018 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use generic value checks for IHTMLStyle:: put_fontWeight implementation.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: dd8f202e05ad56ad0ab8736a92782a44bdc8b1fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd8f202e05ad56ad0ab8736a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:44:16 2018 +0200 mshtml: Use generic value checks for IHTMLStyle::put_fontWeight implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 53 +++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b89ffbc..b7aeaea 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -207,11 +207,24 @@ static const WCHAR word_wrapW[] = static const WCHAR z_indexW[] = {'z','-','i','n','d','e','x',0}; +static const WCHAR boldW[] = {'b','o','l','d',0}; +static const WCHAR bolderW[] = {'b','o','l','d','e','r',0}; static const WCHAR capsW[] = {'s','m','a','l','l','-','c','a','p','s',0}; static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; +static const WCHAR lighterW[] = {'l','i','g','h','t','e','r',0}; static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; static const WCHAR obliqueW[] = {'o','b','l','i','q','u','e',0}; +static const WCHAR style100W[] = {'1','0','0',0}; +static const WCHAR style200W[] = {'2','0','0',0}; +static const WCHAR style300W[] = {'3','0','0',0}; +static const WCHAR style400W[] = {'4','0','0',0}; +static const WCHAR style500W[] = {'5','0','0',0}; +static const WCHAR style600W[] = {'6','0','0',0}; +static const WCHAR style700W[] = {'7','0','0',0}; +static const WCHAR style800W[] = {'8','0','0',0}; +static const WCHAR style900W[] = {'9','0','0',0}; + static const WCHAR *font_style_values[] = { italicW, normalW, @@ -225,6 +238,23 @@ static const WCHAR *font_variant_values[] = { NULL }; +static const WCHAR *font_weight_values[] = { + style100W, + style200W, + style300W, + style400W, + style500W, + style600W, + style700W, + style800W, + style900W, + boldW, + bolderW, + lighterW, + normalW, + NULL +}; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 @@ -284,7 +314,7 @@ static const style_tbl_entry_t style_tbl[] = { {font_sizeW, DISPID_IHTMLSTYLE_FONTSIZE, ATTR_FIX_PX}, {font_styleW, DISPID_IHTMLSTYLE_FONTSTYLE, 0, font_style_values}, {font_variantW, DISPID_IHTMLSTYLE_FONTVARIANT, 0, font_variant_values}, - {font_weightW, DISPID_IHTMLSTYLE_FONTWEIGHT, ATTR_STR_TO_INT}, + {font_weightW, DISPID_IHTMLSTYLE_FONTWEIGHT, ATTR_STR_TO_INT, font_weight_values}, {heightW, DISPID_IHTMLSTYLE_HEIGHT, ATTR_FIX_PX}, {leftW, DISPID_IHTMLSTYLE_LEFT}, {letter_spacingW, DISPID_IHTMLSTYLE_LETTERSPACING}, @@ -432,7 +462,7 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ nsresult nsres; HRESULT hres = S_OK; - if(value) { + if(value && *value) { unsigned flags = style_tbl[sid].flags; if(flags & ATTR_FIX_PX) val = fix_px_value(value); @@ -952,28 +982,9 @@ static HRESULT WINAPI HTMLStyle_get_fontVariant(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_fontWeight(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - static const WCHAR styleBold[] = {'b','o','l','d',0}; - static const WCHAR styleBolder[] = {'b','o','l','d','e','r',0}; - static const WCHAR styleLighter[] = {'l','i','g','h','t','e','r',0}; - static const WCHAR style100[] = {'1','0','0',0}; - static const WCHAR style200[] = {'2','0','0',0}; - static const WCHAR style300[] = {'3','0','0',0}; - static const WCHAR style400[] = {'4','0','0',0}; - static const WCHAR style500[] = {'5','0','0',0}; - static const WCHAR style600[] = {'6','0','0',0}; - static const WCHAR style700[] = {'7','0','0',0}; - static const WCHAR style800[] = {'8','0','0',0}; - static const WCHAR style900[] = {'9','0','0',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - /* fontWeight can only be one of the following */ - if(v && *v && strcmpiW(normalW, v) && strcmpiW(styleBold, v) && strcmpiW(styleBolder, v) - && strcmpiW(styleLighter, v) && strcmpiW(style100, v) && strcmpiW(style200, v) - && strcmpiW(style300, v) && strcmpiW(style400, v) && strcmpiW(style500, v) && strcmpiW(style600, v) - && strcmpiW(style700, v) && strcmpiW(style800, v) && strcmpiW(style900, v)) - return E_INVALIDARG; - return set_style_property(This, STYLEID_FONT_WEIGHT, v); }

1 0

Jacek Caban : mshtml: Use generic value checks for IHTMLStyle:: put_backgroundRepeat implementation.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 56d75ce16a33105bbd993c656fb5c3924bf81da4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56d75ce16a33105bbd993c65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:44:29 2018 +0200 mshtml: Use generic value checks for IHTMLStyle::put_backgroundRepeat implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b7aeaea..04fcf42 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -212,8 +212,12 @@ static const WCHAR bolderW[] = {'b','o','l','d','e','r',0}; static const WCHAR capsW[] = {'s','m','a','l','l','-','c','a','p','s',0}; static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; static const WCHAR lighterW[] = {'l','i','g','h','t','e','r',0}; +static const WCHAR no_repeatW[] = {'n','o','-','r','e','p','e','a','t',0}; static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; static const WCHAR obliqueW[] = {'o','b','l','i','q','u','e',0}; +static const WCHAR repeatW[] = {'r','e','p','e','a','t',0}; +static const WCHAR repeat_xW[] = {'r','e','p','e','a','t','-','x',0}; +static const WCHAR repeat_yW[] = {'r','e','p','e','a','t','-','y',0}; static const WCHAR style100W[] = {'1','0','0',0}; static const WCHAR style200W[] = {'2','0','0',0}; @@ -255,6 +259,14 @@ static const WCHAR *font_weight_values[] = { NULL }; +static const WCHAR *background_repeat_values[] = { + no_repeatW, + repeatW, + repeat_xW, + repeat_yW, + NULL +}; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 @@ -279,7 +291,7 @@ static const style_tbl_entry_t style_tbl[] = { {background_positionW, DISPID_IHTMLSTYLE_BACKGROUNDPOSITION}, {background_position_xW, DISPID_IHTMLSTYLE_BACKGROUNDPOSITIONX, ATTR_FIX_PX}, {background_position_yW, DISPID_IHTMLSTYLE_BACKGROUNDPOSITIONY, ATTR_FIX_PX}, - {background_repeatW, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT}, + {background_repeatW, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT, 0, background_repeat_values}, {borderW, DISPID_IHTMLSTYLE_BORDER}, {border_bottomW, DISPID_IHTMLSTYLE_BORDERBOTTOM, ATTR_FIX_PX}, {border_bottom_colorW, DISPID_IHTMLSTYLE_BORDERBOTTOMCOLOR, ATTR_HEX_INT}, @@ -1104,21 +1116,10 @@ static HRESULT WINAPI HTMLStyle_get_backgroundImage(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_backgroundRepeat(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - static const WCHAR styleRepeat[] = {'r','e','p','e','a','t',0}; - static const WCHAR styleNoRepeat[] = {'n','o','-','r','e','p','e','a','t',0}; - static const WCHAR styleRepeatX[] = {'r','e','p','e','a','t','-','x',0}; - static const WCHAR styleRepeatY[] = {'r','e','p','e','a','t','-','y',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - /* fontWeight can only be one of the following */ - if(!v || strcmpiW(styleRepeat, v) == 0 || strcmpiW(styleNoRepeat, v) == 0 || - strcmpiW(styleRepeatX, v) == 0 || strcmpiW(styleRepeatY, v) == 0 ) - { - return set_style_property(This, STYLEID_BACKGROUND_REPEAT , v); - } - - return E_INVALIDARG; + return set_style_property(This, STYLEID_BACKGROUND_REPEAT , v); } static HRESULT WINAPI HTMLStyle_get_backgroundRepeat(IHTMLStyle *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Use generic value checks for IHTMLStyle:: put_textDecoration implementation.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 9cbf3dd83d8212ba51e277d4f8219e6bacc465cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cbf3dd83d8212ba51e277d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:44:40 2018 +0200 mshtml: Use generic value checks for IHTMLStyle::put_textDecoration implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 59 ++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 04fcf42..4b98a6d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -207,17 +207,22 @@ static const WCHAR word_wrapW[] = static const WCHAR z_indexW[] = {'z','-','i','n','d','e','x',0}; +static const WCHAR blinkW[] = {'b','l','i','n','k',0}; static const WCHAR boldW[] = {'b','o','l','d',0}; static const WCHAR bolderW[] = {'b','o','l','d','e','r',0}; static const WCHAR capsW[] = {'s','m','a','l','l','-','c','a','p','s',0}; static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; static const WCHAR lighterW[] = {'l','i','g','h','t','e','r',0}; +static const WCHAR line_throughW[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; static const WCHAR no_repeatW[] = {'n','o','-','r','e','p','e','a','t',0}; +static const WCHAR noneW[] = {'n','o','n','e',0}; static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; static const WCHAR obliqueW[] = {'o','b','l','i','q','u','e',0}; +static const WCHAR overlineW[] = {'o','v','e','r','l','i','n','e',0}; static const WCHAR repeatW[] = {'r','e','p','e','a','t',0}; static const WCHAR repeat_xW[] = {'r','e','p','e','a','t','-','x',0}; static const WCHAR repeat_yW[] = {'r','e','p','e','a','t','-','y',0}; +static const WCHAR underlineW[] = {'u','n','d','e','r','l','i','n','e',0}; static const WCHAR style100W[] = {'1','0','0',0}; static const WCHAR style200W[] = {'2','0','0',0}; @@ -267,6 +272,15 @@ static const WCHAR *background_repeat_values[] = { NULL }; +static const WCHAR *text_decoration_values[] = { + blinkW, + line_throughW, + noneW, + overlineW, + underlineW, + NULL +}; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 @@ -358,7 +372,7 @@ static const style_tbl_entry_t style_tbl[] = { {rightW, DISPID_IHTMLSTYLE2_RIGHT}, {table_layoutW, DISPID_IHTMLSTYLE2_TABLELAYOUT}, {text_alignW, DISPID_IHTMLSTYLE_TEXTALIGN}, - {text_decorationW, DISPID_IHTMLSTYLE_TEXTDECORATION}, + {text_decorationW, DISPID_IHTMLSTYLE_TEXTDECORATION, 0, text_decoration_values}, {text_indentW, DISPID_IHTMLSTYLE_TEXTINDENT, ATTR_FIX_PX}, {text_transformW, DISPID_IHTMLSTYLE_TEXTTRANSFORM}, {topW, DISPID_IHTMLSTYLE_TOP}, @@ -373,17 +387,6 @@ static const style_tbl_entry_t style_tbl[] = { C_ASSERT(ARRAY_SIZE(style_tbl) == STYLEID_MAX_VALUE); -static const WCHAR valLineThrough[] = - {'l','i','n','e','-','t','h','r','o','u','g','h',0}; -static const WCHAR valUnderline[] = - {'u','n','d','e','r','l','i','n','e',0}; -static const WCHAR styleNone[] = - {'n','o','n','e',0}; -static const WCHAR valOverline[] = - {'o','v','e','r','l','i','n','e',0}; -static const WCHAR valBlink[] = - {'b','l','i','n','k',0}; - static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; @@ -827,7 +830,7 @@ static BOOL is_valid_border_style(BSTR v) TRACE("%s\n", debugstr_w(v)); - if(!v || strcmpiW(v, styleNone) == 0 || strcmpiW(v, styleDotted) == 0 || + if(!v || strcmpiW(v, noneW) == 0 || strcmpiW(v, styleDotted) == 0 || strcmpiW(v, styleDashed) == 0 || strcmpiW(v, styleSolid) == 0 || strcmpiW(v, styleDouble) == 0 || strcmpiW(v, styleGroove) == 0 || strcmpiW(v, styleRidge) == 0 || strcmpiW(v, styleInset) == 0 || @@ -1389,15 +1392,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecoration(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - /* textDecoration can only be one of the following */ - if(!v || strcmpiW(styleNone, v) == 0 || strcmpiW(valUnderline, v) == 0 || - strcmpiW(valOverline, v) == 0 || strcmpiW(valLineThrough, v) == 0 || - strcmpiW(valBlink, v) == 0) - { - return set_style_property(This, STYLEID_TEXT_DECORATION , v); - } - - return E_INVALIDARG; + return set_style_property(This, STYLEID_TEXT_DECORATION , v); } static HRESULT WINAPI HTMLStyle_get_textDecoration(IHTMLStyle *iface, BSTR *p) @@ -1415,7 +1410,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationNone(IHTMLStyle *iface, VARIAN TRACE("(%p)->(%x)\n", This, v); - return set_style_property(This, STYLEID_TEXT_DECORATION, v ? styleNone : emptyW); + return set_style_property(This, STYLEID_TEXT_DECORATION, v ? noneW : emptyW); } static HRESULT WINAPI HTMLStyle_get_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1424,7 +1419,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationNone(IHTMLStyle *iface, VARIAN TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, styleNone, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, noneW, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1433,7 +1428,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, V TRACE("(%p)->(%x)\n", This, v); - return set_style_property(This, STYLEID_TEXT_DECORATION, v ? valUnderline : emptyW); + return set_style_property(This, STYLEID_TEXT_DECORATION, v ? underlineW : emptyW); } static HRESULT WINAPI HTMLStyle_get_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1442,7 +1437,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationUnderline(IHTMLStyle *iface, V TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, valUnderline, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, underlineW, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1451,7 +1446,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationOverline(IHTMLStyle *iface, VA TRACE("(%p)->(%x)\n", This, v); - return set_style_property(This, STYLEID_TEXT_DECORATION, v ? valOverline : emptyW); + return set_style_property(This, STYLEID_TEXT_DECORATION, v ? overlineW : emptyW); } static HRESULT WINAPI HTMLStyle_get_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1460,7 +1455,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationOverline(IHTMLStyle *iface, VA TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, valOverline, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, overlineW, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1469,7 +1464,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationLineThrough(IHTMLStyle *iface, TRACE("(%p)->(%x)\n", This, v); - return set_style_property(This, STYLEID_TEXT_DECORATION, v ? valLineThrough : emptyW); + return set_style_property(This, STYLEID_TEXT_DECORATION, v ? line_throughW : emptyW); } static HRESULT WINAPI HTMLStyle_get_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1478,7 +1473,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationLineThrough(IHTMLStyle *iface, TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, valLineThrough, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, line_throughW, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1487,7 +1482,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationBlink(IHTMLStyle *iface, VARIA TRACE("(%p)->(%x)\n", This, v); - return set_style_property(This, STYLEID_TEXT_DECORATION, v ? valBlink : emptyW); + return set_style_property(This, STYLEID_TEXT_DECORATION, v ? blinkW : emptyW); } static HRESULT WINAPI HTMLStyle_get_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1496,7 +1491,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationBlink(IHTMLStyle *iface, VARIA TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, valBlink, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, blinkW, p); } static HRESULT WINAPI HTMLStyle_put_verticalAlign(IHTMLStyle *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Use generic value checks for IHTMLStyle:: put_border*Style implementation.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 8b9d57057185513d823f292d6a8e656d5fc5ecfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9d57057185513d823f292d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:44:57 2018 +0200 mshtml: Use generic value checks for IHTMLStyle::put_border*Style implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 71 +++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4b98a6d..e647220 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -211,6 +211,11 @@ static const WCHAR blinkW[] = {'b','l','i','n','k',0}; static const WCHAR boldW[] = {'b','o','l','d',0}; static const WCHAR bolderW[] = {'b','o','l','d','e','r',0}; static const WCHAR capsW[] = {'s','m','a','l','l','-','c','a','p','s',0}; +static const WCHAR dashedW[] = {'d','a','s','h','e','d',0}; +static const WCHAR dottedW[] = {'d','o','t','t','e','d',0}; +static const WCHAR doubleW[] = {'d','o','u','b','l','e',0}; +static const WCHAR grooveW[] = {'g','r','o','o','v','e',0}; +static const WCHAR insetW[] = {'i','n','s','e','t',0}; static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; static const WCHAR lighterW[] = {'l','i','g','h','t','e','r',0}; static const WCHAR line_throughW[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; @@ -218,10 +223,13 @@ static const WCHAR no_repeatW[] = {'n','o','-','r','e','p','e','a','t',0}; static const WCHAR noneW[] = {'n','o','n','e',0}; static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; static const WCHAR obliqueW[] = {'o','b','l','i','q','u','e',0}; +static const WCHAR outsetW[] = {'o','u','t','s','e','t',0}; static const WCHAR overlineW[] = {'o','v','e','r','l','i','n','e',0}; static const WCHAR repeatW[] = {'r','e','p','e','a','t',0}; static const WCHAR repeat_xW[] = {'r','e','p','e','a','t','-','x',0}; static const WCHAR repeat_yW[] = {'r','e','p','e','a','t','-','y',0}; +static const WCHAR ridgeW[] = {'r','i','d','g','e',0}; +static const WCHAR solidW[] = {'s','o','l','i','d',0}; static const WCHAR underlineW[] = {'u','n','d','e','r','l','i','n','e',0}; static const WCHAR style100W[] = {'1','0','0',0}; @@ -281,6 +289,19 @@ static const WCHAR *text_decoration_values[] = { NULL }; +static const WCHAR *border_style_values[] = { + dashedW, + dottedW, + doubleW, + grooveW, + insetW, + noneW, + outsetW, + ridgeW, + solidW, + NULL +}; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 @@ -309,21 +330,21 @@ static const style_tbl_entry_t style_tbl[] = { {borderW, DISPID_IHTMLSTYLE_BORDER}, {border_bottomW, DISPID_IHTMLSTYLE_BORDERBOTTOM, ATTR_FIX_PX}, {border_bottom_colorW, DISPID_IHTMLSTYLE_BORDERBOTTOMCOLOR, ATTR_HEX_INT}, - {border_bottom_styleW, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE}, + {border_bottom_styleW, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE, 0, border_style_values}, {border_bottom_widthW, DISPID_IHTMLSTYLE_BORDERBOTTOMWIDTH, ATTR_FIX_PX}, {border_colorW, DISPID_IHTMLSTYLE_BORDERCOLOR}, {border_leftW, DISPID_IHTMLSTYLE_BORDERLEFT, ATTR_FIX_PX}, {border_left_colorW, DISPID_IHTMLSTYLE_BORDERLEFTCOLOR, ATTR_HEX_INT}, - {border_left_styleW, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, + {border_left_styleW, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE, 0, border_style_values}, {border_left_widthW, DISPID_IHTMLSTYLE_BORDERLEFTWIDTH, ATTR_FIX_PX}, {border_rightW, DISPID_IHTMLSTYLE_BORDERRIGHT, ATTR_FIX_PX}, {border_right_colorW, DISPID_IHTMLSTYLE_BORDERRIGHTCOLOR, ATTR_HEX_INT}, - {border_right_styleW, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, + {border_right_styleW, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE, 0, border_style_values}, {border_right_widthW, DISPID_IHTMLSTYLE_BORDERRIGHTWIDTH, ATTR_FIX_PX}, {border_styleW, DISPID_IHTMLSTYLE_BORDERSTYLE}, {border_topW, DISPID_IHTMLSTYLE_BORDERTOP, ATTR_FIX_PX}, {border_top_colorW, DISPID_IHTMLSTYLE_BORDERTOPCOLOR, ATTR_HEX_INT}, - {border_top_styleW, DISPID_IHTMLSTYLE_BORDERTOPSTYLE}, + {border_top_styleW, DISPID_IHTMLSTYLE_BORDERTOPSTYLE, 0, border_style_values}, {border_top_widthW, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, {border_widthW, DISPID_IHTMLSTYLE_BORDERWIDTH}, {bottomW, DISPID_IHTMLSTYLE2_BOTTOM, ATTR_FIX_PX}, @@ -819,27 +840,11 @@ static HRESULT get_nsstyle_pixel_val(HTMLStyle *This, styleid_t sid, LONG *p) static BOOL is_valid_border_style(BSTR v) { - static const WCHAR styleDotted[] = {'d','o','t','t','e','d',0}; - static const WCHAR styleDashed[] = {'d','a','s','h','e','d',0}; - static const WCHAR styleSolid[] = {'s','o','l','i','d',0}; - static const WCHAR styleDouble[] = {'d','o','u','b','l','e',0}; - static const WCHAR styleGroove[] = {'g','r','o','o','v','e',0}; - static const WCHAR styleRidge[] = {'r','i','d','g','e',0}; - static const WCHAR styleInset[] = {'i','n','s','e','t',0}; - static const WCHAR styleOutset[] = {'o','u','t','s','e','t',0}; - - TRACE("%s\n", debugstr_w(v)); - - if(!v || strcmpiW(v, noneW) == 0 || strcmpiW(v, styleDotted) == 0 || - strcmpiW(v, styleDashed) == 0 || strcmpiW(v, styleSolid) == 0 || - strcmpiW(v, styleDouble) == 0 || strcmpiW(v, styleGroove) == 0 || - strcmpiW(v, styleRidge) == 0 || strcmpiW(v, styleInset) == 0 || - strcmpiW(v, styleOutset) == 0 ) - { - return TRUE; - } - - return FALSE; + return !v || strcmpiW(v, noneW) == 0 || strcmpiW(v, dottedW) == 0 || + strcmpiW(v, dashedW) == 0 || strcmpiW(v, solidW) == 0 || + strcmpiW(v, doubleW) == 0 || strcmpiW(v, grooveW) == 0 || + strcmpiW(v, ridgeW) == 0 || strcmpiW(v, insetW) == 0 || + strcmpiW(v, outsetW) == 0; } static inline HTMLStyle *impl_from_IHTMLStyle(IHTMLStyle *iface) @@ -2065,10 +2070,6 @@ static HRESULT WINAPI HTMLStyle_put_borderTopStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - - if(!is_valid_border_style(v)) - return E_INVALIDARG; - return set_style_property(This, STYLEID_BORDER_TOP_STYLE, v); } @@ -2083,10 +2084,6 @@ static HRESULT WINAPI HTMLStyle_put_borderRightStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - - if(!is_valid_border_style(v)) - return E_INVALIDARG; - return set_style_property(This, STYLEID_BORDER_RIGHT_STYLE, v); } @@ -2101,10 +2098,6 @@ static HRESULT WINAPI HTMLStyle_put_borderBottomStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - - if(!is_valid_border_style(v)) - return E_INVALIDARG; - return set_style_property(This, STYLEID_BORDER_BOTTOM_STYLE, v); } @@ -2119,10 +2112,6 @@ static HRESULT WINAPI HTMLStyle_put_borderLeftStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - - if(!is_valid_border_style(v)) - return E_INVALIDARG; - return set_style_property(This, STYLEID_BORDER_LEFT_STYLE, v); }

1 0

Alex Henrie : shell32: Add batch file icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: c31f1ace26d1806ad268f7b332136c0ab806f519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c31f1ace26d1806ad268f7b3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:46 2018 -0600 shell32: Add batch file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 38de421..fc3e67e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -651,6 +651,10 @@ IDI_SHELL_CONFIG_FILE ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_TEXT_FILE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_BATCH_FILE ICON resources/window.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 0dc397f..54ccf57 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -243,6 +243,7 @@ /* 149 - 150 not used on Windows */ #define IDI_SHELL_CONFIG_FILE 151 #define IDI_SHELL_TEXT_FILE 152 +#define IDI_SHELL_BATCH_FILE 153 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add library file icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 3a8a1b1e24e4752d3acb9aa4db09d7e4d48cbe8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a8a1b1e24e4752d3acb9aa4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:47 2018 -0600 shell32: Add library file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index fc3e67e..8819365 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -655,6 +655,10 @@ IDI_SHELL_TEXT_FILE ICON resources/document.ico /* @makedep: resources/window.ico */ IDI_SHELL_BATCH_FILE ICON resources/window.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_LIBRARY_FILE ICON resources/document.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 54ccf57..106c8c3 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -244,6 +244,7 @@ #define IDI_SHELL_CONFIG_FILE 151 #define IDI_SHELL_TEXT_FILE 152 #define IDI_SHELL_BATCH_FILE 153 +#define IDI_SHELL_LIBRARY_FILE 154 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add system font icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 9669c4fad9b0dc4f6781d189de0ba9bac9ca5810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9669c4fad9b0dc4f6781d189… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:48 2018 -0600 shell32: Add system font icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 8819365..80441d0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -659,6 +659,10 @@ IDI_SHELL_BATCH_FILE ICON resources/window.ico /* @makedep: resources/document.ico */ IDI_SHELL_LIBRARY_FILE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_SYSTEM_FONT ICON resources/document.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 106c8c3..e722a57 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -245,6 +245,7 @@ #define IDI_SHELL_TEXT_FILE 152 #define IDI_SHELL_BATCH_FILE 153 #define IDI_SHELL_LIBRARY_FILE 154 +#define IDI_SHELL_SYSTEM_FONT 155 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add TrueType font icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: d805b6d165834cb6a9e52dec65bd01e5e1709db9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d805b6d165834cb6a9e52dec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:49 2018 -0600 shell32: Add TrueType font icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 80441d0..1506256 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -663,6 +663,10 @@ IDI_SHELL_LIBRARY_FILE ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_SYSTEM_FONT ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_TRUETYPE_FONT ICON resources/document.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e722a57..27fca9d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -246,6 +246,7 @@ #define IDI_SHELL_BATCH_FILE 153 #define IDI_SHELL_LIBRARY_FILE 154 #define IDI_SHELL_SYSTEM_FONT 155 +#define IDI_SHELL_TRUETYPE_FONT 156 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add PostScript font icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 1a21156bc9656c2e939f4ef62ad5275784689bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a21156bc9656c2e939f4ef6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:50 2018 -0600 shell32: Add PostScript font icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 1506256..fabbd45 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -667,6 +667,10 @@ IDI_SHELL_SYSTEM_FONT ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_TRUETYPE_FONT ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_POSTSCRIPT_FONT ICON resources/document.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 27fca9d..2638765 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -247,6 +247,7 @@ #define IDI_SHELL_LIBRARY_FILE 154 #define IDI_SHELL_SYSTEM_FONT 155 #define IDI_SHELL_TRUETYPE_FONT 156 +#define IDI_SHELL_POSTSCRIPT_FONT 157 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add second run icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 3aa81e84076c8cb3b6c2d6aab516a894cb949863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa81e84076c8cb3b6c2d6aa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:51 2018 -0600 shell32: Add second run icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index fabbd45..db1dc9e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -671,6 +671,9 @@ IDI_SHELL_TRUETYPE_FONT ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_POSTSCRIPT_FONT ICON resources/document.ico +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN2 ICON resources/window.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2638765..3f526cb 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -248,6 +248,8 @@ #define IDI_SHELL_SYSTEM_FONT 155 #define IDI_SHELL_TRUETYPE_FONT 156 #define IDI_SHELL_POSTSCRIPT_FONT 157 +/* 158 - 159 not used on Windows */ +#define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0