Nikolay Sivov : msxml3: Support byteOrderMark() property.

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Sat May  7 21:57:45 2011 +0400

msxml3: Support byteOrderMark() property.

---

dlls/msxml3/mxwriter.c        |   25 ++++++++++++++++++-------
 dlls/msxml3/tests/saxreader.c |    8 ++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c
index fa0756f..0bf1146 100644
--- a/dlls/msxml3/mxwriter.c
+++ b/dlls/msxml3/mxwriter.c
@@ -44,7 +44,8 @@ static const char crlfA[] = "\r\n";

typedef enum
 {
-    MXWriter_Indent = 0,
+    MXWriter_BOM = 0,
+    MXWriter_Indent,
     MXWriter_OmitXmlDecl,
     MXWriter_Standalone,
     MXWriter_LastProp
@@ -295,18 +296,27 @@ static HRESULT WINAPI mxwriter_get_encoding(IMXWriter *iface, BSTR *encoding)
     return return_bstr(This->encoding, encoding);
 }

-static HRESULT WINAPI mxwriter_put_byteOrderMark(IMXWriter *iface, VARIANT_BOOL writeBOM)
+static HRESULT WINAPI mxwriter_put_byteOrderMark(IMXWriter *iface, VARIANT_BOOL value)
 {
     mxwriter *This = impl_from_IMXWriter( iface );
-    FIXME("(%p)->(%d)\n", This, writeBOM);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%d)\n", This, value);
+    This->props[MXWriter_BOM] = value;
+
+    return S_OK;
 }

-static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL *writeBOM)
+static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL *value)
 {
     mxwriter *This = impl_from_IMXWriter( iface );
-    FIXME("(%p)->(%p)\n", This, writeBOM);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%p)\n", This, value);
+
+    if (!value) return E_POINTER;
+
+    *value = This->props[MXWriter_BOM];
+
+    return S_OK;
 }

static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL value)
@@ -719,6 +729,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj)
     This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl;
     This->ref = 1;

+    This->props[MXWriter_BOM] = VARIANT_TRUE;
     This->props[MXWriter_Indent] = VARIANT_FALSE;
     This->props[MXWriter_OmitXmlDecl] = VARIANT_FALSE;
     This->props[MXWriter_Standalone] = VARIANT_FALSE;
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
index 3092039..8ad464f 100644
--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -936,6 +936,14 @@ static void test_mxwriter_properties(void)
             &IID_IMXWriter, (void**)&writer);
     ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

+    hr = IMXWriter_get_byteOrderMark(writer, NULL);
+    ok(hr == E_POINTER, "got %08x\n", hr);
+
+    b = VARIANT_FALSE;
+    hr = IMXWriter_get_byteOrderMark(writer, &b);
+    ok(hr == S_OK, "got %08x\n", hr);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
+
     hr = IMXWriter_get_indent(writer, NULL);
     ok(hr == E_POINTER, "got %08x\n", hr);