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

Jacek Caban : mshtml: Skip set_style_property fixups in IE9+ mode.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: ec13283af2af8e88872d4d31e2dee6aeebabe280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec13283af2af8e88872d4d31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:09:15 2018 +0200 mshtml: Skip set_style_property fixups in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 5 +++-- dlls/mshtml/tests/style.c | 42 +++--------------------------------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 31d38c8..5c48a24 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -565,7 +565,7 @@ static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const WCHAR *val = NULL; HRESULT hres; - if(value && *value) { + if(value && *value && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9) { unsigned flags = style_tbl[sid].flags; if(style_tbl[sid].allowed_values) { @@ -4780,7 +4780,8 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) nsIDOMCSSStyleDeclaration_AddRef(nsstyle); - init_dispex(&style->dispex, (IUnknown*)&style->IHTMLStyle_iface, &HTMLStyle_dispex); + init_dispex_with_compat_mode(&style->dispex, (IUnknown*)&style->IHTMLStyle_iface, &HTMLStyle_dispex, + dispex_compat_mode(&elem->node.event_target.dispex)); *ret = style; return S_OK; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 12877e9..1fc26c2 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -284,7 +284,6 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) if(compat_mode < COMPAT_IE9) ok_(__FILE__,line) (FAILED(hres), "invalid value passed.\n"); else - todo_wine ok_(__FILE__,line) (hres == S_OK, "invalid value returned: %08x\n", hres); VariantClear(&arg); @@ -364,21 +363,6 @@ static void _test_text_decoration(unsigned line, IHTMLStyle *style, const char * SysFreeString(str); } -#define test_text_decoration_todo(a,b) _test_text_decoration_todo(__LINE__,a,b) -static void _test_text_decoration_todo(unsigned line, IHTMLStyle *style, const char *exdec) -{ - BSTR str; - HRESULT hres; - - hres = IHTMLStyle_get_textDecoration(style, &str); - ok_(__FILE__,line)(hres == S_OK, "get_textDecoration failed: %08x\n", hres); - if(exdec) - todo_wine ok_(__FILE__,line)(!strcmp_wa(str, exdec), "textDecoration = %s, expected %s\n", wine_dbgstr_w(str), exdec); - else - todo_wine ok_(__FILE__,line)(!str, "textDecoration = %s, expected NULL\n", wine_dbgstr_w(str)); - SysFreeString(str); -} - static void test_set_csstext(IHTMLStyle *style) { VARIANT v; @@ -639,10 +623,7 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_get_minWidth(style5, &v); ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "10px"); - else - test_var_bstr_todo(&v, "10%"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "10px" : "10%"); VariantClear(&v); hres = IHTMLStyle5_put_minWidth(style5, vdefault); @@ -717,10 +698,7 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_get_maxHeight(style5, &v); ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "100px"); - else - test_var_bstr_todo(&v, "70%"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "100px" : "70%"); VariantClear(&v); hres = IHTMLStyle5_put_maxHeight(style5, vdefault); @@ -873,7 +851,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontWeight(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_fontWeight failed: %08x\n", hres); SysFreeString(str); @@ -971,7 +948,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontVariant(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "fontVariant failed: %08x\n", hres); SysFreeString(str); @@ -1141,7 +1117,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_textDecoration(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_textDecoration failed: %08x\n", hres); SysFreeString(str); @@ -1158,14 +1133,10 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_textDecoration(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_textDecoration failed: %08x\n", hres); SysFreeString(str); - if(compat_mode < COMPAT_IE9) - test_text_decoration(style, NULL); - else - test_text_decoration_todo(style, "blink"); + test_text_decoration(style, compat_mode < COMPAT_IE9 ? NULL : "blink"); hres = IHTMLStyle_put_textDecoration(style, sDefault); ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); @@ -1799,7 +1770,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontStyle(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_fontStyle failed: %08x\n", hres); SysFreeString(str); @@ -1832,7 +1802,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_overflow(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_overflow failed: %08x\n", hres); SysFreeString(str); @@ -2111,7 +2080,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "10px"), "paddingLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2124,7 +2092,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_backgroundRepeat(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_backgroundRepeat failed: %08x\n", hres); SysFreeString(str); @@ -2410,7 +2377,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderRightWidth(style, &v); ok(hres == S_OK, "get_borderRightWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "borderRightWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2431,7 +2397,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderBottomWidth(style, &v); ok(hres == S_OK, "get_borderBottomWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "borderBottomWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2452,7 +2417,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderLeftWidth(style, &v); ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

Alex Henrie : shell32: Add remaining recycle bin icons.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: ade232ada1fbf07a29f94e7241bff86b508fa2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade232ada1fbf07a29f94e72… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:29 2018 -0600 shell32: Add remaining recycle bin icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 9 +++++++++ dlls/shell32/shresdef.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 896c63d..6bb7aa1 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -754,6 +754,12 @@ IDI_SHELL_ONE_CLICK_OPEN ICON resources/folder_open.ico /* @makedep: resources/folder_open.ico */ IDI_SHELL_TWO_CLICK_OPEN ICON resources/folder_open.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_EMPTY_RECYCLE_BIN_95 ICON resources/trash_file.ico + +/* @makedep: resources/trash_full.ico */ +IDI_SHELL_FULL_RECYCLE_BIN_95 ICON resources/trash_full.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico @@ -766,6 +772,9 @@ IDI_SHELL_RENAME ICON resources/rename.ico /* @makedep: resources/copy.ico */ IDI_SHELL_COPY ICON resources/copy.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e901460..090a3fa 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -275,10 +275,14 @@ #define IDI_SHELL_FLOATING_WINDOWS 185 #define IDI_SHELL_ONE_CLICK_OPEN 186 #define IDI_SHELL_TWO_CLICK_OPEN 187 +/* 188 - 190 not used on Windows */ +#define IDI_SHELL_EMPTY_RECYCLE_BIN_95 191 +#define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 +#define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_FAVORITES_SMALL 322

1 0

Jacek Caban : mshtml: Introduce get_current_style_property_var helper.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 889ccb883a3b883462940a83903eb95f2de45ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889ccb883a3b883462940a83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:10:00 2018 +0200 mshtml: Introduce get_current_style_property_var helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 69 +++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=889ccb883a3b88346294…

1 0

Jacek Caban : mshtml.idl: Add IHTMLCSSStyleDeclaration2 declaration.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: c71e363a6ed377c2df3cd98d6d11268a14135305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71e363a6ed377c2df3cd98d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:19:01 2018 +0200 mshtml.idl: Add IHTMLCSSStyleDeclaration2 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 116 +++++++++ include/mshtml.idl | 696 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 812 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c71e363a6ed377c2df3c…

1 0

Jacek Caban : mshtml: Skip fixups in get_nsstyle_property_var in IE9+ mode.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 869b4477642ad85d47eabbdb1310758d97f45571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=869b4477642ad85d47eabbdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:10:33 2018 +0200 mshtml: Skip fixups in get_nsstyle_property_var in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlstyle.c | 11 +++++------ dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/tests/style.c | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 007be63..2887aec 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -53,7 +53,7 @@ static inline HRESULT get_current_style_property(HTMLCurrentStyle *current_style static inline HRESULT get_current_style_property_var(HTMLCurrentStyle *This, styleid_t sid, VARIANT *v) { - return get_nsstyle_property_var(This->nsstyle, sid, v); + return get_nsstyle_property_var(This->nsstyle, sid, COMPAT_MODE_QUIRKS, v); } static inline HTMLCurrentStyle *impl_from_IHTMLCurrentStyle(IHTMLCurrentStyle *iface) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4ec24a3..6fc5779 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -685,22 +685,21 @@ HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, return hres; } -HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p) +HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, VARIANT *p) { + unsigned flags = style_tbl[sid].flags; nsAString str_value; const PRUnichar *value; BOOL set = FALSE; - unsigned flags; HRESULT hres = S_OK; - flags = style_tbl[sid].flags; nsAString_Init(&str_value, NULL); get_nsstyle_attr_nsval(nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); - if(flags & ATTR_STR_TO_INT) { + if((flags & ATTR_STR_TO_INT) && (*value || compat_mode < COMPAT_MODE_IE9)) { const PRUnichar *ptr = value; BOOL neg = FALSE; INT i = 0; @@ -723,7 +722,7 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s if(!set) { BSTR str; - hres = nsstyle_to_bstr(value, flags, &str); + hres = nsstyle_to_bstr(value, compat_mode < COMPAT_MODE_IE9 ? flags : 0, &str); if(SUCCEEDED(hres)) { V_VT(p) = VT_BSTR; V_BSTR(p) = str; @@ -743,7 +742,7 @@ static inline HRESULT get_style_property(HTMLStyle *This, styleid_t sid, BSTR *p static inline HRESULT get_style_property_var(HTMLStyle *This, styleid_t sid, VARIANT *v) { - return get_nsstyle_property_var(This->nsstyle, sid, v); + return get_nsstyle_property_var(This->nsstyle, sid, dispex_compat_mode(&This->dispex), v); } static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR exval, VARIANT_BOOL *p) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ac0db1c..5969406 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -124,7 +124,7 @@ typedef enum { HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,BSTR*) DECLSPEC_HIDDEN; -HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; +HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN; HRESULT set_elem_style(HTMLElement*,styleid_t,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 51b44fb..62bebc5 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1715,9 +1715,7 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_I4, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_I4(&v), "V_I4(v) != 0\n"); }else { - todo_wine ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - if(V_VT(&v) == VT_BSTR) todo_wine ok(!V_BSTR(&v), "zIndex = %s\n", wine_dbgstr_w(V_BSTR(&v))); } VariantClear(&v);

1 0

Alex Henrie : shell32: Add "power off" icon.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 9954c08dc8dc1783098a48e1188e08a8018c6092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9954c08dc8dc1783098a48e1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:35 2018 -0600 shell32: Add "power off" 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 5ff23f9..c04a37f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -793,6 +793,9 @@ IDI_SHELL_DEFAULT_FOLDER ICON resources/folder.ico /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_POWER_OFF ICON resources/shut_down.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 33f28cf..61fb1e1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -290,6 +290,7 @@ #define IDI_SHELL_DEFAULT_FOLDER 210 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 +#define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Add "restricted" icon.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 1cd138af46cd64e5bba96a66edf4905687ff35bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cd138af46cd64e5bba96a66… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:33 2018 -0600 shell32: Add "restricted" icon. Adapted from dialog-error 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/restricted.ico | Bin 0 -> 54521 bytes dlls/shell32/resources/restricted.svg | 581 ++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 6 + dlls/shell32/shresdef.h | 2 + 5 files changed, 590 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1cd138af46cd64e5bba9…

1 0

Alex Henrie : shell32: Add users icon and passwords icon.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: a3ee1876836ca3c3d7287474b3dfdad950fd3245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ee1876836ca3c3d7287474… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:31 2018 -0600 shell32: Add users icon and passwords icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 15 +++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f5e60e2..ab4a0f2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -763,6 +763,13 @@ IDI_SHELL_FULL_RECYCLE_BIN_95 ICON resources/trash_full.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico +/* @makedep: resources/security.ico */ +IDI_SHELL_PASSWORDS ICON resources/security.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS ICON resources/security.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -775,6 +782,14 @@ IDI_SHELL_COPY ICON resources/copy.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS_XP ICON resources/security.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS_XP2 ICON resources/security.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 0340c70..2b5bfbf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -279,10 +279,15 @@ #define IDI_SHELL_EMPTY_RECYCLE_BIN_95 191 #define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 +#define IDI_SHELL_PASSWORDS 194 +/* 211 - 219 not used on Windows */ +#define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 +#define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_FAVORITES_SMALL 322

1 0

Alex Henrie : shell32: Rename icon 48 from "rights" to "security".
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: e7a3ce70162606c9785641b8b524340cee677532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a3ce70162606c9785641b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:30 2018 -0600 shell32: Rename icon 48 from "rights" to "security". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/resources/{lock.ico => security.ico} | Bin dlls/shell32/resources/{lock.svg => security.svg} | 0 dlls/shell32/shell32.rc | 4 ++-- dlls/shell32/shresdef.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index e5217ea..5a56fc2 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -77,7 +77,6 @@ SVG_SRCS = \ resources/folder_open.svg \ resources/help.svg \ resources/internet.svg \ - resources/lock.svg \ resources/log_off.svg \ resources/menu.svg \ resources/mycomputer.svg \ @@ -91,6 +90,7 @@ SVG_SRCS = \ resources/recent.svg \ resources/rename.svg \ resources/search.svg \ + resources/security.svg \ resources/shortcut.svg \ resources/shut_down.svg \ resources/sleep.svg \ diff --git a/dlls/shell32/resources/lock.ico b/dlls/shell32/resources/security.ico similarity index 100% rename from dlls/shell32/resources/lock.ico rename to dlls/shell32/resources/security.ico diff --git a/dlls/shell32/resources/lock.svg b/dlls/shell32/resources/security.svg similarity index 100% rename from dlls/shell32/resources/lock.svg rename to dlls/shell32/resources/security.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6bb7aa1..f5e60e2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -566,8 +566,8 @@ IDI_SHELL_SEARCH_FOLDER ICON resources/search.ico /* @makedep: resources/update.ico */ IDI_SHELL_UPDATE ICON resources/update.ico -/* @makedep: resources/lock.ico */ -IDI_SHELL_RIGHTS ICON resources/lock.ico +/* @makedep: resources/security.ico */ +IDI_SHELL_SECURITY ICON resources/security.ico /* @makedep: resources/shut_down.ico */ IDI_SHELL_CONFIRM_SHUTDOWN ICON resources/shut_down.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 090a3fa..0340c70 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -216,7 +216,7 @@ #define IDI_SHELL_LOG_OFF 45 #define IDI_SHELL_SEARCH_FOLDER 46 #define IDI_SHELL_UPDATE 47 -#define IDI_SHELL_RIGHTS 48 +#define IDI_SHELL_SECURITY 48 #define IDI_SHELL_CONFIRM_SHUTDOWN 49 #define IDI_SHELL_BLANK1 50 #define IDI_SHELL_BLANK2 51

1 0

Jacek Caban : mshtml: Introduce get_current_style_property helper.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: cccabee8b20afa73cef4b492a5fbed7fff3aff3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cccabee8b20afa73cef4b492… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:09:41 2018 +0200 mshtml: Introduce get_current_style_property helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 59 +++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cccabee8b20afa73cef4…

1 0