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

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

Aug. 28, 2018

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 copy icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: 4f5c8253d33de851aab5111a9042612c0aa1878f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5c8253d33de851aab5111a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:52 2018 -0600 shell32: Add copy icon. Adapted from edit-copy in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/copy.ico | Bin 0 -> 34090 bytes dlls/shell32/resources/copy.svg | 811 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 816 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5c8253d33de851aab5…

1 0

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

Aug. 28, 2018

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_fontWeight implementation.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

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

Alexandre Julliard : user32: Scale dialog base units based on DPI awareness.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: a525631920d74e9d797f38305b89e63aed1c5c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a525631920d74e9d797f3830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 28 12:05:55 2018 +0200 user32: Scale dialog base units based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 14 +++++++------- dlls/user32/tests/sysparams.c | 10 +++++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index e584cc1..7b91819 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1505,22 +1505,22 @@ BOOL WINAPI CheckRadioButton( HWND hwndDlg, int firstID, */ DWORD WINAPI GetDialogBaseUnits(void) { - static DWORD units; + static LONG cx, cy; - if (!units) + if (!cx) { HDC hdc; - SIZE size; if ((hdc = GetDC(0))) { - size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); - if (size.cx) units = MAKELONG( size.cx, size.cy ); + cx = GdiGetCharDimensions( hdc, NULL, &cy ); ReleaseDC( 0, hdc ); } - TRACE("base units = %d,%d\n", LOWORD(units), HIWORD(units) ); + TRACE( "base units = %d,%d\n", cx, cy ); } - return units; + + return MAKELONG( MulDiv( cx, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ), + MulDiv( cy, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI )); } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 846551e..8f9defc 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3217,7 +3217,7 @@ static void test_dpi_mapping(void) { HWND hwnd, child; HDC hdc; - UINT win_dpi; + UINT win_dpi, units; POINT point; BOOL ret; HRGN rgn, update; @@ -3292,6 +3292,7 @@ static void test_dpi_mapping(void) ShowWindow( hwnd, SW_MINIMIZE ); ShowWindow( hwnd, SW_RESTORE ); GetWindowPlacement( hwnd, &wpl_orig ); + units = GetDialogBaseUnits(); for (j = DPI_AWARENESS_UNAWARE; j <= DPI_AWARENESS_PER_MONITOR_AWARE; j++) { @@ -3407,6 +3408,13 @@ static void test_dpi_mapping(void) i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); UpdateWindow( hwnd ); DeleteObject( update ); + /* test dialog units */ + ret = GetDialogBaseUnits(); + point.x = LOWORD( units ); + point.y = HIWORD( units ); + scale_point_dpi_aware( &point, i, j ); + ok( LOWORD(ret) == point.x && HIWORD(ret) == point.y, "%lu/%lu: wrong units %d,%d / %d,%d\n", + i, j, LOWORD(ret), HIWORD(ret), point.x, point.y ); /* test window points mapping */ SetRect( &rect, 0, 0, 100, 100 ); rect.right = rect.left + 100;

1 0

Alex Henrie : shell32: Add network connections icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: 19c364bd0d19a8b3f546e1936c66792f42847bd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c364bd0d19a8b3f546e193… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:59 2018 -0600 shell32: Add network connections 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 | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 9004ebb..06b483e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -704,6 +704,9 @@ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico /* @makedep: resources/folder.ico */ IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico +/* @makedep: resources/network.ico */ +IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e623b94..6761596 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -262,6 +262,7 @@ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_CHECKLIST_FOLDER 174 +#define IDI_SHELL_NET_CONNECTIONS 175 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

Alex Henrie : shell32: Add disk check icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: a7a50c148741e040f61722fb5cdad5d8a5ab0452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a50c148741e040f61722fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:54 2018 -0600 shell32: Add disk check 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 3435448..af65307 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -681,6 +681,10 @@ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico /* @makedep: resources/copy.ico */ IDI_SHELL_BACKUP ICON resources/copy.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_DISK_CHECK ICON resources/drive.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b77c5fc..b401a39 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -253,6 +253,7 @@ #define IDI_SHELL_CONFIRM_DELETE 161 /* 162 - 164 not used on Windows */ #define IDI_SHELL_BACKUP 165 +#define IDI_SHELL_DISK_CHECK 166 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add defragment icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: ffa4ce525805f956889c0ef6735995ac73c3a326 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa4ce525805f956889c0ef6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:55 2018 -0600 shell32: Add defragment 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 af65307..9924083 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -685,6 +685,10 @@ IDI_SHELL_BACKUP ICON resources/copy.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DISK_CHECK ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_DEFRAGMENT ICON resources/drive.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b401a39..2810028 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -254,6 +254,7 @@ /* 162 - 164 not used on Windows */ #define IDI_SHELL_BACKUP 165 #define IDI_SHELL_DISK_CHECK 166 +#define IDI_SHELL_DEFRAGMENT 167 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add backup icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

Module: wine Branch: master Commit: bcbfaf0b00a45f2c93ffdc82fac057b23b4faf8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcbfaf0b00a45f2c93ffdc82… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:53 2018 -0600 shell32: Add backup 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 | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index b84a280..3435448 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -677,6 +677,10 @@ IDI_SHELL_RUN2 ICON resources/window.ico /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/copy.ico */ +IDI_SHELL_BACKUP ICON resources/copy.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2e161dc..b77c5fc 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -251,6 +251,8 @@ /* 158 - 159 not used on Windows */ #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 +/* 162 - 164 not used on Windows */ +#define IDI_SHELL_BACKUP 165 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add system font icon.
by Alexandre Julliard Aug. 28, 2018

Aug. 28, 2018

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