updated VS project files

XML/XML_CE_vs90.vcproj

@@ -438,6 +438,8 @@
 			Name="XML">
 			<Filter
 				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\XML\Content.h"/>
 				<File
 					RelativePath=".\include\Poco\XML\Name.h"/>
 				<File
@@ -446,12 +448,20 @@
 					RelativePath=".\include\Poco\Xml\NamespaceStrategy.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\ParserEngine.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\QName.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\ValueTraits.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XML.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLException.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLStream.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\XMLStreamParser.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\XMLStreamParserException.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLString.h"/>
 				<File
@@ -467,8 +477,16 @@
 					RelativePath=".\src\NamespaceStrategy.cpp"/>
 				<File
 					RelativePath=".\src\ParserEngine.cpp"/>
+				<File
+					RelativePath=".\src\QName.cpp"/>
+				<File
+					RelativePath=".\src\ValueTraits.cpp"/>
 				<File
 					RelativePath=".\src\XMLException.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParser.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParserException.cpp"/>
 				<File
 					RelativePath=".\src\XMLString.cpp">
 					<FileConfiguration

XML/XML_WEC2013_vs110.vcxproj

@@ -257,13 +257,18 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="include\Poco\SAX\Attributes.h"/>
@@ -346,7 +351,11 @@
     <ClCompile Include="src\NamePool.cpp"/>
     <ClCompile Include="src\NamespaceStrategy.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>

