wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Alex Henrie : shell32: Add one-click-open and two-click-open icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: fe157e542aa7af5a57f890108c4849580ad0d61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe157e542aa7af5a57f89010… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:28 2018 -0600 shell32: Add one-click-open and two-click-open icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index cfd7006..896c63d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -746,6 +746,14 @@ IDI_SHELL_MAXIMIZED_WINDOW ICON resources/window.ico /* @makedep: resources/window.ico */ IDI_SHELL_FLOATING_WINDOWS ICON resources/window.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder_open.ico */ +IDI_SHELL_ONE_CLICK_OPEN ICON resources/folder_open.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder_open.ico */ +IDI_SHELL_TWO_CLICK_OPEN ICON resources/folder_open.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 3876c16..e901460 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -273,6 +273,8 @@ #define IDI_SHELL_WINDOW_WITHOUT_SIDEBAR 183 #define IDI_SHELL_MAXIMIZED_WINDOW 184 #define IDI_SHELL_FLOATING_WINDOWS 185 +#define IDI_SHELL_ONE_CLICK_OPEN 186 +#define IDI_SHELL_TWO_CLICK_OPEN 187 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add demo window icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 408bbe56737e21e1c9f85fab7e9d3884c648e76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=408bbe56737e21e1c9f85fab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:27 2018 -0600 shell32: Add demo window icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 16 ++++++++++++++++ dlls/shell32/shresdef.h | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index c01b8be..cfd7006 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -730,6 +730,22 @@ IDI_SHELL_WINDOW_ON_MONITOR ICON resources/mycomputer.ico /* @makedep: resources/mycomputer.ico */ IDI_SHELL_DESKTOP_ON_MONITOR ICON resources/mycomputer.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_WINDOW_WITH_SIDEBAR ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_WINDOW_WITHOUT_SIDEBAR ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_MAXIMIZED_WINDOW ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_FLOATING_WINDOWS ICON resources/window.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index f70b084..3876c16 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -269,6 +269,10 @@ #define IDI_SHELL_REMOTE_CONNECTION 179 #define IDI_SHELL_WINDOW_ON_MONITOR 180 #define IDI_SHELL_DESKTOP_ON_MONITOR 181 +#define IDI_SHELL_WINDOW_WITH_SIDEBAR 182 +#define IDI_SHELL_WINDOW_WITHOUT_SIDEBAR 183 +#define IDI_SHELL_MAXIMIZED_WINDOW 184 +#define IDI_SHELL_FLOATING_WINDOWS 185 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add window-on-monitor and desktop-on-monitor icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 8017c259ca76ae7f1547e75ed256b8b457fe1340 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8017c259ca76ae7f1547e75e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:26 2018 -0600 shell32: Add window-on-monitor and desktop-on-monitor icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 2b34345..c01b8be 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -722,6 +722,14 @@ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico /* @makedep: resources/internet.ico */ IDI_SHELL_REMOTE_CONNECTION ICON resources/internet.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_WINDOW_ON_MONITOR ICON resources/mycomputer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_DESKTOP_ON_MONITOR ICON resources/mycomputer.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index f7e51dc..f70b084 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -267,6 +267,8 @@ #define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 #define IDI_SHELL_REMOTE_CONNECTION 179 +#define IDI_SHELL_WINDOW_ON_MONITOR 180 +#define IDI_SHELL_DESKTOP_ON_MONITOR 181 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add remote connection icon.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 2c3d0b76720c4f4b882dc1375256d5b219333ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c3d0b76720c4f4b882dc137… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:25 2018 -0600 shell32: Add remote connection 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 43fe27d..2b34345 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -718,6 +718,10 @@ IDI_SHELL_VISUAL_SETTINGS ICON resources/control.ico /* @makedep: resources/document.ico */ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_REMOTE_CONNECTION ICON resources/internet.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index dc45821..f7e51dc 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -266,6 +266,7 @@ #define IDI_SHELL_NEW_WEB_FOLDER 176 #define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 +#define IDI_SHELL_REMOTE_CONNECTION 179 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add visual settings icon.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: a90f24322eb28ceefe0854b2bd80bf9433da5dce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90f24322eb28ceefe0854b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:24 2018 -0600 shell32: Add visual settings 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 749d24e..43fe27d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -711,6 +711,9 @@ IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico /* @makedep: resources/folder.ico */ IDI_SHELL_NEW_WEB_FOLDER ICON resources/folder.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_VISUAL_SETTINGS ICON resources/control.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/document.ico */ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 0e6d070..dc45821 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -264,6 +264,7 @@ #define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_NET_CONNECTIONS 175 #define IDI_SHELL_NEW_WEB_FOLDER 176 +#define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235

