scrobj: Ignore processing instructions in scriptlet files.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

scrobj: Ignore processing instructions in scriptlet files.
142ef8a7 · Jacek Caban · Alexandre Julliard · aa503dac · 142ef8a7 · 142ef8a7
Commit 142ef8a7 authored Sep 26, 2019 by Jacek Caban Committed by Alexandre Julliard Sep 26, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 3 deletions

scrobj.c dlls/scrobj/scrobj.c +12 -2

scrobj.wsc dlls/scrobj/tests/scrobj.wsc +3 -1

No files found.
--- a/dlls/scrobj/scrobj.c
+++ b/dlls/scrobj/scrobj.c
@@ -1261,8 +1261,18 @@ static const char *debugstr_xml_name(struct scriptlet_factory *factory)
 static HRESULT next_xml_node(struct scriptlet_factory *factory, XmlNodeType *node_type)
 {
    HRESULT hres;
-    do hres = IXmlReader_Read(factory->xml_reader, node_type);
-    while (hres == S_OK && *node_type == XmlNodeType_Whitespace);
+    for (;;)
+    {
+        hres = IXmlReader_Read(factory->xml_reader, node_type);
+        if (FAILED(hres)) break;
+        if (*node_type == XmlNodeType_Whitespace) continue;
+        if (*node_type == XmlNodeType_ProcessingInstruction)
+        {
+            FIXME("Ignoring processing instruction\n");
+            continue;
+        }
+        break;
+    }
    return hres;
 }


--- a/dlls/scrobj/tests/scrobj.wsc
+++ b/dlls/scrobj/tests/scrobj.wsc
@@ -4,7 +4,9 @@
  </registration>
  <public>
    <method name="vbAddOne">
-      <PARAMETER name="n"></PARAMETER>
+      <PARAMETER name="n">
+        <?pi xxx="yyy"?>
+      </PARAMETER>
    </method>
    <method name="jsAddTwo" />
    <method name="wtTest">