[PATCH] Correct IXMLDOMProcessingInstruction put_data function
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Fri Feb 29 03:54:53 CST 2008
---
dlls/msxml3/pi.c | 15 +++++++++++++++
dlls/msxml3/tests/domdoc.c | 16 ++--------------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
index 90425fd..130cc61 100644
--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
@@ -506,8 +506,23 @@ static HRESULT WINAPI dom_pi_put_data(
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
HRESULT hr = E_FAIL;
VARIANT val;
+ BSTR sTarget;
+ static WCHAR szXML[] = {'x','m','l',0};
TRACE("%p %s\n", This, debugstr_w(data) );
+
+ /* Cannot set data to a PI node whos target is 'xml' */
+ hr = dom_pi_get_nodeName(iface, &sTarget);
+ if(hr == S_OK)
+ {
+ if(lstrcmpW( sTarget, szXML) == 0)
+ {
+ SysFreeString(sTarget);
+ return E_FAIL;
+ }
+
+ SysFreeString(sTarget);
+ }
V_VT(&val) = VT_BSTR;
V_BSTR(&val) = data;
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index e4efcea..62f2638 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -688,22 +688,10 @@ static void test_domdoc( void )
/* test put_data */
r = IXMLDOMProcessingInstruction_put_data(nodePI, _bstr_("version=\"1.0\" encoding=\"UTF-8\""));
- ok(r == S_OK, "ret %08x\n", r );
- SysFreeString(str);
-
- r = IXMLDOMProcessingInstruction_get_data(nodePI, &str);
- ok(r == S_OK, "ret %08x\n", r );
- ok( !lstrcmpW( str, _bstr_("version=\"1.0\" encoding=\"UTF-8\"") ), "incorrect data string\n");
- SysFreeString(str);
-
- /* Confirm XML text is good */
- r = IXMLDOMProcessingInstruction_get_xml(nodePI, &str);
- ok(r == S_OK, "ret %08x\n", r );
- ok( !lstrcmpW( str, _bstr_("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") ), "incorrect xml string\n");
- SysFreeString(str);
+ ok(r == E_FAIL, "ret %08x\n", r );
IXMLDOMProcessingInstruction_Release(nodePI);
- }
+ }
r = IXMLDOMDocument_Release( doc );
ok( r == 0, "document ref count incorrect\n");
--
1.5.4.1
--------------060705070605050901020102--
More information about the wine-patches
mailing list