XML/XML_WEC2013_vs110.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{0a27ef56-d026-41bb-b4a6-815c736c20de}</UniqueIdentifier>
+      <UniqueIdentifier>{e4570bb8-b68e-4346-a11e-c0dffba7fe1e}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{ee5c0026-27ea-497e-b85a-44ef9193d6d4}</UniqueIdentifier>
+      <UniqueIdentifier>{e4287882-894e-4f38-b48c-a725c60f9c4a}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{313a431c-94c1-423a-845f-ccc3f8051420}</UniqueIdentifier>
+      <UniqueIdentifier>{19dea724-7645-4951-aee4-e1c5b9dee5c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{5a587ae3-0947-4436-b3f5-a43e5ada5473}</UniqueIdentifier>
+      <UniqueIdentifier>{c727f76a-9259-45ad-a5d6-b431a282e1bc}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{182eaaff-f16c-44a8-bfcd-689486365f7a}</UniqueIdentifier>
+      <UniqueIdentifier>{e9122713-8de9-4dd2-b084-2dabb8158d5d}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{b883bb0b-ecf7-4d5c-a9a6-f79d10d97972}</UniqueIdentifier>
+      <UniqueIdentifier>{d88f81d5-0c62-4440-8b27-969931e9d142}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{95e9ef8e-3cf0-4f95-b111-e079410adbb1}</UniqueIdentifier>
+      <UniqueIdentifier>{1195757e-c239-469c-9a2e-5aa982915262}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{f5579eb9-c0d3-45de-8182-471394cf1e2e}</UniqueIdentifier>
+      <UniqueIdentifier>{4b4acff6-a77e-4ced-bd5c-c430d3b42c16}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{cdd3c97f-bc1c-44e3-a063-1fccb2ccd54a}</UniqueIdentifier>
+      <UniqueIdentifier>{b84bfc28-dcf1-48c6-84e2-50cba2f765df}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{3e206c78-0fec-4487-96d1-b9d7d201a9fe}</UniqueIdentifier>
+      <UniqueIdentifier>{1b946de7-18e4-4729-9239-61905cc20c12}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{5df33881-4d8e-4cf6-970f-739fa9552915}</UniqueIdentifier>
+      <UniqueIdentifier>{cff456cd-c6e3-49a5-b353-de17fc63f92e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{7e73cd8a-56f2-4830-9fb9-56870af1ca42}</UniqueIdentifier>
+      <UniqueIdentifier>{42fdd8dc-39e9-4aac-841f-2e033a959b12}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_WEC2013_vs120.vcxproj

@@ -318,15 +318,20 @@
     <ClInclude Include="include\Poco\Sax\XMLFilter.h"/>
     <ClInclude Include="include\Poco\Sax\XMLFilterImpl.h"/>
     <ClInclude Include="include\Poco\SAX\XMLReader.h"/>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\Xml\expat.h"/>
     <ClInclude Include="include\Poco\Xml\expat_external.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="src\ascii.h"/>
@@ -398,10 +403,12 @@
     <ClCompile Include="src\Notation.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
     <ClCompile Include="src\ProcessingInstruction.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
     <ClCompile Include="src\SAXException.cpp"/>
     <ClCompile Include="src\SAXParser.cpp"/>
     <ClCompile Include="src\Text.cpp"/>
     <ClCompile Include="src\TreeWalker.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\WhitespaceFilter.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
     <ClCompile Include="src\XMLFilter.cpp"/>
@@ -409,6 +416,8 @@
     <ClCompile Include="src\xmlparse.cpp"/>
     <ClCompile Include="src\XMLReader.cpp"/>
     <ClCompile Include="src\xmlrole.c"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>

XML/XML_WEC2013_vs120.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{607e5536-55e7-4e1c-8f7a-ead0b6fbb8a5}</UniqueIdentifier>
+      <UniqueIdentifier>{6aefed2a-9745-4082-ab55-b2c5e670fd8c}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{6a4ab1a6-fde6-424c-9280-cf3f84f3b922}</UniqueIdentifier>
+      <UniqueIdentifier>{6847eba3-8d63-49cc-af44-ac497e763528}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{52d539ce-9c2c-427d-9eeb-a1b0464ee70b}</UniqueIdentifier>
+      <UniqueIdentifier>{e50c0268-f053-4d0d-b509-df1a44458ecd}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{29c0ac4a-5923-4581-a688-ad63661a6f69}</UniqueIdentifier>
+      <UniqueIdentifier>{d3fcdd30-14f3-4fe9-9888-9fb36a33d50a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{29fab171-3cd5-439c-87ca-cd7d5378c610}</UniqueIdentifier>
+      <UniqueIdentifier>{e03ba244-ba89-4d70-a0cf-f5a8824c5683}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{261566a4-8657-4175-a627-61d33b927a9f}</UniqueIdentifier>
+      <UniqueIdentifier>{dfa91249-a8c0-4691-b47a-33ed4feb29e3}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{11e9e69a-837e-43bf-b0c4-ebf06b41da0c}</UniqueIdentifier>
+      <UniqueIdentifier>{bfe479d8-e81d-4736-9a7f-e1ea695e68ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{f9b59c23-1a04-40dd-ad55-dedaa84c950d}</UniqueIdentifier>
+      <UniqueIdentifier>{2a2d6265-99aa-461a-9233-3cb2d2fb95f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{9af80e24-06aa-464f-aca3-4d6676f4ea80}</UniqueIdentifier>
+      <UniqueIdentifier>{9c173a58-c81f-41d2-ab9f-6ba5610f1335}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{b0347d1c-78f0-479e-9026-40302bd099a0}</UniqueIdentifier>
+      <UniqueIdentifier>{2f627881-fc28-4df2-aaa2-8e94de41dffb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{abceea86-9fd4-4b54-8ffe-00ff7a7c7ea2}</UniqueIdentifier>
+      <UniqueIdentifier>{9e3cf5a4-ecb0-4d77-b29f-30a0f7e3f1b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{f3796949-1eb2-487d-a280-34101b469ded}</UniqueIdentifier>
+      <UniqueIdentifier>{331fbb21-6916-4762-9541-161d1ad52234}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_vs100.vcxproj

@@ -275,13 +275,18 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="include\Poco\SAX\Attributes.h"/>
@@ -364,7 +369,11 @@
     <ClCompile Include="src\NamePool.cpp"/>
     <ClCompile Include="src\NamespaceStrategy.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>

XML/XML_vs100.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{945aef23-2a80-45dc-8849-17f49c429628}</UniqueIdentifier>
+      <UniqueIdentifier>{2f9375ac-ac5d-46c8-8f02-404d9fe37182}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{2387b12c-3d91-4a05-ae0a-5fa5f2f053b8}</UniqueIdentifier>
+      <UniqueIdentifier>{278b8a6d-78ad-408d-b03a-33755f6dec0b}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{cc309da4-8a97-4cf0-8a43-335332e5c36a}</UniqueIdentifier>
+      <UniqueIdentifier>{d0169a98-760f-4e79-bbc4-5ff050e07421}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{59745370-646f-4b63-8a9e-3da50498645a}</UniqueIdentifier>
+      <UniqueIdentifier>{1a823da8-4e6e-4bbb-8f2a-a2fd43c98ee1}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{26ca3b75-75c6-4839-a0ec-cc907bbf7854}</UniqueIdentifier>
+      <UniqueIdentifier>{a2b7880c-81a5-4a47-b87d-f4ac5b027139}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{cefbbfb3-bad1-4a6f-b582-2b86cce8b66b}</UniqueIdentifier>
+      <UniqueIdentifier>{e7339bf3-f043-4336-9fbe-d5ff045e3396}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{4c1944da-731c-4f58-9075-e02ab859103f}</UniqueIdentifier>
+      <UniqueIdentifier>{f54388b6-93e0-4928-8fdd-6125741867d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{34469edc-3620-4681-9ec8-9ec0c8be3af0}</UniqueIdentifier>
+      <UniqueIdentifier>{760590ac-de3c-4734-80eb-28400cbc33dc}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{66e7d765-fff0-451b-92f1-d0bae40f24d3}</UniqueIdentifier>
+      <UniqueIdentifier>{72a2d038-f5fe-4f3d-96c7-99194a8e44ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{6c219dda-366c-48f6-beb6-fba9249e4870}</UniqueIdentifier>
+      <UniqueIdentifier>{b5ec9f3f-ea42-4e0e-ba29-e078254ebd54}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{e81d5d15-c25d-4b8c-80e5-3c08b0586acc}</UniqueIdentifier>
+      <UniqueIdentifier>{d6407c4a-f7cb-4bf6-895d-a160b0127eba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{5a304a8f-2138-4643-a9e1-2e7148e40bf3}</UniqueIdentifier>
+      <UniqueIdentifier>{281a452b-fd8a-41ea-b4eb-de23492c9965}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_vs110.vcxproj

@@ -276,13 +276,18 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="include\Poco\SAX\Attributes.h"/>
@@ -365,7 +370,11 @@
     <ClCompile Include="src\NamePool.cpp"/>
     <ClCompile Include="src\NamespaceStrategy.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>

XML/XML_vs110.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{a2887584-c87a-473e-9213-6ea412a66190}</UniqueIdentifier>
+      <UniqueIdentifier>{bfb19e3d-02ed-42e1-8f03-71fc5f8fa193}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{599ab01a-ce8b-4771-9d58-7b47d241edc7}</UniqueIdentifier>
+      <UniqueIdentifier>{df42da9c-f45f-4932-a85e-1f8e05957bd8}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{958342fd-277a-4f96-a083-dc4ea4ff9476}</UniqueIdentifier>
+      <UniqueIdentifier>{b89c4f6f-91af-46ab-b4f0-6ee1c6418851}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{5945dd24-9617-40d3-a969-607dd6ccc09a}</UniqueIdentifier>
+      <UniqueIdentifier>{8ae5c2e9-b867-44a7-af62-acf94ddcd02a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{a145dac2-fe47-4eaf-b01a-876e529b7cc8}</UniqueIdentifier>
+      <UniqueIdentifier>{f856164e-244c-498f-82d8-b0b333c91463}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{0d6314c0-65f2-40f0-b02c-9561e4e173af}</UniqueIdentifier>
+      <UniqueIdentifier>{67185503-1c80-41e5-9e1a-fa6c4555b557}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{abd48d02-956b-4925-87ba-ba830d38799e}</UniqueIdentifier>
+      <UniqueIdentifier>{f3d51bc7-61f5-437b-a45d-dc2939862b9a}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{792651c3-1394-44f8-9679-c351e8c1c20f}</UniqueIdentifier>
+      <UniqueIdentifier>{e20b4488-e1ce-4272-a3b6-e7cc06aaf129}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{ce6751ed-0db8-4246-95c6-8427a987c2a1}</UniqueIdentifier>
+      <UniqueIdentifier>{1a15c0f9-4439-4ec3-9bca-1f2b94172fa0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{64ae7a77-3d4b-44b9-a791-88d45d2b4a30}</UniqueIdentifier>
+      <UniqueIdentifier>{5f0aab87-0e58-4984-aceb-f6fb94afce95}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{54029fec-369c-407d-805b-fd982184a1b5}</UniqueIdentifier>
+      <UniqueIdentifier>{d0bcdec0-0f3a-4d28-8924-ce8ef30c08dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{dd157b6d-8794-43f2-a526-fa294e983138}</UniqueIdentifier>
+      <UniqueIdentifier>{cb9d7068-8aca-497a-9b8d-5a397464eb29}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_vs120.vcxproj

@@ -337,15 +337,20 @@
     <ClInclude Include="include\Poco\Sax\XMLFilter.h"/>
     <ClInclude Include="include\Poco\Sax\XMLFilterImpl.h"/>
     <ClInclude Include="include\Poco\SAX\XMLReader.h"/>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\Xml\expat.h"/>
     <ClInclude Include="include\Poco\Xml\expat_external.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="src\ascii.h"/>
@@ -417,10 +422,12 @@
     <ClCompile Include="src\Notation.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
     <ClCompile Include="src\ProcessingInstruction.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
     <ClCompile Include="src\SAXException.cpp"/>
     <ClCompile Include="src\SAXParser.cpp"/>
     <ClCompile Include="src\Text.cpp"/>
     <ClCompile Include="src\TreeWalker.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\WhitespaceFilter.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
     <ClCompile Include="src\XMLFilter.cpp"/>
@@ -428,6 +435,8 @@
     <ClCompile Include="src\xmlparse.cpp"/>
     <ClCompile Include="src\XMLReader.cpp"/>
     <ClCompile Include="src\xmlrole.c"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>

XML/XML_vs120.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{f8c939c5-d561-45ef-af14-574018eb24df}</UniqueIdentifier>
+      <UniqueIdentifier>{8fe26c01-67a8-486b-8423-3f39035c646e}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{d7fdaf18-37a9-41c0-895c-204a7fec0fb2}</UniqueIdentifier>
+      <UniqueIdentifier>{14c47c63-e927-481a-bb32-0e927d6fa526}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{3ce9b3eb-d690-4d52-bd1c-536d25b09aa4}</UniqueIdentifier>
+      <UniqueIdentifier>{66a18ad0-2a71-4888-889e-196af74f182a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{9220f641-2d43-44c8-a757-882a94ade8cc}</UniqueIdentifier>
+      <UniqueIdentifier>{c1d3196e-0c9f-4fd6-83f7-90bf0df9238c}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{265754a5-e5c5-46ac-9549-27fbfbd2c7e0}</UniqueIdentifier>
+      <UniqueIdentifier>{b3f6d701-52a8-4ab4-9d22-25145eca3026}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{d1a6a322-33b1-4049-ba3e-25649837ea15}</UniqueIdentifier>
+      <UniqueIdentifier>{db8eaa07-ba5f-458a-aab2-6bb521c7b955}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{08e4032d-7dfe-4f9e-8791-79a62f4a89e3}</UniqueIdentifier>
+      <UniqueIdentifier>{a6edb247-a44e-4a5d-ad2c-f6e3d9cbce86}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{87060c43-254e-44ec-9651-ff16e6505d5b}</UniqueIdentifier>
+      <UniqueIdentifier>{bd57685b-7480-44f6-a765-a4428554ee05}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{aa3e33e9-0e87-470f-a2f6-31fcc089874f}</UniqueIdentifier>
+      <UniqueIdentifier>{bcac02ed-5977-4282-8c96-91dbc662caf2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{7a1cc54d-11ed-4a5c-b394-c17f00e85f4c}</UniqueIdentifier>
+      <UniqueIdentifier>{3e1ff3c2-70c8-4d79-8795-610f328970a2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{6ea00709-b54b-41f6-a3f0-9a560d90da3d}</UniqueIdentifier>
+      <UniqueIdentifier>{e8dac05f-ac1c-447b-9bf2-321115cdfe4a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{9c81622a-12cb-4471-a624-310cb2fa9351}</UniqueIdentifier>
+      <UniqueIdentifier>{cce7469c-a6e5-4121-82a4-aaa2b73b8896}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_vs140.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <_ProjectFileVersion>14.0.25420.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoXMLd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoXMLmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoXMLmtd</TargetName>
@@ -337,15 +337,20 @@
     <ClInclude Include="include\Poco\Sax\XMLFilter.h"/>
     <ClInclude Include="include\Poco\Sax\XMLFilterImpl.h"/>
     <ClInclude Include="include\Poco\SAX\XMLReader.h"/>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\Xml\expat.h"/>
     <ClInclude Include="include\Poco\Xml\expat_external.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="src\ascii.h"/>
@@ -417,10 +422,12 @@
     <ClCompile Include="src\Notation.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
     <ClCompile Include="src\ProcessingInstruction.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
     <ClCompile Include="src\SAXException.cpp"/>
     <ClCompile Include="src\SAXParser.cpp"/>
     <ClCompile Include="src\Text.cpp"/>
     <ClCompile Include="src\TreeWalker.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\WhitespaceFilter.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
     <ClCompile Include="src\XMLFilter.cpp"/>
@@ -428,6 +435,8 @@
     <ClCompile Include="src\xmlparse.cpp"/>
     <ClCompile Include="src\XMLReader.cpp"/>
     <ClCompile Include="src\xmlrole.c"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>

XML/XML_vs140.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{af9d0559-52f9-48e9-a951-10a54c9d0c5a}</UniqueIdentifier>
+      <UniqueIdentifier>{4819fa07-e56b-4bea-bc4b-e95e0d53f02a}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{db7b611b-fd1f-4ab2-a327-304b0e81eecf}</UniqueIdentifier>
+      <UniqueIdentifier>{38a77f2a-5532-4734-be2b-14353fa6b930}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{25374dc5-5da6-491b-9631-d59397e0ae13}</UniqueIdentifier>
+      <UniqueIdentifier>{eba8ed23-9976-4f3d-b70a-34d362b20d92}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{6979d2b7-308d-4756-8cf3-7339ce9a7c14}</UniqueIdentifier>
+      <UniqueIdentifier>{d42b334d-e341-4a24-827a-f30e5494a69d}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{b7af5e57-3e93-4487-bcfc-7c51bcb6c861}</UniqueIdentifier>
+      <UniqueIdentifier>{6e8fc0f9-73c6-462a-b501-8fd16cb56728}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{bacff9f0-b4a9-4265-bd37-6cf23b3e783d}</UniqueIdentifier>
+      <UniqueIdentifier>{a8ecaa21-00e6-44eb-8515-012c9e319d64}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{dde1ff89-a5a4-4a8b-9859-b27fae0b4bd2}</UniqueIdentifier>
+      <UniqueIdentifier>{b341cc94-d2d2-4880-b6f8-cb84cda67c52}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{a2f8233b-a069-4c11-9759-4038eedebff4}</UniqueIdentifier>
+      <UniqueIdentifier>{1e3f361d-e85c-4aee-bfb9-2fde43e4099c}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{bbd014e8-47ea-4848-ac3a-1a26cc5a24ae}</UniqueIdentifier>
+      <UniqueIdentifier>{07cb5afc-fa0d-4a8b-9540-d80b1a1bb59f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{8ee61d53-dc25-4f56-ab5d-e8bc668cebc7}</UniqueIdentifier>
+      <UniqueIdentifier>{b679a53b-6f8c-4c7d-9307-494057b0f4a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{45e0e693-e89b-4f42-bed2-f14abbdba0cb}</UniqueIdentifier>
+      <UniqueIdentifier>{9eeafaaa-76dc-4f23-87ea-361fb9f3f68c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{75159b76-6969-4694-a5cf-2b06d2736098}</UniqueIdentifier>
+      <UniqueIdentifier>{2ef780e5-cad5-4156-a3c2-c9e09fb92cba}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_vs150.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <_ProjectFileVersion>15.0.26228.4</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoXMLd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoXMLmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoXMLmtd</TargetName>
@@ -337,15 +337,20 @@
     <ClInclude Include="include\Poco\Sax\XMLFilter.h"/>
     <ClInclude Include="include\Poco\Sax\XMLFilterImpl.h"/>
     <ClInclude Include="include\Poco\SAX\XMLReader.h"/>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\Xml\expat.h"/>
     <ClInclude Include="include\Poco\Xml\expat_external.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="src\ascii.h"/>
@@ -417,10 +422,12 @@
     <ClCompile Include="src\Notation.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
     <ClCompile Include="src\ProcessingInstruction.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
     <ClCompile Include="src\SAXException.cpp"/>
     <ClCompile Include="src\SAXParser.cpp"/>
     <ClCompile Include="src\Text.cpp"/>
     <ClCompile Include="src\TreeWalker.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\WhitespaceFilter.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
     <ClCompile Include="src\XMLFilter.cpp"/>
@@ -428,6 +435,8 @@
     <ClCompile Include="src\xmlparse.cpp"/>
     <ClCompile Include="src\XMLReader.cpp"/>
     <ClCompile Include="src\xmlrole.c"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>

XML/XML_vs150.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{af9d0559-52f9-48e9-a951-10a54c9d0c5a}</UniqueIdentifier>
+      <UniqueIdentifier>{c9025f28-827d-4345-b758-1f5c60f34356}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{db7b611b-fd1f-4ab2-a327-304b0e81eecf}</UniqueIdentifier>
+      <UniqueIdentifier>{a3959ec8-0270-4f4f-87ee-4afde9bf0c18}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{25374dc5-5da6-491b-9631-d59397e0ae13}</UniqueIdentifier>
+      <UniqueIdentifier>{b6d006db-22ad-456a-85fc-36b5481bef39}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{6979d2b7-308d-4756-8cf3-7339ce9a7c14}</UniqueIdentifier>
+      <UniqueIdentifier>{12ea0d04-c128-4fcf-bec9-ea75ffaf3e85}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{b7af5e57-3e93-4487-bcfc-7c51bcb6c861}</UniqueIdentifier>
+      <UniqueIdentifier>{643e1d14-781e-4d92-97a5-7774e5aa68d2}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{bacff9f0-b4a9-4265-bd37-6cf23b3e783d}</UniqueIdentifier>
+      <UniqueIdentifier>{4f13392e-d9cc-44a1-a5a4-a9d4be17896f}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{dde1ff89-a5a4-4a8b-9859-b27fae0b4bd2}</UniqueIdentifier>
+      <UniqueIdentifier>{6dca3fe4-47e0-4f57-92c8-db2085a59118}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{a2f8233b-a069-4c11-9759-4038eedebff4}</UniqueIdentifier>
+      <UniqueIdentifier>{362658cc-3f24-4d22-844d-784f15198275}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{bbd014e8-47ea-4848-ac3a-1a26cc5a24ae}</UniqueIdentifier>
+      <UniqueIdentifier>{518f65da-c0ad-4566-9039-10c895b95e26}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{8ee61d53-dc25-4f56-ab5d-e8bc668cebc7}</UniqueIdentifier>
+      <UniqueIdentifier>{2c5fd0da-ed36-4f5c-a257-5f3fa455588d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{45e0e693-e89b-4f42-bed2-f14abbdba0cb}</UniqueIdentifier>
+      <UniqueIdentifier>{b9b3cc0c-518e-4fca-9739-b0a3f3a0aca3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{75159b76-6969-4694-a5cf-2b06d2736098}</UniqueIdentifier>
+      <UniqueIdentifier>{f30033fe-7c63-4c2a-b916-f100b77488d2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_vs90.vcproj

@@ -392,6 +392,8 @@
 			Name="XML">
 			<Filter
 				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\XML\Content.h"/>
 				<File
 					RelativePath=".\include\Poco\XML\Name.h"/>
 				<File
@@ -400,12 +402,20 @@
 					RelativePath=".\include\Poco\Xml\NamespaceStrategy.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\ParserEngine.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\QName.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\ValueTraits.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XML.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLException.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLStream.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\XMLStreamParser.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\XMLStreamParserException.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLString.h"/>
 				<File
@@ -421,8 +431,16 @@
 					RelativePath=".\src\NamespaceStrategy.cpp"/>
 				<File
 					RelativePath=".\src\ParserEngine.cpp"/>
+				<File
+					RelativePath=".\src\QName.cpp"/>
+				<File
+					RelativePath=".\src\ValueTraits.cpp"/>
 				<File
 					RelativePath=".\src\XMLException.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParser.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParserException.cpp"/>
 				<File
 					RelativePath=".\src\XMLString.cpp">
 					<FileConfiguration

XML/XML_x64_vs100.vcxproj

@@ -273,13 +273,18 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="include\Poco\SAX\Attributes.h"/>
@@ -362,7 +367,11 @@
     <ClCompile Include="src\NamePool.cpp"/>
     <ClCompile Include="src\NamespaceStrategy.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>

XML/XML_x64_vs100.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{a4f62ec2-6187-462b-b5b5-efaa10d0e0f4}</UniqueIdentifier>
+      <UniqueIdentifier>{ab7f12e1-a31b-4e74-97d0-33f78f854ad5}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{c4f6829b-aaaa-4ffb-8cef-d663e1cb83cf}</UniqueIdentifier>
+      <UniqueIdentifier>{6d896e6d-8b44-4e6f-bea1-73a56927a34a}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{6c9db7e3-5b7b-4ae0-afd0-15fe40263e34}</UniqueIdentifier>
+      <UniqueIdentifier>{3ef31fcb-153c-410b-83b2-3b324a4937ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{a2893b1e-dda6-404b-b4f3-ca4a4f3bde6d}</UniqueIdentifier>
+      <UniqueIdentifier>{47c6c2f4-3034-497e-9f48-6fa6cb57349a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{51794fbc-6c5f-4b1b-b4e4-047a3b9de526}</UniqueIdentifier>
+      <UniqueIdentifier>{a331c389-19c0-4ecb-af5a-ae8ab3677b8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{6725b3d4-b051-4317-aaee-8ff4d61bef22}</UniqueIdentifier>
+      <UniqueIdentifier>{33b0fe69-0f03-4d94-9ede-fc5e703758be}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{270b0f18-6867-413b-95e4-ba5f8bfe849b}</UniqueIdentifier>
+      <UniqueIdentifier>{55ec750c-1cd6-4ff1-866f-8f80ec035815}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{b0291fff-e080-4447-9991-b270c5ce00ef}</UniqueIdentifier>
+      <UniqueIdentifier>{19cd91db-7765-4b61-a424-f0bd3084fda0}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{48c6f5d5-2adf-4c14-8748-fe6a4a9a9428}</UniqueIdentifier>
+      <UniqueIdentifier>{413bca8e-6b26-41aa-8232-0c0df7ed3abd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{0e0c68ec-e7d5-4528-b931-51425ef49688}</UniqueIdentifier>
+      <UniqueIdentifier>{028f066c-c014-4eb7-bf37-686367c18b99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{c0e34258-e71b-47a3-a3c6-94b72282f7d9}</UniqueIdentifier>
+      <UniqueIdentifier>{f0564233-cbf3-451c-a730-53ef397dab72}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{41b27c83-c251-4fbe-b9cb-791730e14dab}</UniqueIdentifier>
+      <UniqueIdentifier>{b9a69ae0-21ed-428b-be69-175ada845029}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_x64_vs110.vcxproj

@@ -275,13 +275,18 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="include\Poco\SAX\Attributes.h"/>
@@ -364,7 +369,11 @@
     <ClCompile Include="src\NamePool.cpp"/>
     <ClCompile Include="src\NamespaceStrategy.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>

XML/XML_x64_vs110.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{0b14b184-8d7d-4f7d-b918-8476e5f3647d}</UniqueIdentifier>
+      <UniqueIdentifier>{1717470c-e612-47ab-bdd2-e81148bdd6e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{d21f4bf9-cfbd-4937-b00f-c7a34c421ca5}</UniqueIdentifier>
+      <UniqueIdentifier>{f9047833-1102-416e-ac2d-0cb9b09aba96}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{090b7370-14c8-4643-9ca9-a2ebed4a58e4}</UniqueIdentifier>
+      <UniqueIdentifier>{28421cab-ddf1-46c1-9343-727b601b1606}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{e7a0a2f6-c1e5-486c-a740-3b0b167380c6}</UniqueIdentifier>
+      <UniqueIdentifier>{2990dc05-eb0d-4c8b-957f-cda5b24a2bf1}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{17c8b296-68f9-4551-b093-4d4369806e9a}</UniqueIdentifier>
+      <UniqueIdentifier>{9eb58c7d-ee7d-451b-a1c3-113a902a3f22}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{ca808b76-0cfb-423a-ac2b-eb7834e1caad}</UniqueIdentifier>
+      <UniqueIdentifier>{19861599-d0d0-4d91-bd10-5a232d532436}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{c6683b8a-9a4d-48f9-8800-a8ee42bc74e5}</UniqueIdentifier>
+      <UniqueIdentifier>{01529976-4295-40c6-97fe-7c619d7d13dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{6508cc30-b59c-4328-ba6c-a0889ed72faf}</UniqueIdentifier>
+      <UniqueIdentifier>{372ac6ef-966e-4fc9-9d49-7a235a2a81ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{84e6cf67-ab5a-4d70-880e-771857ec1256}</UniqueIdentifier>
+      <UniqueIdentifier>{b8b9a355-48f2-4bf5-8662-5cebcb6d5315}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{7f54c3aa-c33c-4b64-8966-ca0bae468de5}</UniqueIdentifier>
+      <UniqueIdentifier>{2fd5ddcc-ca18-4d5a-9f92-a58dbfc9d04d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{85fe699d-ee7c-4ba7-be01-87e6d5ff15f2}</UniqueIdentifier>
+      <UniqueIdentifier>{7608c2a2-3d91-47c2-851d-14601b8eba8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{fad7bac7-fac2-41db-a71c-dc1e357ca070}</UniqueIdentifier>
+      <UniqueIdentifier>{290b7ccb-166f-44d6-a997-4b0059acdf76}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_x64_vs120.vcxproj

@@ -336,15 +336,20 @@
     <ClInclude Include="include\Poco\Sax\XMLFilter.h"/>
     <ClInclude Include="include\Poco\Sax\XMLFilterImpl.h"/>
     <ClInclude Include="include\Poco\SAX\XMLReader.h"/>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\Xml\expat.h"/>
     <ClInclude Include="include\Poco\Xml\expat_external.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="src\ascii.h"/>
@@ -416,10 +421,12 @@
     <ClCompile Include="src\Notation.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
     <ClCompile Include="src\ProcessingInstruction.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
     <ClCompile Include="src\SAXException.cpp"/>
     <ClCompile Include="src\SAXParser.cpp"/>
     <ClCompile Include="src\Text.cpp"/>
     <ClCompile Include="src\TreeWalker.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\WhitespaceFilter.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
     <ClCompile Include="src\XMLFilter.cpp"/>
@@ -427,6 +434,8 @@
     <ClCompile Include="src\xmlparse.cpp"/>
     <ClCompile Include="src\XMLReader.cpp"/>
     <ClCompile Include="src\xmlrole.c"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>

XML/XML_x64_vs120.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{19ba2980-0f44-4bd5-8289-8b32ac24b059}</UniqueIdentifier>
+      <UniqueIdentifier>{7ed6e8e3-e2e2-4ce6-b997-f92832456301}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{33102eef-eba2-4b89-9c73-498777984b85}</UniqueIdentifier>
+      <UniqueIdentifier>{5d204d26-36c4-4516-9f3f-0e570cc3478a}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{6a3aa816-1fc2-4278-bb97-fcc6128baf68}</UniqueIdentifier>
+      <UniqueIdentifier>{d8153f7c-24d8-4f1b-a3f7-fdc5b4d4d74f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{dcd92315-7121-47ea-bb75-f0307756e168}</UniqueIdentifier>
+      <UniqueIdentifier>{8a64804b-1d8f-48c6-ad33-aa2c5376ec18}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{f6cc5dd4-80e2-4d9a-bbe6-f0e0d5870ac0}</UniqueIdentifier>
+      <UniqueIdentifier>{a23826cc-bea5-49fd-a470-de5ca10ca323}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{34440a29-b84f-4292-83a1-9782a25e5433}</UniqueIdentifier>
+      <UniqueIdentifier>{7217fbab-dc85-41f7-ac79-c6abcff91725}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{7f1fb15f-84ca-4441-8399-96d4fac3ba4b}</UniqueIdentifier>
+      <UniqueIdentifier>{7739b606-27f0-4fb7-9bdc-88cea295920f}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{55498c8d-fbb4-4f64-9cca-3030b66fe65c}</UniqueIdentifier>
+      <UniqueIdentifier>{a44bbd39-c794-46ea-a349-24b8d1cfb38f}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{32bae4d9-8852-48e6-b777-7e2217871772}</UniqueIdentifier>
+      <UniqueIdentifier>{a530cd9a-63b5-482d-82f2-91aca62ecd8f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{17bf0a7b-d886-4a56-9ae8-72a6a58bf16e}</UniqueIdentifier>
+      <UniqueIdentifier>{31a0f1b4-cb6f-49c6-8d4e-9dfbb3eaca6c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{6d0fc498-2cc8-4571-b9de-002f5352cf25}</UniqueIdentifier>
+      <UniqueIdentifier>{d0455bfa-b5ce-4c18-969c-b1e4ae076f1d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{128367df-4699-4de6-b8f5-b00861effb31}</UniqueIdentifier>
+      <UniqueIdentifier>{b16e28a7-8bb4-4995-aa7a-8d6c4627b841}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_x64_vs140.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <_ProjectFileVersion>14.0.25420.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoXML64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoXMLmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoXMLmtd</TargetName>
@@ -336,15 +336,20 @@
     <ClInclude Include="include\Poco\Sax\XMLFilter.h"/>
     <ClInclude Include="include\Poco\Sax\XMLFilterImpl.h"/>
     <ClInclude Include="include\Poco\SAX\XMLReader.h"/>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\Xml\expat.h"/>
     <ClInclude Include="include\Poco\Xml\expat_external.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="src\ascii.h"/>
@@ -416,10 +421,12 @@
     <ClCompile Include="src\Notation.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
     <ClCompile Include="src\ProcessingInstruction.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
     <ClCompile Include="src\SAXException.cpp"/>
     <ClCompile Include="src\SAXParser.cpp"/>
     <ClCompile Include="src\Text.cpp"/>
     <ClCompile Include="src\TreeWalker.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\WhitespaceFilter.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
     <ClCompile Include="src\XMLFilter.cpp"/>
@@ -427,6 +434,8 @@
     <ClCompile Include="src\xmlparse.cpp"/>
     <ClCompile Include="src\XMLReader.cpp"/>
     <ClCompile Include="src\xmlrole.c"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>

XML/XML_x64_vs140.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{ad0d1629-11e8-49cd-a9b2-c4b5b836a8c7}</UniqueIdentifier>
+      <UniqueIdentifier>{0da73345-ff01-4379-bf5d-ee1896215895}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{66328d3b-5586-4f2a-a1d2-2cc5451255f1}</UniqueIdentifier>
+      <UniqueIdentifier>{ea3b0717-ea26-48fd-8ff8-00d2d43a7f22}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{211f6299-9c1f-4931-8d56-3760e50d22f5}</UniqueIdentifier>
+      <UniqueIdentifier>{04c606d2-cba1-496a-a823-6ccdc39be196}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{b5969e07-b5f2-4071-870e-565d61aa8f5b}</UniqueIdentifier>
+      <UniqueIdentifier>{333e4d1c-0e2d-4ac4-a03a-f1dcb53ac9f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{84dbb2df-3eb5-4353-b51f-b92a8c0c3f06}</UniqueIdentifier>
+      <UniqueIdentifier>{a3df0c72-1a7e-4a35-933c-6cc030b9e7b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{c51d85b6-5709-4004-be2a-ee87e06c05eb}</UniqueIdentifier>
+      <UniqueIdentifier>{308e4dca-d794-4103-aa65-a180e4fd3858}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{b3c0b783-c708-4cf7-92b3-d67c720a5fdd}</UniqueIdentifier>
+      <UniqueIdentifier>{4cb4ad8d-eb38-4e71-a6b2-289935d687cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{0842e903-51b3-4412-bf40-a3ecda71e803}</UniqueIdentifier>
+      <UniqueIdentifier>{9eb29d92-c023-4e7d-8473-3329fb3ecb28}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{764aa296-570b-459f-a2ef-01407004188f}</UniqueIdentifier>
+      <UniqueIdentifier>{d5b192cf-8a8c-4d2b-8481-10c19a59e8cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{2bb8fd32-b8b4-4920-be5b-75157ffb8236}</UniqueIdentifier>
+      <UniqueIdentifier>{7b322a54-490e-4c10-841c-5806a3834362}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{5afb84fc-3fd1-4d99-bbc1-d1658c7d28c4}</UniqueIdentifier>
+      <UniqueIdentifier>{81c76d2c-240c-471e-8951-e56bae181e2c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{9a3084d8-17e6-4a1f-9a23-14a2531f6772}</UniqueIdentifier>
+      <UniqueIdentifier>{ddf6f9f4-a816-4cb7-a42e-e40eac7596c2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_x64_vs150.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <_ProjectFileVersion>15.0.26228.4</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoXML64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoXMLmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoXMLmtd</TargetName>
@@ -336,15 +336,20 @@
     <ClInclude Include="include\Poco\Sax\XMLFilter.h"/>
     <ClInclude Include="include\Poco\Sax\XMLFilterImpl.h"/>
     <ClInclude Include="include\Poco\SAX\XMLReader.h"/>
+    <ClInclude Include="include\Poco\XML\Content.h"/>
     <ClInclude Include="include\Poco\Xml\expat.h"/>
     <ClInclude Include="include\Poco\Xml\expat_external.h"/>
     <ClInclude Include="include\Poco\XML\Name.h"/>
     <ClInclude Include="include\Poco\Xml\NamePool.h"/>
     <ClInclude Include="include\Poco\Xml\NamespaceStrategy.h"/>
     <ClInclude Include="include\Poco\Xml\ParserEngine.h"/>
+    <ClInclude Include="include\Poco\XML\QName.h"/>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h"/>
     <ClInclude Include="include\Poco\Xml\XML.h"/>
     <ClInclude Include="include\Poco\Xml\XMLException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLStream.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h"/>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h"/>
     <ClInclude Include="include\Poco\Xml\XMLString.h"/>
     <ClInclude Include="include\Poco\Xml\XMLWriter.h"/>
     <ClInclude Include="src\ascii.h"/>
@@ -416,10 +421,12 @@
     <ClCompile Include="src\Notation.cpp"/>
     <ClCompile Include="src\ParserEngine.cpp"/>
     <ClCompile Include="src\ProcessingInstruction.cpp"/>
+    <ClCompile Include="src\QName.cpp"/>
     <ClCompile Include="src\SAXException.cpp"/>
     <ClCompile Include="src\SAXParser.cpp"/>
     <ClCompile Include="src\Text.cpp"/>
     <ClCompile Include="src\TreeWalker.cpp"/>
+    <ClCompile Include="src\ValueTraits.cpp"/>
     <ClCompile Include="src\WhitespaceFilter.cpp"/>
     <ClCompile Include="src\XMLException.cpp"/>
     <ClCompile Include="src\XMLFilter.cpp"/>
@@ -427,6 +434,8 @@
     <ClCompile Include="src\xmlparse.cpp"/>
     <ClCompile Include="src\XMLReader.cpp"/>
     <ClCompile Include="src\xmlrole.c"/>
+    <ClCompile Include="src\XMLStreamParser.cpp"/>
+    <ClCompile Include="src\XMLStreamParserException.cpp"/>
     <ClCompile Include="src\XMLString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>

XML/XML_x64_vs150.vcxproj.filters

@@ -2,43 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{ad0d1629-11e8-49cd-a9b2-c4b5b836a8c7}</UniqueIdentifier>
+      <UniqueIdentifier>{89ed59fa-4544-4e8d-b110-27342fee9e0c}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{66328d3b-5586-4f2a-a1d2-2cc5451255f1}</UniqueIdentifier>
+      <UniqueIdentifier>{c8a8436e-d4bc-480d-980f-bd348f584fc6}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{211f6299-9c1f-4931-8d56-3760e50d22f5}</UniqueIdentifier>
+      <UniqueIdentifier>{f1b81a74-068e-479e-b4ac-99add8e6e0d6}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{b5969e07-b5f2-4071-870e-565d61aa8f5b}</UniqueIdentifier>
+      <UniqueIdentifier>{44325acd-9b34-462e-af48-23cd55d9f45c}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{84dbb2df-3eb5-4353-b51f-b92a8c0c3f06}</UniqueIdentifier>
+      <UniqueIdentifier>{669a14ba-f708-4e27-9447-8b144b5c4cce}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{c51d85b6-5709-4004-be2a-ee87e06c05eb}</UniqueIdentifier>
+      <UniqueIdentifier>{7118d7bd-251d-438f-b12e-0d2c3b52f915}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{b3c0b783-c708-4cf7-92b3-d67c720a5fdd}</UniqueIdentifier>
+      <UniqueIdentifier>{d00059c9-a8b5-4bf3-9536-fe39f37b2a22}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{0842e903-51b3-4412-bf40-a3ecda71e803}</UniqueIdentifier>
+      <UniqueIdentifier>{a8ab30c2-1014-4c18-9285-5f398bc295c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{764aa296-570b-459f-a2ef-01407004188f}</UniqueIdentifier>
+      <UniqueIdentifier>{e0a37c44-edae-421c-b982-26f843ee208d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat">
-      <UniqueIdentifier>{2bb8fd32-b8b4-4920-be5b-75157ffb8236}</UniqueIdentifier>
+      <UniqueIdentifier>{bed909af-f2ad-40ff-948f-ecc134ba3261}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Header Files">
-      <UniqueIdentifier>{5afb84fc-3fd1-4d99-bbc1-d1658c7d28c4}</UniqueIdentifier>
+      <UniqueIdentifier>{c0e1c900-eaf1-40aa-828e-1b51f93b77f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Expat\Source Files">
-      <UniqueIdentifier>{9a3084d8-17e6-4a1f-9a23-14a2531f6772}</UniqueIdentifier>
+      <UniqueIdentifier>{03c1aa20-eb16-40fc-9998-89658615f0ce}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="include\Poco\XML\Content.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\XML\Name.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -51,6 +54,12 @@
     <ClInclude Include="include\Poco\Xml\ParserEngine.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\QName.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\ValueTraits.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XML.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -60,6 +69,12 @@
     <ClInclude Include="include\Poco\Xml\XMLStream.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParser.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\XML\XMLStreamParserException.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Xml\XMLString.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -302,9 +317,21 @@
     <ClCompile Include="src\ParserEngine.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\QName.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ValueTraits.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLException.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParser.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\XMLStreamParserException.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLString.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/XML_x64_vs90.vcproj

@@ -397,6 +397,8 @@
 			Name="XML">
 			<Filter
 				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\XML\Content.h"/>
 				<File
 					RelativePath=".\include\Poco\XML\Name.h"/>
 				<File
@@ -405,12 +407,20 @@
 					RelativePath=".\include\Poco\Xml\NamespaceStrategy.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\ParserEngine.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\QName.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\ValueTraits.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XML.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLException.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLStream.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\XMLStreamParser.h"/>
+				<File
+					RelativePath=".\include\Poco\XML\XMLStreamParserException.h"/>
 				<File
 					RelativePath=".\include\Poco\Xml\XMLString.h"/>
 				<File
@@ -426,8 +436,16 @@
 					RelativePath=".\src\NamespaceStrategy.cpp"/>
 				<File
 					RelativePath=".\src\ParserEngine.cpp"/>
+				<File
+					RelativePath=".\src\QName.cpp"/>
+				<File
+					RelativePath=".\src\ValueTraits.cpp"/>
 				<File
 					RelativePath=".\src\XMLException.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParser.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParserException.cpp"/>
 				<File
 					RelativePath=".\src\XMLString.cpp">
 					<FileConfiguration

XML/testsuite/TestSuite_CE_vs90.vcproj

@@ -470,6 +470,8 @@
 					RelativePath=".\src\NamePoolTest.h"/>
 				<File
 					RelativePath=".\src\NameTest.h"/>
+				<File
+					RelativePath=".\src\XMLStreamParserTest.h"/>
 				<File
 					RelativePath=".\src\XMLWriterTest.h"/>
 			</Filter>
@@ -479,6 +481,8 @@
 					RelativePath=".\src\NamePoolTest.cpp"/>
 				<File
 					RelativePath=".\src\NameTest.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParserTest.cpp"/>
 				<File
 					RelativePath=".\src\XMLWriterTest.cpp"/>
 			</Filter>

XML/testsuite/TestSuite_WEC2013_vs110.vcxproj

@@ -309,6 +309,7 @@
   <ItemGroup>
     <ClInclude Include="src\NamePoolTest.h"/>
     <ClInclude Include="src\NameTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
     <ClInclude Include="src\AttributesImplTest.h"/>
     <ClInclude Include="src\NamespaceSupportTest.h"/>
@@ -331,6 +332,7 @@
   <ItemGroup>
     <ClCompile Include="src\NamePoolTest.cpp"/>
     <ClCompile Include="src\NameTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
     <ClCompile Include="src\AttributesImplTest.cpp"/>
     <ClCompile Include="src\NamespaceSupportTest.cpp"/>

XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{acc1ac97-1bd3-4dd9-8baf-41ca0a6a6165}</UniqueIdentifier>
+      <UniqueIdentifier>{6daa88c3-1162-4626-af50-f879b83656f1}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{bb3b8f2f-dd85-4524-a3c5-d3613f39ae58}</UniqueIdentifier>
+      <UniqueIdentifier>{e4ff0fbb-86d3-4ca3-b688-8cbf8773f786}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{31e6ca38-1c64-45fd-aa9f-54d6a19a3afa}</UniqueIdentifier>
+      <UniqueIdentifier>{e419caf9-4958-4e1c-9061-dbb7557e5a32}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{110aaaa8-04df-4693-b2da-8d1cefdf242f}</UniqueIdentifier>
+      <UniqueIdentifier>{3e67b7c3-16f4-41f0-87f3-f517c95655a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{adb2ef10-6b6f-4efd-8dad-7be6da62b36a}</UniqueIdentifier>
+      <UniqueIdentifier>{5b816bbd-7e20-4bcd-a410-d6af9561137e}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{ea15600f-e49d-4e39-98ba-f813e1cc4d7c}</UniqueIdentifier>
+      <UniqueIdentifier>{a5341447-1122-4ef8-b0fe-f81c9ad38d1c}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{bc8ab2d0-b1bf-44c2-ac99-f7da132de4d6}</UniqueIdentifier>
+      <UniqueIdentifier>{e14f3ab5-6efa-4910-aeb3-02f57f77a127}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{ba02b3a3-245c-41b4-a2a3-d9f6d723bbc9}</UniqueIdentifier>
+      <UniqueIdentifier>{e384e1b0-cdf0-4bb7-a9e3-84562e04908e}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{75550be9-0331-4301-a83f-43da52cf4e42}</UniqueIdentifier>
+      <UniqueIdentifier>{97732abc-00f5-434f-a515-d38ec9170222}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{24087926-a6b4-4279-b3f9-6e13a4c6a4e4}</UniqueIdentifier>
+      <UniqueIdentifier>{ef691c53-8e68-47e3-8e54-2dc7537a85ae}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{88f93edb-b1b6-4875-a49f-ba64fe0c2d53}</UniqueIdentifier>
+      <UniqueIdentifier>{5ecfa015-280b-4704-9c60-74b617591b16}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{c3860c52-6413-48fd-ab45-832b5bee3526}</UniqueIdentifier>
+      <UniqueIdentifier>{3cb4214e-59cf-4a9f-9e7e-ee600b8abad4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{8921de7c-b700-46d5-9905-c1ac67603e95}</UniqueIdentifier>
+      <UniqueIdentifier>{f0d49de7-03f0-4470-927b-f48863359d55}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{29a95c2d-2f17-457b-9ebe-bd71a5aad861}</UniqueIdentifier>
+      <UniqueIdentifier>{8131b34b-1663-421e-8e67-71a8768b1f0c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_WEC2013_vs120.vcxproj

@@ -325,6 +325,7 @@
     <ClInclude Include="src\SAXTestSuite.h"/>
     <ClInclude Include="src\TextTest.h"/>
     <ClInclude Include="src\TreeWalkerTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLTestSuite.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
   </ItemGroup>
@@ -348,6 +349,7 @@
     <ClCompile Include="src\TextTest.cpp"/>
     <ClCompile Include="src\TreeWalkerTest.cpp"/>
     <ClCompile Include="src\WinCEDriver.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLTestSuite.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
   </ItemGroup>

XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{04d2c675-cf9d-4558-96a1-9b7c4ecb49fd}</UniqueIdentifier>
+      <UniqueIdentifier>{fdf83a8b-5354-4a24-b620-7c79440dd200}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{04eb4642-a65a-4939-9e74-1c2e8510f40b}</UniqueIdentifier>
+      <UniqueIdentifier>{cd8cdb8f-1a39-4c25-8b50-ea9da6715524}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{3dec0fab-9d61-4d6c-870c-f5e2296fd7a6}</UniqueIdentifier>
+      <UniqueIdentifier>{1105c8f8-ca76-4ddb-aa6d-4aed20d7f05c}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{9da13994-65c3-4905-bc72-46832a91642d}</UniqueIdentifier>
+      <UniqueIdentifier>{76be40dc-7da2-4e8b-b880-acf33dff328b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{2a404352-8658-421f-8eed-876945b0522d}</UniqueIdentifier>
+      <UniqueIdentifier>{eb0c13ca-8e69-456b-9a0b-bce47f44738a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{57453ad3-c415-4d30-b9e1-2bc89d9f3ede}</UniqueIdentifier>
+      <UniqueIdentifier>{f7bb3ca5-8d92-4a89-bb04-9ffe13b90d15}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{e4deb48b-0c71-4a43-ba0b-f3912cad5c6a}</UniqueIdentifier>
+      <UniqueIdentifier>{bb94537a-34aa-4a36-a378-8ef23dad455c}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{f03eb07e-6ced-434b-9b64-f52eada04f38}</UniqueIdentifier>
+      <UniqueIdentifier>{e7b6a53f-9743-47f6-9af4-884ee6897ecf}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{ac786ae0-2cc5-4116-a237-92c982d37e59}</UniqueIdentifier>
+      <UniqueIdentifier>{a06572b0-7eeb-43f1-8c86-42f64d1ed4ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{9fa139ac-c199-4ed1-b047-09e7c9a359e1}</UniqueIdentifier>
+      <UniqueIdentifier>{cab5c969-5c40-49f1-9a0e-3718d3c0f4a3}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{91a2f443-1654-45d4-b960-01011d119d3f}</UniqueIdentifier>
+      <UniqueIdentifier>{2eb5842a-68db-4659-af76-c3b76b2b3551}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{c02a5bf0-551e-419e-af66-9827fba8aacd}</UniqueIdentifier>
+      <UniqueIdentifier>{edb53bde-2f68-4169-99ee-0c049a5b5411}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{6db315f2-1b79-4485-87e8-749c76b9ab98}</UniqueIdentifier>
+      <UniqueIdentifier>{83c26548-d661-488c-b780-f61c30609eb5}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{c9ebd435-259c-42b1-a815-4b3ced87357f}</UniqueIdentifier>
+      <UniqueIdentifier>{272f4904-2092-4c62-b579-ab8c875cc314}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_vs100.vcxproj

@@ -314,6 +314,7 @@
   <ItemGroup>
     <ClInclude Include="src\NamePoolTest.h"/>
     <ClInclude Include="src\NameTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
     <ClInclude Include="src\AttributesImplTest.h"/>
     <ClInclude Include="src\NamespaceSupportTest.h"/>
@@ -336,6 +337,7 @@
   <ItemGroup>
     <ClCompile Include="src\NamePoolTest.cpp"/>
     <ClCompile Include="src\NameTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
     <ClCompile Include="src\AttributesImplTest.cpp"/>
     <ClCompile Include="src\NamespaceSupportTest.cpp"/>

XML/testsuite/TestSuite_vs100.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{bc9aba96-c49c-4195-bfa9-5f20d70241a7}</UniqueIdentifier>
+      <UniqueIdentifier>{024b9499-acb2-4402-962f-6230eef56a06}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{1aa1a2ca-04ae-4891-a268-93fc96c5a842}</UniqueIdentifier>
+      <UniqueIdentifier>{b8895bbf-c702-43fd-b164-c6bef98aaf54}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{5f78a5d2-8bb6-40e7-985c-d32e9c91b1cb}</UniqueIdentifier>
+      <UniqueIdentifier>{31aad38e-e209-417d-9100-84f4abffb7a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{b10a80b0-6c2f-4099-8cc8-d759c7c64b48}</UniqueIdentifier>
+      <UniqueIdentifier>{ae05f20e-5e05-4d6e-a6d7-ef151f0fcf96}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{a33cf96a-6710-4338-a946-e9b169cd6e3a}</UniqueIdentifier>
+      <UniqueIdentifier>{6e82badf-82c7-4a0e-bda3-d843aaa117ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{54f773cb-7eb4-4b8a-b014-e82cf7d3509a}</UniqueIdentifier>
+      <UniqueIdentifier>{20f7686b-e04c-44ba-8741-ba654a06810c}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{436edf3e-593c-4299-9b50-500b04145e02}</UniqueIdentifier>
+      <UniqueIdentifier>{f349dfe9-219d-41a7-ad36-e6e6bd8925e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{4570aa97-bb98-4ec5-a8d6-c312bf6cb461}</UniqueIdentifier>
+      <UniqueIdentifier>{254991f4-6314-4a0a-b4a5-17494142fa72}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{ffb6caac-88f2-40d6-9d41-3398f23dce5b}</UniqueIdentifier>
+      <UniqueIdentifier>{b333aad3-915d-4da1-b88a-0ba967a97fda}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{775569c2-32e9-474b-b004-4081648b23a4}</UniqueIdentifier>
+      <UniqueIdentifier>{21198e85-f93e-41ba-87a8-1cc306088988}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{00ca06f5-cc73-4919-b873-79f0b395cbe9}</UniqueIdentifier>
+      <UniqueIdentifier>{22fd2a4a-6416-47b9-9d26-a09c8e7ce077}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{7e377499-e76e-47bb-99b1-29d892c7f06c}</UniqueIdentifier>
+      <UniqueIdentifier>{e1fc24a3-a2ff-413a-8ca5-526d7c6c2110}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{7d02d388-c64f-4f60-96e5-ea55c4ad7660}</UniqueIdentifier>
+      <UniqueIdentifier>{df265aa4-68fd-42b2-a4e2-2d15f533732e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{e93fab3f-b349-4ea4-b035-5b8b0f26ba1d}</UniqueIdentifier>
+      <UniqueIdentifier>{773b6a78-cb0f-4d8e-b72b-a1a655894338}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_vs110.vcxproj

@@ -314,6 +314,7 @@
   <ItemGroup>
     <ClInclude Include="src\NamePoolTest.h"/>
     <ClInclude Include="src\NameTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
     <ClInclude Include="src\AttributesImplTest.h"/>
     <ClInclude Include="src\NamespaceSupportTest.h"/>
@@ -336,6 +337,7 @@
   <ItemGroup>
     <ClCompile Include="src\NamePoolTest.cpp"/>
     <ClCompile Include="src\NameTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
     <ClCompile Include="src\AttributesImplTest.cpp"/>
     <ClCompile Include="src\NamespaceSupportTest.cpp"/>

XML/testsuite/TestSuite_vs110.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{5e4eedb7-22c4-477e-ab5f-055135d3fdc9}</UniqueIdentifier>
+      <UniqueIdentifier>{86991961-6e1d-410d-be9b-763e390db061}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{818ba16b-4e3a-45d7-a489-02ee149a2b90}</UniqueIdentifier>
+      <UniqueIdentifier>{db2ccc9b-cfe0-48df-8472-b8320dbb5a27}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{d95ccc9e-1f48-46b5-b0ed-a1d008a6950a}</UniqueIdentifier>
+      <UniqueIdentifier>{78ce4c5f-90fa-4d71-b15b-067dcc959ec4}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{feee0dff-ad9a-42f4-b24c-9a5f8d8801cf}</UniqueIdentifier>
+      <UniqueIdentifier>{a046dae2-f622-46f2-bda5-b3f0728ad562}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{6e10212f-0965-4a63-97f5-7eb6b5b18bef}</UniqueIdentifier>
+      <UniqueIdentifier>{ee5cf3c2-71e7-494e-b01e-ac6ec2985551}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{2183ede8-1c3a-4776-928e-4a4524645967}</UniqueIdentifier>
+      <UniqueIdentifier>{473a4c8e-3126-4cf8-bb8d-3550d45f6bba}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{02c7712f-ebf2-46a7-a4db-20145db9c70f}</UniqueIdentifier>
+      <UniqueIdentifier>{52bffb2c-a608-4a6f-ab09-19534e8c1cc8}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{c04c00ad-4f6d-49e4-b513-75284388f05b}</UniqueIdentifier>
+      <UniqueIdentifier>{87974206-54b5-4a4e-bd69-21a248fe74b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{72aab8c7-84c8-4e75-93cf-95345b30bc39}</UniqueIdentifier>
+      <UniqueIdentifier>{bfdab626-e7a5-4da5-8645-d951c999ac11}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{05db9aec-6ef7-45a5-8592-84aa3233a477}</UniqueIdentifier>
+      <UniqueIdentifier>{7cef20f2-2503-4610-ad5f-ccf0830c28cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{1f1fb568-4d3b-4d83-b9b4-d91f65263ff5}</UniqueIdentifier>
+      <UniqueIdentifier>{c34240f9-4f24-4151-9a2c-76e6b88cf812}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{f17e8773-cb61-462d-8c14-d697ec747ede}</UniqueIdentifier>
+      <UniqueIdentifier>{eb4fa16e-c5d7-4537-9308-575f96530c04}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{81017ffb-8b78-4f86-afbe-150134274e30}</UniqueIdentifier>
+      <UniqueIdentifier>{542ce1c5-10fc-461d-8abe-ce750d1588a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{4390c02c-c425-4320-b711-da02419ac901}</UniqueIdentifier>
+      <UniqueIdentifier>{a5b3401a-dd47-4394-8239-1e327145e61f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_vs120.vcxproj

@@ -322,6 +322,7 @@
     <ClInclude Include="src\SAXTestSuite.h"/>
     <ClInclude Include="src\TextTest.h"/>
     <ClInclude Include="src\TreeWalkerTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLTestSuite.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
   </ItemGroup>
@@ -345,6 +346,7 @@
     <ClCompile Include="src\SAXTestSuite.cpp"/>
     <ClCompile Include="src\TextTest.cpp"/>
     <ClCompile Include="src\TreeWalkerTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLTestSuite.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
   </ItemGroup>

XML/testsuite/TestSuite_vs120.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{461629a7-fd2c-4486-88b2-fba4f4ec3ec4}</UniqueIdentifier>
+      <UniqueIdentifier>{419288fd-79d8-4c3d-b16c-40f9fbedba4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{7560f633-6412-4600-9093-e8d0c2eb3474}</UniqueIdentifier>
+      <UniqueIdentifier>{4e11dcdb-dbfb-42eb-b81d-0f0e6c387d4d}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{7b25d885-0e12-475e-aacd-1535e9ffb1d7}</UniqueIdentifier>
+      <UniqueIdentifier>{f962efce-5a57-4652-b746-3ffcde8fd156}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{4f3cd730-b92c-46c8-9bb0-a84681c72051}</UniqueIdentifier>
+      <UniqueIdentifier>{355839a3-fd6d-4a77-9fb8-326bc34c83fd}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{d8b9f0b0-0edb-4602-885b-7fda97ef6ef1}</UniqueIdentifier>
+      <UniqueIdentifier>{96cdca86-35f4-4e78-8043-16367934a5f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{210418b1-d85b-41dd-aba0-b81750062d97}</UniqueIdentifier>
+      <UniqueIdentifier>{2bb4ce5d-6b9d-4e10-aa10-1f926d606320}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{316e052e-9927-41b6-b461-2ff5f3789440}</UniqueIdentifier>
+      <UniqueIdentifier>{851d628f-3f04-442c-924a-a1c1d60f5f97}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{181f4684-6210-47f5-b08d-fd4bac0c6919}</UniqueIdentifier>
+      <UniqueIdentifier>{dae8435a-27ce-4d3a-9c5e-4eab2dc997f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{4c25f60d-b843-451c-a707-e75c829fd889}</UniqueIdentifier>
+      <UniqueIdentifier>{7eaa766b-747d-4724-a1a4-00a522cd4bbd}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{a08735d3-ce6a-4a2e-b88c-b3b716bfe8cf}</UniqueIdentifier>
+      <UniqueIdentifier>{314ee075-e0b6-4c02-bd80-8ab59a44f2a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{99a54c29-d3a7-46de-84b0-490cd96ae8b2}</UniqueIdentifier>
+      <UniqueIdentifier>{8bbbcffa-23f5-4204-8a92-dbd79de7521c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{0597e42c-d798-44a3-b211-abccb5ba31e5}</UniqueIdentifier>
+      <UniqueIdentifier>{f9304472-f7fe-436c-9778-8c91f1fdd48e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{858bd4a7-decb-45ae-9dd1-f28db0c2c17a}</UniqueIdentifier>
+      <UniqueIdentifier>{6f16dc0a-0f22-4880-b3fc-d70b4afb39ed}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{1f57629b-97c7-44c1-878b-e5e73450bde1}</UniqueIdentifier>
+      <UniqueIdentifier>{b54bc9de-c03b-45da-8ae9-c45499dab3e8}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_vs140.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <_ProjectFileVersion>14.0.25420.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -322,6 +322,7 @@
     <ClInclude Include="src\SAXTestSuite.h"/>
     <ClInclude Include="src\TextTest.h"/>
     <ClInclude Include="src\TreeWalkerTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLTestSuite.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
   </ItemGroup>
@@ -345,6 +346,7 @@
     <ClCompile Include="src\SAXTestSuite.cpp"/>
     <ClCompile Include="src\TextTest.cpp"/>
     <ClCompile Include="src\TreeWalkerTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLTestSuite.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
   </ItemGroup>

XML/testsuite/TestSuite_vs140.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{23564332-909c-40ee-9895-78fba077dce2}</UniqueIdentifier>
+      <UniqueIdentifier>{e5449598-f4e5-4e3b-95b2-6c66daaa80ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{a0ed53c8-b16a-452e-8b01-b1358f230cb5}</UniqueIdentifier>
+      <UniqueIdentifier>{b715b6c8-a235-4c86-98ff-9a8b37138690}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{8cfb87f6-dada-4a34-b140-d55e217158f6}</UniqueIdentifier>
+      <UniqueIdentifier>{6c89aca9-c310-4835-b9a5-3dc70107037a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{8d148d2c-874c-41c7-a653-dd9f8823fcb6}</UniqueIdentifier>
+      <UniqueIdentifier>{dc8a7ec0-9573-4911-9362-32f3921b5a91}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{8be5bd6b-0660-4520-9658-57add94f791e}</UniqueIdentifier>
+      <UniqueIdentifier>{f06272a2-4c6b-4436-92f4-70c1c3c695fc}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{c955535b-1e9f-4ef1-ac71-af0c36455e43}</UniqueIdentifier>
+      <UniqueIdentifier>{331bdbb8-5f4c-4831-aa05-4ef7a8f46314}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{1d4808f6-794f-4e42-b000-802ec872430d}</UniqueIdentifier>
+      <UniqueIdentifier>{b3216452-5d15-4179-9e0b-4800e9675c8d}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{23770128-0d0d-43c9-9ea6-60ff807375a7}</UniqueIdentifier>
+      <UniqueIdentifier>{109a0807-7991-4c62-9c4f-ce0aa892d671}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{10c3623a-f47e-4b73-aa23-d7617f193e3d}</UniqueIdentifier>
+      <UniqueIdentifier>{8ae66d88-a198-4e74-8e19-82c2b83af540}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{d79c9721-6173-420d-9c4a-51fdccdf4ca7}</UniqueIdentifier>
+      <UniqueIdentifier>{a7648b9f-fe74-4c8c-af32-12441274f827}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{3875b784-fa39-479a-8df0-4f25b88cdba2}</UniqueIdentifier>
+      <UniqueIdentifier>{d28a6b68-2798-4677-92e2-6b5f2c590f84}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{54f65d8d-4758-43c1-86a7-a4bc0b97d804}</UniqueIdentifier>
+      <UniqueIdentifier>{dff14c2e-6f67-4148-b0d3-7c1c325b8a4c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{e126b829-594b-47b7-bb1c-bdec194f6cbe}</UniqueIdentifier>
+      <UniqueIdentifier>{5f08c134-a69e-42c3-8602-104c67850f4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{db38009c-44ca-4d83-a95f-0313fb5eb14b}</UniqueIdentifier>
+      <UniqueIdentifier>{2e89fcec-e0f2-44ad-84ec-5db8e97753be}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_vs150.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <_ProjectFileVersion>15.0.26228.4</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -322,6 +322,7 @@
     <ClInclude Include="src\SAXTestSuite.h"/>
     <ClInclude Include="src\TextTest.h"/>
     <ClInclude Include="src\TreeWalkerTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLTestSuite.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
   </ItemGroup>
@@ -345,6 +346,7 @@
     <ClCompile Include="src\SAXTestSuite.cpp"/>
     <ClCompile Include="src\TextTest.cpp"/>
     <ClCompile Include="src\TreeWalkerTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLTestSuite.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
   </ItemGroup>

XML/testsuite/TestSuite_vs150.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{23564332-909c-40ee-9895-78fba077dce2}</UniqueIdentifier>
+      <UniqueIdentifier>{d767c85e-ce18-4b6c-999e-f30a1fa62d08}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{a0ed53c8-b16a-452e-8b01-b1358f230cb5}</UniqueIdentifier>
+      <UniqueIdentifier>{2c463e91-db92-4671-a228-31367d8cefc4}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{8cfb87f6-dada-4a34-b140-d55e217158f6}</UniqueIdentifier>
+      <UniqueIdentifier>{8bc71498-cc5a-4edd-99e3-e490c7d9c811}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{8d148d2c-874c-41c7-a653-dd9f8823fcb6}</UniqueIdentifier>
+      <UniqueIdentifier>{0e6ffa7c-295d-453c-907f-98179bb86e07}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{8be5bd6b-0660-4520-9658-57add94f791e}</UniqueIdentifier>
+      <UniqueIdentifier>{09d01c8a-5401-4ce7-aad7-db196ba82979}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{c955535b-1e9f-4ef1-ac71-af0c36455e43}</UniqueIdentifier>
+      <UniqueIdentifier>{804b67f4-4e2b-428d-9037-3e3c7520b72b}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{1d4808f6-794f-4e42-b000-802ec872430d}</UniqueIdentifier>
+      <UniqueIdentifier>{1bbf5216-62ba-4aa4-9aec-c8fff8ffb81a}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{23770128-0d0d-43c9-9ea6-60ff807375a7}</UniqueIdentifier>
+      <UniqueIdentifier>{e102a9bf-7fc1-46b2-ba85-8c08b2cab087}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{10c3623a-f47e-4b73-aa23-d7617f193e3d}</UniqueIdentifier>
+      <UniqueIdentifier>{01f746a1-6c49-407a-b3d2-7ef1cfa8ff1e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{d79c9721-6173-420d-9c4a-51fdccdf4ca7}</UniqueIdentifier>
+      <UniqueIdentifier>{9df31101-9168-40a6-959c-92080942a51b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{3875b784-fa39-479a-8df0-4f25b88cdba2}</UniqueIdentifier>
+      <UniqueIdentifier>{54511624-3a7d-4192-97ae-b750cbe315c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{54f65d8d-4758-43c1-86a7-a4bc0b97d804}</UniqueIdentifier>
+      <UniqueIdentifier>{fb04025e-82f6-4f29-95e8-358435cb5727}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{e126b829-594b-47b7-bb1c-bdec194f6cbe}</UniqueIdentifier>
+      <UniqueIdentifier>{d3048bdc-578e-4927-a5c1-82986578ec36}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{db38009c-44ca-4d83-a95f-0313fb5eb14b}</UniqueIdentifier>
+      <UniqueIdentifier>{2f9d5c1d-371d-4ce2-8636-faae88e05ef0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_vs90.vcproj

@@ -451,6 +451,8 @@
 					RelativePath=".\src\NamePoolTest.h"/>
 				<File
 					RelativePath=".\src\NameTest.h"/>
+				<File
+					RelativePath=".\src\XMLStreamParserTest.h"/>
 				<File
 					RelativePath=".\src\XMLWriterTest.h"/>
 			</Filter>
@@ -460,6 +462,8 @@
 					RelativePath=".\src\NamePoolTest.cpp"/>
 				<File
 					RelativePath=".\src\NameTest.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParserTest.cpp"/>
 				<File
 					RelativePath=".\src\XMLWriterTest.cpp"/>
 			</Filter>

XML/testsuite/TestSuite_x64_vs100.vcxproj

@@ -314,6 +314,7 @@
   <ItemGroup>
     <ClInclude Include="src\NamePoolTest.h"/>
     <ClInclude Include="src\NameTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
     <ClInclude Include="src\AttributesImplTest.h"/>
     <ClInclude Include="src\NamespaceSupportTest.h"/>
@@ -336,6 +337,7 @@
   <ItemGroup>
     <ClCompile Include="src\NamePoolTest.cpp"/>
     <ClCompile Include="src\NameTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
     <ClCompile Include="src\AttributesImplTest.cpp"/>
     <ClCompile Include="src\NamespaceSupportTest.cpp"/>

XML/testsuite/TestSuite_x64_vs100.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{1720e4e3-d855-4f86-b0b9-6430a0050baf}</UniqueIdentifier>
+      <UniqueIdentifier>{17deff11-5629-4497-ad9a-4360a6dcf814}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{06bf93ef-eb84-4540-931c-fc2524a083f6}</UniqueIdentifier>
+      <UniqueIdentifier>{fc91b5b3-851e-4a96-a2e9-690795787a6b}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{09c5408d-d2c5-4b48-b06d-d12ec7509481}</UniqueIdentifier>
+      <UniqueIdentifier>{88b21d9e-31fe-481e-a677-b7f4e6e21c52}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{e0f8a06e-860a-4818-94b6-cd262c4076df}</UniqueIdentifier>
+      <UniqueIdentifier>{a3e09e0a-731e-4139-83f0-4d7f4401ad4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{8104922c-1339-4500-976d-ccaf9ffc687c}</UniqueIdentifier>
+      <UniqueIdentifier>{cb1c47d3-1eee-471a-8361-f716753c6de9}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{6b161e5a-2c48-4dab-9128-44f4cde0ff5e}</UniqueIdentifier>
+      <UniqueIdentifier>{fe558023-beab-4c81-b1bf-2089ba75953a}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{a15166ce-f8f2-4f25-9cda-5508ed404611}</UniqueIdentifier>
+      <UniqueIdentifier>{1b0edb95-372a-4a76-a274-33061c2b0b04}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{59cbd71a-e5ef-4f81-88af-f5a21f53f7c1}</UniqueIdentifier>
+      <UniqueIdentifier>{a124c8ed-73cd-4a00-8a8a-227831d5b10c}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{bb1776b0-a631-46dd-a5f0-2f44cb7d6d8d}</UniqueIdentifier>
+      <UniqueIdentifier>{8c07caad-4afc-486c-b729-270d6d5f8c9a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{0a8161d4-3246-4fd0-882c-60b8389deca3}</UniqueIdentifier>
+      <UniqueIdentifier>{6f7e66b3-cd41-4a3a-8d9d-66802b60c53b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{a0da31a4-a267-4119-9448-66c73ef096c8}</UniqueIdentifier>
+      <UniqueIdentifier>{a0c2f0a7-2092-4403-a221-acdd76d21df1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{7205a71f-777c-4dd2-88bd-1f517e440b44}</UniqueIdentifier>
+      <UniqueIdentifier>{9a4b88da-ddaf-4f49-80f2-802df2d9bb75}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{f40e55fa-a0ba-4c68-bdff-f3961a2be6a9}</UniqueIdentifier>
+      <UniqueIdentifier>{32e70fd0-558e-45db-aba1-8a243e415138}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{f611499e-7caf-4b3a-a695-c8d1b5bf88cb}</UniqueIdentifier>
+      <UniqueIdentifier>{84c1bf69-28e7-4ca9-b873-0daa8c062617}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_x64_vs110.vcxproj

@@ -314,6 +314,7 @@
   <ItemGroup>
     <ClInclude Include="src\NamePoolTest.h"/>
     <ClInclude Include="src\NameTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
     <ClInclude Include="src\AttributesImplTest.h"/>
     <ClInclude Include="src\NamespaceSupportTest.h"/>
@@ -336,6 +337,7 @@
   <ItemGroup>
     <ClCompile Include="src\NamePoolTest.cpp"/>
     <ClCompile Include="src\NameTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
     <ClCompile Include="src\AttributesImplTest.cpp"/>
     <ClCompile Include="src\NamespaceSupportTest.cpp"/>

XML/testsuite/TestSuite_x64_vs110.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{5d86026c-e3b2-4028-b038-ebcdbee8b274}</UniqueIdentifier>
+      <UniqueIdentifier>{9db1f24d-87aa-451b-8025-3e8c43c928f6}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{610aa5fc-58f6-4b48-831d-eee2ae68b0f3}</UniqueIdentifier>
+      <UniqueIdentifier>{be077244-8ba5-4256-bebf-d35324ccbf78}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{9b6f63a9-d9fc-46ff-9f74-d0913a7d1a26}</UniqueIdentifier>
+      <UniqueIdentifier>{723192ef-71b8-44e6-b613-b6347e6ebcd6}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{deb7738e-332f-43bc-aac3-9a8b1923e138}</UniqueIdentifier>
+      <UniqueIdentifier>{f4fa883e-9568-43d1-8048-b190aa81cee2}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{922c2fa7-f6fa-494c-a839-247a4e59223e}</UniqueIdentifier>
+      <UniqueIdentifier>{c1a15aa9-56d3-494c-9f7e-00babef4ac44}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{e0a907fb-0eac-490f-a9ca-530dee3365af}</UniqueIdentifier>
+      <UniqueIdentifier>{f84208c1-2b4f-43b3-90a8-6e239433bc5d}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{07ca85d7-830a-46be-9455-78288b74dd19}</UniqueIdentifier>
+      <UniqueIdentifier>{550dfc8b-c980-46da-92bf-a314889396f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{51d4a56c-5db7-4372-847e-e7d76f0e174c}</UniqueIdentifier>
+      <UniqueIdentifier>{103bbbc0-746e-495d-b673-2010e2aaac00}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{9cc551f5-9b31-47e3-8a50-4cb0a1bbe361}</UniqueIdentifier>
+      <UniqueIdentifier>{1b0f687c-20a6-415f-a3fe-d6b56f95fb2d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{9aa34657-479b-4889-945d-56827b1bd601}</UniqueIdentifier>
+      <UniqueIdentifier>{88a03f26-964c-4181-b575-8d5edda4b368}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{5f051ba4-d3a3-4e6e-98bd-c376c34a4f7e}</UniqueIdentifier>
+      <UniqueIdentifier>{0c3ec4a6-624d-49b7-b9fb-997bb01b83da}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{3df2909a-7644-485b-8817-ba20392c085d}</UniqueIdentifier>
+      <UniqueIdentifier>{58e6383a-122c-4528-a621-bc8e1c5ce132}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{4c1b3a49-d0eb-458f-b03d-a52f258e48ca}</UniqueIdentifier>
+      <UniqueIdentifier>{0962c93f-822f-4fc8-9547-d4cfa52d279b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{d050403e-b877-4d53-9f8a-d0a39d6fd9d7}</UniqueIdentifier>
+      <UniqueIdentifier>{a6c16c67-4e66-428a-851f-64be161ad279}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_x64_vs120.vcxproj

@@ -322,6 +322,7 @@
     <ClInclude Include="src\SAXTestSuite.h"/>
     <ClInclude Include="src\TextTest.h"/>
     <ClInclude Include="src\TreeWalkerTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLTestSuite.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
   </ItemGroup>
@@ -345,6 +346,7 @@
     <ClCompile Include="src\SAXTestSuite.cpp"/>
     <ClCompile Include="src\TextTest.cpp"/>
     <ClCompile Include="src\TreeWalkerTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLTestSuite.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
   </ItemGroup>

XML/testsuite/TestSuite_x64_vs120.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{bb9d2019-f348-4295-87dc-86875bc7ec06}</UniqueIdentifier>
+      <UniqueIdentifier>{8ce50758-9dd7-4068-830b-978cce7f32f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{b0c6e7e5-d074-4959-bd0c-af1ad61e0e27}</UniqueIdentifier>
+      <UniqueIdentifier>{f8e4bd12-0a5f-461b-93c2-92182d39bd42}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{af032506-79c6-4a71-9cab-7e4b9fab91a3}</UniqueIdentifier>
+      <UniqueIdentifier>{614acea3-afcd-494c-9ebf-897eb0c3bae9}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{a58876af-0c26-472f-9b22-dea617590f39}</UniqueIdentifier>
+      <UniqueIdentifier>{3a639085-a73c-4571-8aeb-58004b1f64cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{5009cc2a-0d20-428a-beb0-e02d749bcb44}</UniqueIdentifier>
+      <UniqueIdentifier>{4eec9aaa-1b56-425f-ab8b-db7ffa3a508b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{744ca67e-6d28-40c9-8ea0-619f98f40de1}</UniqueIdentifier>
+      <UniqueIdentifier>{0ccebbfb-0947-4943-a206-0ba3bd9dda4c}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{83584577-c541-4ef6-9de2-13be7091dc80}</UniqueIdentifier>
+      <UniqueIdentifier>{03bdb656-5f21-4a6f-9234-7de69938514d}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{48d02d34-747b-4ad5-9ea1-1ce6f64c8bda}</UniqueIdentifier>
+      <UniqueIdentifier>{9cdbc89e-39f1-4006-8060-38ebfdee1667}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{fb9223b6-cec9-4631-9925-f6967681c23a}</UniqueIdentifier>
+      <UniqueIdentifier>{1539f3d4-4e42-45d1-9cb4-76e2ec3e8a78}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{9cfa074e-3491-4174-81c1-2851f4116d89}</UniqueIdentifier>
+      <UniqueIdentifier>{dc4d3bae-4506-401c-927e-b276cacf7afa}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{48790fea-9316-43b0-a3e5-e71b4e5f504e}</UniqueIdentifier>
+      <UniqueIdentifier>{873e6c95-8b82-423f-8ada-a78517f8392a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{422246f0-c97e-4bb2-9443-f4c527e3ae29}</UniqueIdentifier>
+      <UniqueIdentifier>{ce17f22e-cdce-4437-88ff-0051d47a26f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{bfbc344e-b88f-4d19-8356-b62654aabca9}</UniqueIdentifier>
+      <UniqueIdentifier>{b5d3f49f-a26c-40bd-bc32-b7398ed64150}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{a7a11833-acfc-4cb2-ae80-7827ffeb56d5}</UniqueIdentifier>
+      <UniqueIdentifier>{e5943544-048a-4772-895c-93e2390682d6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_x64_vs140.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <_ProjectFileVersion>14.0.25420.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -322,6 +322,7 @@
     <ClInclude Include="src\SAXTestSuite.h"/>
     <ClInclude Include="src\TextTest.h"/>
     <ClInclude Include="src\TreeWalkerTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLTestSuite.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
   </ItemGroup>
@@ -345,6 +346,7 @@
     <ClCompile Include="src\SAXTestSuite.cpp"/>
     <ClCompile Include="src\TextTest.cpp"/>
     <ClCompile Include="src\TreeWalkerTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLTestSuite.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
   </ItemGroup>

XML/testsuite/TestSuite_x64_vs140.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{60dbb005-8f69-4d51-ae54-d58f4f3594e6}</UniqueIdentifier>
+      <UniqueIdentifier>{e94299e2-84fd-4191-923e-bbb0f4487832}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{988de582-2d1d-4913-a158-a8c922e872ad}</UniqueIdentifier>
+      <UniqueIdentifier>{b9b89cab-bc8b-4d3c-97e9-c9ecfda67b52}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{efc5ad7d-52e8-4265-bca1-ff223b5de3ad}</UniqueIdentifier>
+      <UniqueIdentifier>{72674a45-e910-42b7-8aaf-46a53e70ec81}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{dd88cb60-d80a-4b5f-98d9-b284dca05443}</UniqueIdentifier>
+      <UniqueIdentifier>{30ede1a5-58ae-4f71-9b26-976515e4135a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{d0dbad2c-e5f5-4438-b3d7-ea5c09380c45}</UniqueIdentifier>
+      <UniqueIdentifier>{c1b1855d-be24-4287-aa59-5cc692bb5ebf}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{3f608d51-474d-4781-ac2e-73f5828ec3c6}</UniqueIdentifier>
+      <UniqueIdentifier>{b600164b-0fcc-46fa-bfee-3094acdac58f}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{b9ef1ab1-3843-4ae5-80ce-472beea94da0}</UniqueIdentifier>
+      <UniqueIdentifier>{5c6dd64c-8637-476e-8aa4-214dfd801850}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{7a88f4d9-b3de-40e4-aae5-4900bed90d1e}</UniqueIdentifier>
+      <UniqueIdentifier>{af904f51-e73f-4619-ab70-250887cc5eb6}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{4ccf3c57-5151-4654-bf02-024056444c23}</UniqueIdentifier>
+      <UniqueIdentifier>{7b6a5608-ee02-440b-a428-b7bfb57f9351}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{c81746a0-c2c5-4ba6-a80e-bdeefade4575}</UniqueIdentifier>
+      <UniqueIdentifier>{79ac3d39-7a72-433f-b0e9-4bc4311eddb9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{0587cc94-3e7e-449c-8f88-92bc1eba6ff5}</UniqueIdentifier>
+      <UniqueIdentifier>{36e0266b-8cb8-490c-8521-b98f7fa51427}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{39a97bd5-8292-4cc3-ae31-2508738679d9}</UniqueIdentifier>
+      <UniqueIdentifier>{973334df-e212-4ccb-b3d4-fd7e80c09546}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{0f41dff5-954a-4d6a-993c-6d20e443eff5}</UniqueIdentifier>
+      <UniqueIdentifier>{e48fa639-bca2-4fb2-8a04-0c81ef064a7c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{435d5fac-f2c8-43d1-a5f7-9528b1312b5b}</UniqueIdentifier>
+      <UniqueIdentifier>{b576f820-8449-4182-b3ae-c00850b27d4f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_x64_vs150.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <_ProjectFileVersion>15.0.26228.4</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -322,6 +322,7 @@
     <ClInclude Include="src\SAXTestSuite.h"/>
     <ClInclude Include="src\TextTest.h"/>
     <ClInclude Include="src\TreeWalkerTest.h"/>
+    <ClInclude Include="src\XMLStreamParserTest.h"/>
     <ClInclude Include="src\XMLTestSuite.h"/>
     <ClInclude Include="src\XMLWriterTest.h"/>
   </ItemGroup>
@@ -345,6 +346,7 @@
     <ClCompile Include="src\SAXTestSuite.cpp"/>
     <ClCompile Include="src\TextTest.cpp"/>
     <ClCompile Include="src\TreeWalkerTest.cpp"/>
+    <ClCompile Include="src\XMLStreamParserTest.cpp"/>
     <ClCompile Include="src\XMLTestSuite.cpp"/>
     <ClCompile Include="src\XMLWriterTest.cpp"/>
   </ItemGroup>

XML/testsuite/TestSuite_x64_vs150.vcxproj.filters

@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="XML">
-      <UniqueIdentifier>{60dbb005-8f69-4d51-ae54-d58f4f3594e6}</UniqueIdentifier>
+      <UniqueIdentifier>{fa8eaac9-c6cf-45b2-90be-8f8765718657}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Header Files">
-      <UniqueIdentifier>{988de582-2d1d-4913-a158-a8c922e872ad}</UniqueIdentifier>
+      <UniqueIdentifier>{7ce3b458-11f7-45c4-b62b-01282be31757}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML\Source Files">
-      <UniqueIdentifier>{efc5ad7d-52e8-4265-bca1-ff223b5de3ad}</UniqueIdentifier>
+      <UniqueIdentifier>{0e1b2455-8882-4666-b326-764fb67996ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX">
-      <UniqueIdentifier>{dd88cb60-d80a-4b5f-98d9-b284dca05443}</UniqueIdentifier>
+      <UniqueIdentifier>{4f2f38a8-1081-4407-b047-3b2930fdfd7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Header Files">
-      <UniqueIdentifier>{d0dbad2c-e5f5-4438-b3d7-ea5c09380c45}</UniqueIdentifier>
+      <UniqueIdentifier>{63a77970-5e97-4189-91a7-304654440b64}</UniqueIdentifier>
     </Filter>
     <Filter Include="SAX\Source Files">
-      <UniqueIdentifier>{3f608d51-474d-4781-ac2e-73f5828ec3c6}</UniqueIdentifier>
+      <UniqueIdentifier>{3b4be7db-11b9-4585-ad10-d06b7b5a6ee2}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM">
-      <UniqueIdentifier>{b9ef1ab1-3843-4ae5-80ce-472beea94da0}</UniqueIdentifier>
+      <UniqueIdentifier>{5cbe0fed-8554-457f-b160-fe604d5133da}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Header Files">
-      <UniqueIdentifier>{7a88f4d9-b3de-40e4-aae5-4900bed90d1e}</UniqueIdentifier>
+      <UniqueIdentifier>{f5fb85c9-675b-4b89-88cd-22af85ff21f0}</UniqueIdentifier>
     </Filter>
     <Filter Include="DOM\Source Files">
-      <UniqueIdentifier>{4ccf3c57-5151-4654-bf02-024056444c23}</UniqueIdentifier>
+      <UniqueIdentifier>{af01599f-e2f9-4765-9463-85abbb812192}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{c81746a0-c2c5-4ba6-a80e-bdeefade4575}</UniqueIdentifier>
+      <UniqueIdentifier>{4f4d9df1-3047-4e3d-a9f8-7e6ffc14cd05}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{0587cc94-3e7e-449c-8f88-92bc1eba6ff5}</UniqueIdentifier>
+      <UniqueIdentifier>{24413af0-787d-49d5-92ba-72c10391b78a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{39a97bd5-8292-4cc3-ae31-2508738679d9}</UniqueIdentifier>
+      <UniqueIdentifier>{bb1cbeee-a67b-4763-a055-64dcc4f766c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{0f41dff5-954a-4d6a-993c-6d20e443eff5}</UniqueIdentifier>
+      <UniqueIdentifier>{9b626cdb-7924-4f08-9ad8-159a7b239e19}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{435d5fac-f2c8-43d1-a5f7-9528b1312b5b}</UniqueIdentifier>
+      <UniqueIdentifier>{fc2009ad-88c8-445e-aa8d-4e3ff8352409}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,6 +51,9 @@
     <ClInclude Include="src\NameTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\XMLStreamParserTest.h">
+      <Filter>XML\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\XMLWriterTest.h">
       <Filter>XML\Header Files</Filter>
     </ClInclude>
@@ -113,6 +116,9 @@
     <ClCompile Include="src\NameTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\XMLStreamParserTest.cpp">
+      <Filter>XML\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\XMLWriterTest.cpp">
       <Filter>XML\Source Files</Filter>
     </ClCompile>

XML/testsuite/TestSuite_x64_vs90.vcproj

@@ -451,6 +451,8 @@
 					RelativePath=".\src\NamePoolTest.h"/>
 				<File
 					RelativePath=".\src\NameTest.h"/>
+				<File
+					RelativePath=".\src\XMLStreamParserTest.h"/>
 				<File
 					RelativePath=".\src\XMLWriterTest.h"/>
 			</Filter>
@@ -460,6 +462,8 @@
 					RelativePath=".\src\NamePoolTest.cpp"/>
 				<File
 					RelativePath=".\src\NameTest.cpp"/>
+				<File
+					RelativePath=".\src\XMLStreamParserTest.cpp"/>
 				<File
 					RelativePath=".\src\XMLWriterTest.cpp"/>
 			</Filter>