1 0

Alex Henrie : shell32: Add web folder icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 1794e51649dabf06f7814268c99d8fc8949f5b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1794e51649dabf06f7814268… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:23 2018 -0600 shell32: Add web folder icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 11 +++++++++++ dlls/shell32/shresdef.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 06b483e..749d24e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -707,6 +707,17 @@ IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico /* @makedep: resources/network.ico */ IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_WEB_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico + +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_FOLDERS ICON resources/internet.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 6761596..0e6d070 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -263,6 +263,9 @@ #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_NET_CONNECTIONS 175 +#define IDI_SHELL_NEW_WEB_FOLDER 176 +#define IDI_SHELL_NEW_WEB_PAGE 178 +#define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

Jacek Caban : mshtml.idl: Add IHTMLCSSStyleDeclaration2 declaration.
by Alexandre Julliard 29 Aug '18

29 Aug '18

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 29 Aug '18

29 Aug '18

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

Jacek Caban : mshtml: Skip fixups in get_nsstyle_property in IE9+ mode.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 8b998a7dd7c0b5128eb3a7b02757f38e718620a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b998a7dd7c0b5128eb3a7b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:10:13 2018 +0200 mshtml: Skip fixups in get_nsstyle_property 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 | 8 ++++---- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/tests/style.c | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index c2e3ee3..007be63 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -48,7 +48,7 @@ struct HTMLCurrentStyle { static inline HRESULT get_current_style_property(HTMLCurrentStyle *current_style, styleid_t sid, BSTR *p) { - return get_nsstyle_property(current_style->nsstyle, sid, p); + return get_nsstyle_property(current_style->nsstyle, sid, COMPAT_MODE_QUIRKS, p); } static inline HRESULT get_current_style_property_var(HTMLCurrentStyle *This, styleid_t sid, VARIANT *v) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7fa126d..4ec24a3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -667,7 +667,7 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) return S_OK; } -HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR *p) +HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, BSTR *p) { nsAString str_value; const PRUnichar *value; @@ -678,7 +678,7 @@ HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, get_nsstyle_attr_nsval(nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); - hres = nsstyle_to_bstr(value, style_tbl[sid].flags, p); + hres = nsstyle_to_bstr(value, compat_mode < COMPAT_MODE_IE9 ? style_tbl[sid].flags : 0, p); nsAString_Finish(&str_value); TRACE("%s -> %s\n", debugstr_w(style_tbl[sid].name), debugstr_w(*p)); @@ -738,7 +738,7 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s static inline HRESULT get_style_property(HTMLStyle *This, styleid_t sid, BSTR *p) { - return get_nsstyle_property(This->nsstyle, sid, p); + return get_nsstyle_property(This->nsstyle, sid, dispex_compat_mode(&This->dispex), p); } static inline HRESULT get_style_property_var(HTMLStyle *This, styleid_t sid, VARIANT *v) @@ -4796,7 +4796,7 @@ HRESULT get_elem_style(HTMLElement *elem, styleid_t styleid, BSTR *ret) if(FAILED(hres)) return hres; - hres = get_nsstyle_property(style, styleid, ret); + hres = get_nsstyle_property(style, styleid, COMPAT_MODE_IE11, ret); nsIDOMCSSStyleDeclaration_Release(style); return hres; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 10f0de5..ac0db1c 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -123,7 +123,7 @@ typedef enum { HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; -HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration*,styleid_t,BSTR*) 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_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1a22d54..51b44fb 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -704,7 +704,6 @@ static void test_style6(IHTMLStyle6 *style) if(compat_mode < COMPAT_IE9) ok(str && !*str, "outline = %s\n", wine_dbgstr_w(str)); else - todo_wine ok(!str, "outline = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -2524,7 +2523,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_clip(style, &str); ok(hres == S_OK, "get_clip failed: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(str, compat_mode < COMPAT_IE9 ? "rect(0px 1px 500px 505px)" : "rect(0px, 1px, 500px, 505px)"), "clip = %s\n", wine_dbgstr_w(str)); SysFreeString(str);

1 0

Jacek Caban : mshtml: Introduce get_current_style_property_var helper.
by Alexandre Julliard 29 Aug '18

29 Aug '18

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

← Newer
1
...
8
9
10
11
12
13
14
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018