From: Gabriel Ivăncescu gabrielopcode@gmail.com
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/mshtml/htmlstyle.c | 6 +++++- dlls/mshtml/tests/documentmode.js | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 764750c4823..10c0ca3a604 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -9837,6 +9837,9 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) static void CSSStyleDeclaration_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const dispex_hook_t styledecl_hooks[] = { + {DISPID_IHTMLCSSSTYLEDECLARATION_FILTER}, + + /* IE10+ */ {DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDPOSITIONX}, {DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDPOSITIONY}, {DISPID_IHTMLCSSSTYLEDECLARATION_STYLEFLOAT}, @@ -9868,8 +9871,9 @@ static void CSSStyleDeclaration_init_dispex_info(dispex_data_t *info, compat_mod {DISPID_IHTMLCSSSTYLEDECLARATION_MSBLOCKPROGRESSION}, {DISPID_UNKNOWN} }; + const dispex_hook_t *const styledecl_ie10_hooks = styledecl_hooks + 1;
- dispex_info_add_interface(info, IHTMLCSSStyleDeclaration_tid, styledecl_hooks); + dispex_info_add_interface(info, IHTMLCSSStyleDeclaration_tid, mode >= COMPAT_MODE_IE10 ? styledecl_ie10_hooks : styledecl_hooks); if(mode >= COMPAT_MODE_IE10) dispex_info_add_interface(info, IHTMLCSSStyleDeclaration2_tid, NULL); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c07444c8e56..715baa36f75 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -856,7 +856,7 @@ sync_test("style_props", function() { test_exposed("removeAttribute", true, v >= 9, false); test_exposed("zIndex", true, true, true); test_exposed("z-index", true, true, true, true); - test_exposed("filter", true, true, broken(true) ? v >= 10 : v >= 9 /* todo_wine */); + test_exposed("filter", true, true, v >= 10); test_exposed("pixelTop", true, false, false); test_exposed("float", true, true, true, true); test_exposed("css-float", false, false, false); @@ -3812,7 +3812,7 @@ sync_test("prototype props", function() { "wordSpacing", "wordWrap", "zIndex" ], [ ["alignContent",11], ["alignItems",11], ["alignSelf",11], ["borderImage",11], ["borderImageOutset",11], ["borderImageRepeat",11], ["borderImageSlice",11], - ["borderImageSource",11], ["borderImageWidth",11], "clipBottom", "clipLeft", "clipRight", "clipTop", ["filter",9,9], ["flex",11], ["flexBasis",11], ["flexDirection",11], + ["borderImageSource",11], ["borderImageWidth",11], "clipBottom", "clipLeft", "clipRight", "clipTop", ["flex",11], ["flexBasis",11], ["flexDirection",11], ["flexFlow",11], ["flexGrow",11], ["flexShrink",11], ["flexWrap",11], ["justifyContent",11], ["msImeAlign",11], ["msTextCombineHorizontal",11], ["msTextSizeAdjust",11], ["order",11], ["touchAction",11] ]); @@ -3945,7 +3945,7 @@ sync_test("prototype props", function() { "scrollbarArrowColor", "scrollbarBaseColor", "scrollbarDarkShadowColor", "scrollbarFaceColor", "scrollbarHighlightColor", "scrollbarShadowColor", "scrollbarTrackColor", "setAttribute", "styleFloat", "textAutospace", "textJustifyTrim", "textKashida", "textKashidaSpace", "writingMode", "zoom" - ], [ ["filter",9,9] ]); + ]); check(MSCurrentStyleCSSProperties, [ "blockDirection", "clipBottom", "clipLeft", "clipRight", "clipTop", "hasLayout" ], [ ["behavior",11], "clipBottom", "clipLeft", "clipRight", "clipTop"]); check(MSStyleCSSProperties, [