Jacek Caban : mshtml: Added IHTMLStyle::pageBreakBefore implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 904f4ac8437f3c9cea93c69d560e0da9d0df4014
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=904f4ac8437f3c9cea93c69d56...

Author: Jacek Caban 
Date:   Thu Jul 21 12:26:37 2011 +0200

mshtml: Added IHTMLStyle::pageBreakBefore implementation.

---

dlls/mshtml/htmlstyle.c   |   15 +++++++++++----
 dlls/mshtml/htmlstyle.h   |    1 +
 dlls/mshtml/tests/style.c |   15 +++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 2aab2c1..5c6157b 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -145,6 +145,8 @@ static const WCHAR attrPaddingTop[] =
     {'p','a','d','d','i','n','g','-','t','o','p',0};
 static const WCHAR attrPageBreakAfter[] =
     {'p','a','g','e','-','b','r','e','a','k','-','a','f','t','e','r',0};
+static const WCHAR attrPageBreakBefore[] =
+    {'p','a','g','e','-','b','r','e','a','k','-','b','e','f','o','r','e',0};
 static const WCHAR attrPosition[] =
     {'p','o','s','i','t','i','o','n',0};
 static const WCHAR attrRight[] =
@@ -229,6 +231,7 @@ static const struct{
     {attrPaddingRight,         DISPID_IHTMLSTYLE_PADDINGRIGHT},
     {attrPaddingTop,           DISPID_IHTMLSTYLE_PADDINGTOP},
     {attrPageBreakAfter,       DISPID_IHTMLSTYLE_PAGEBREAKAFTER},
+    {attrPageBreakBefore,      DISPID_IHTMLSTYLE_PAGEBREAKBEFORE},
     {attrPosition,             DISPID_IHTMLSTYLE2_POSITION},
     {attrRight,                DISPID_IHTMLSTYLE2_RIGHT},
     {attrTextAlign,            DISPID_IHTMLSTYLE_TEXTALIGN},
@@ -2348,15 +2351,19 @@ static HRESULT WINAPI HTMLStyle_get_overflow(IHTMLStyle *iface, BSTR *p)
 static HRESULT WINAPI HTMLStyle_put_pageBreakBefore(IHTMLStyle *iface, BSTR v)
 {
     HTMLStyle *This = impl_from_IHTMLStyle(iface);
-    FIXME("(%p)->(%s)\n", This, debugstr_w(v));
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%s)\n", This, debugstr_w(v));
+
+    return set_nsstyle_attr(This->nsstyle, STYLEID_PAGE_BREAK_BEFORE, v, 0);
 }

static HRESULT WINAPI HTMLStyle_get_pageBreakBefore(IHTMLStyle *iface, BSTR *p)
 {
     HTMLStyle *This = impl_from_IHTMLStyle(iface);
-    FIXME("(%p)->(%p)\n", This, p);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%p)\n", This, p);
+
+    return get_nsstyle_attr(This->nsstyle, STYLEID_PAGE_BREAK_BEFORE, p, 0);
 }

static HRESULT WINAPI HTMLStyle_put_pageBreakAfter(IHTMLStyle *iface, BSTR v)
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index 6eae659..b4d9662 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -86,6 +86,7 @@ typedef enum {
     STYLEID_PADDING_RIGHT,
     STYLEID_PADDING_TOP,
     STYLEID_PAGE_BREAK_AFTER,
+    STYLEID_PAGE_BREAK_BEFORE,
     STYLEID_POSITION,
     STYLEID_RIGHT,
     STYLEID_TEXT_ALIGN,
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index c15882a..e9061a2 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -1653,6 +1653,21 @@ static void test_body_style(IHTMLStyle *style)
     ok(!strcmp_wa(str, "always"), "pageBreakAfter = %s\n", wine_dbgstr_w(str));
     SysFreeString(str);

+    /* pageBreakBefore */
+    hres = IHTMLStyle_get_pageBreakBefore(style, &str);
+    ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres);
+    ok(!str, "pageBreakBefore = %s\n", wine_dbgstr_w(str));
+
+    str = a2bstr("always");
+    hres = IHTMLStyle_put_pageBreakBefore(style, str);
+    ok(hres == S_OK, "put_pageBreakBefore failed: %08x\n", hres);
+    SysFreeString(str);
+
+    hres = IHTMLStyle_get_pageBreakBefore(style, &str);
+    ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres);
+    ok(!strcmp_wa(str, "always"), "pageBreakBefore = %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
     hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2);
     ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres);
     if(SUCCEEDED(hres)) {