[ros-diffs] [martinf] 111: first draft of rbuild with Expat integration

first draft of rbuild with Expat integration
current state: builds and runs with MSVC, still problems with GCC
Modified: branches/expat-rbuild/reactos/Makefile
Modified: branches/expat-rbuild/reactos/ReactOS.rbuild
Modified:
branches/expat-rbuild/reactos/base/applications/applications.rbuild
Modified:
branches/expat-rbuild/reactos/base/applications/devmgr/devmgrapp.rbuild
Modified:
branches/expat-rbuild/reactos/base/applications/games/directory.rbuild
Modified:
branches/expat-rbuild/reactos/base/applications/games/solitaire/solitair
e.rbuild
Modified:
branches/expat-rbuild/reactos/base/applications/games/winemine/winemine.
rbuild
Modified:
branches/expat-rbuild/reactos/base/applications/getfirefox/getfirefox.rb
uild
Modified:
branches/expat-rbuild/reactos/base/applications/hostname/hostname.rbuild
Modified:
branches/expat-rbuild/reactos/base/applications/shutdown/shutdown.rbuild
Modified: branches/expat-rbuild/reactos/base/base.rbuild
Modified: branches/expat-rbuild/reactos/base/setup/setup.rbuild
Modified:
branches/expat-rbuild/reactos/base/setup/welcome/welcome.rbuild
Modified: branches/expat-rbuild/reactos/base/shell/cmd/cmd.rbuild
Modified:
branches/expat-rbuild/reactos/base/shell/cmd/tests/cmd_test.rbuild
Modified:
branches/expat-rbuild/reactos/base/shell/cmd/tests/stubs.rbuild
Modified: branches/expat-rbuild/reactos/base/shell/shell.rbuild
Modified: branches/expat-rbuild/reactos/base/system/system.rbuild
Modified: branches/expat-rbuild/reactos/baseaddress.rbuild
Modified: branches/expat-rbuild/reactos/boot/boot.rbuild
Modified: branches/expat-rbuild/reactos/include/reactos/debug.h
Modified: branches/expat-rbuild/reactos/lib/directory.rbuild
Modified: branches/expat-rbuild/reactos/lib/inflib/builddep.h
Modified: branches/expat-rbuild/reactos/lib/inflib/infcore.c
Modified: branches/expat-rbuild/reactos/lib/inflib/infget.c
Modified: branches/expat-rbuild/reactos/lib/inflib/infhostgen.c
Modified: branches/expat-rbuild/reactos/lib/inflib/infhostget.c
Modified: branches/expat-rbuild/reactos/lib/inflib/infhostglue.c
Modified: branches/expat-rbuild/reactos/lib/inflib/infhostput.c
Modified: branches/expat-rbuild/reactos/lib/inflib/infput.c
Modified: branches/expat-rbuild/reactos/media/media.rbuild
Modified: branches/expat-rbuild/reactos/subsystems/subsystems.rbuild
Added: branches/expat-rbuild/reactos/tools/expat/
Added: branches/expat-rbuild/reactos/tools/expat/ascii.h
Added: branches/expat-rbuild/reactos/tools/expat/asciitab.h
Added: branches/expat-rbuild/reactos/tools/expat/expat.h
Added: branches/expat-rbuild/reactos/tools/expat/expat_config.h
Added: branches/expat-rbuild/reactos/tools/expat/expat_external.h
Added: branches/expat-rbuild/reactos/tools/expat/iasciitab.h
Added: branches/expat-rbuild/reactos/tools/expat/internal.h
Added: branches/expat-rbuild/reactos/tools/expat/latin1tab.h
Added: branches/expat-rbuild/reactos/tools/expat/nametab.h
Added: branches/expat-rbuild/reactos/tools/expat/utf8tab.h
Added: branches/expat-rbuild/reactos/tools/expat/xmlparse.c
Added: branches/expat-rbuild/reactos/tools/expat/xmlrole.c
Added: branches/expat-rbuild/reactos/tools/expat/xmlrole.h
Added: branches/expat-rbuild/reactos/tools/expat/xmltok.c
Added: branches/expat-rbuild/reactos/tools/expat/xmltok.h
Added: branches/expat-rbuild/reactos/tools/expat/xmltok_impl.c
Added: branches/expat-rbuild/reactos/tools/expat/xmltok_impl.h
Added: branches/expat-rbuild/reactos/tools/expat/xmltok_ns.c
Modified:
branches/expat-rbuild/reactos/tools/rbuild/automaticdependency.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/backend.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/backend.h
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/devcpp/devcpp.cpp
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/devcpp/devcpp.h
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/mingw.h
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.c
pp
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/proxymakefile.c
pp
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/genguid.cpp
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/msvc.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/msvc.h
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
Modified:
branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/bootstrap.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/cdfile.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/compilationunit.cpp
Modified:
branches/expat-rbuild/reactos/tools/rbuild/compilationunitsupportcode.cp
p
Modified: branches/expat-rbuild/reactos/tools/rbuild/compilerflag.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/define.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/directory.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/exception.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/exception.h
Modified: branches/expat-rbuild/reactos/tools/rbuild/filesupportcode.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/global.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/include.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/installfile.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/linkerflag.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/linkerscript.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/module.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/pch.h
Modified: branches/expat-rbuild/reactos/tools/rbuild/project.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.dsp
Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.h
Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.mak
Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.vcproj
Modified:
branches/expat-rbuild/reactos/tools/rbuild/stubbedcomponent.cpp
Modified:
branches/expat-rbuild/reactos/tools/rbuild/syssetupgenerator.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/test.h
Modified: branches/expat-rbuild/reactos/tools/rbuild/testsupportcode.cpp
Modified: branches/expat-rbuild/reactos/tools/rbuild/wineresource.cpp
Modified: branches/expat-rbuild/reactos/tools/ssprintf.cpp
Modified: branches/expat-rbuild/reactos/tools/tools.mak
Modified: branches/expat-rbuild/reactos/tools/xml.cpp
Modified: branches/expat-rbuild/reactos/tools/xml.h
Added: branches/expat-rbuild/reactos/tools/xmlstorage.cpp
Added: branches/expat-rbuild/reactos/tools/xmlstorage.h
  _____  

Modified: branches/expat-rbuild/reactos/Makefile
--- branches/expat-rbuild/reactos/Makefile	2006-02-12 19:55:49 UTC
(rev 110)
+++ branches/expat-rbuild/reactos/Makefile	2006-02-12 22:21:11 UTC
(rev 111)
@@ -38,7 +38,7 @@

 #        This can require several minutes to complete. If you only need
to check
 #        dependencies for a single or few modules then you can use the
 #        module_depends targets instead. This target can also repair a
damaged or
-#        missing makefile.auto if needed.
+#        missing Makefile.auto if needed.
 #
 #    module_depends
 #        These targets do a dependency check of individual modules.
Replace module
@@ -109,7 +109,7 @@
 #            -r           Input XML
 #
 #    ROS_AUTOMAKE
-#        Alternate name of makefile.auto
+#        Alternate name of Makefile.auto
 #
 
 # check for versions of make that don't have features we need...
@@ -131,7 +131,7 @@
 .PHONY: clean
 
 ifeq ($(ROS_AUTOMAKE),)
-ROS_AUTOMAKE=makefile.auto
+ROS_AUTOMAKE=Makefile.auto
 endif
 
 all: $(ROS_AUTOMAKE)
@@ -486,5 +486,5 @@
 
 .PHONY: depends
 depends:
-	@-$(rm) makefile.auto
+	@-$(rm) Makefile.auto
 	@$(MAKE) $(filter-out depends, $(MAKECMDGOALS))
  _____  

Modified: branches/expat-rbuild/reactos/ReactOS.rbuild
--- branches/expat-rbuild/reactos/ReactOS.rbuild	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/ReactOS.rbuild	2006-02-12
22:21:11 UTC (rev 111)
@@ -1,4 +1,4 @@

-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <project name="ReactOS" makefile="makefile.auto"
xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="config.rbuild">
  _____  

Modified:
branches/expat-rbuild/reactos/base/applications/applications.rbuild
--- branches/expat-rbuild/reactos/base/applications/applications.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/applications/applications.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 <!--
   <directory name="games">
     <xi:include href="games/games.rbuild" />
@@ -36,5 +35,4 @@
     <xi:include href="winefile/winefile.rbuild" />
   </directory>
 -->
-  </group>
 </rbuild>
  _____  

Modified:
branches/expat-rbuild/reactos/base/applications/devmgr/devmgrapp.rbuild
---
branches/expat-rbuild/reactos/base/applications/devmgr/devmgrapp.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++
branches/expat-rbuild/reactos/base/applications/devmgr/devmgrapp.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 	<module name="devmgrapp" type="win32cui"
installbase="system32"
installname="devmgr.exe">
 		<define name="__USE_W32API" />
 		<define name="DEFINE_GUID" />
@@ -13,5 +12,4 @@
 		<file>devmgr.c</file>
 		<efile>devmgr.rc</efile>
 	</module>
-  </group>
 </rbuild>
  _____  

Modified:
branches/expat-rbuild/reactos/base/applications/games/directory.rbuild
---
branches/expat-rbuild/reactos/base/applications/games/directory.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++
branches/expat-rbuild/reactos/base/applications/games/directory.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 <!--
 	<directory name="solitaire">
 		<xi:include href="solitaire/solitaire.xml" />
@@ -10,5 +9,4 @@
 		<xi:include href="winemine/winemine.xml" />
 	</directory>
 -->
-  </group>
 </rbuild>
  _____  

Modified:
branches/expat-rbuild/reactos/base/applications/games/solitaire/solitair
e.rbuild
---
branches/expat-rbuild/reactos/base/applications/games/solitaire/solitair
e.rbuild	2006-02-12 19:55:49 UTC (rev 110)
+++
branches/expat-rbuild/reactos/base/applications/games/solitaire/solitair
e.rbuild	2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 <!--
 	<module name="sol" type="win32gui"
installbase="system32"
installname="solitaire.exe" allowwarnings="true">
 		<include base="sol">.</include>
@@ -36,5 +35,4 @@
 		<file>sol.rc</file>
 	</module>
 -->
-  </group>
 </rbuild>
\ No newline at end of file
  _____  

Modified:
branches/expat-rbuild/reactos/base/applications/games/winemine/winemine.
rbuild
---
branches/expat-rbuild/reactos/base/applications/games/winemine/winemine.
rbuild	2006-02-12 19:55:49 UTC (rev 110)
+++
branches/expat-rbuild/reactos/base/applications/games/winemine/winemine.
rbuild	2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 <!--
 	<module name="winemine" type="win32gui"
installbase="system32"
installname="winemine.exe">
 		<include base="winemine">.</include>
@@ -14,5 +13,4 @@
 		<file>winemine.rc</file>
 	</module>
 -->
-  </group>
 </rbuild>
\ No newline at end of file
  _____  

Modified:
branches/expat-rbuild/reactos/base/applications/getfirefox/getfirefox.rb
uild
---
branches/expat-rbuild/reactos/base/applications/getfirefox/getfirefox.rb
uild	2006-02-12 19:55:49 UTC (rev 110)
+++
branches/expat-rbuild/reactos/base/applications/getfirefox/getfirefox.rb
uild	2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 	<module name="getfirefox" type="win32gui"
installbase="system32"
installname="getfirefox.exe">
 	    <include base="getfirefox">.</include>
 	    <define name="UNICODE" />
@@ -18,5 +17,4 @@
 	    <file>getfirefox.c</file>
 	    <file>getfirefox.rc</file>
 	</module>
-  </group>
 </rbuild>
  _____  

Modified:
branches/expat-rbuild/reactos/base/applications/hostname/hostname.rbuild
---
branches/expat-rbuild/reactos/base/applications/hostname/hostname.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++
branches/expat-rbuild/reactos/base/applications/hostname/hostname.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,11 +1,9 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 	<module name="hostname" type="win32cui"
installbase="system32"
installname="hostname.exe" allowwarnings="true">
 		<define name="__USE_W32API" />
 		<library>kernel32</library>
 		<file>hostname.c</file>
 		<file>hostname.rc</file>
 	</module>
-	</group>
 </rbuild>
  _____  

Modified:
branches/expat-rbuild/reactos/base/applications/shutdown/shutdown.rbuild
---
branches/expat-rbuild/reactos/base/applications/shutdown/shutdown.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++
branches/expat-rbuild/reactos/base/applications/shutdown/shutdown.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,11 +1,9 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 	<module name="shutdown" type="win32cui"
installbase="system32"
installname="shutdown.exe">
 	    <include base="shutdown">.</include>
 	    <define name="__USE_W32API" />
 	    <define name="WINVER">0x0501</define>
 	    <file>shutdown.c</file>
 	</module>
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/base/base.rbuild
--- branches/expat-rbuild/reactos/base/base.rbuild	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/base.rbuild	2006-02-12
22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
   <directory name="applications">
   <xi:include href="applications/applications.rbuild" />
   </directory>
@@ -18,5 +17,4 @@
   <directory name="system">
   <xi:include href="system/system.rbuild" />
   </directory>
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/base/setup/setup.rbuild
--- branches/expat-rbuild/reactos/base/setup/setup.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/setup/setup.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,8 +1,6 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
   <directory name="welcome">
   <xi:include href="welcome/welcome.rbuild" />
   </directory>
-  </group>
 </rbuild>
  _____  

Modified:
branches/expat-rbuild/reactos/base/setup/welcome/welcome.rbuild
--- branches/expat-rbuild/reactos/base/setup/welcome/welcome.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/setup/welcome/welcome.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 	<module name="welcome" type="win32gui"
installbase="system32"
installname="welcome.exe">
 		<bootstrap base="reactos" />
 		<include base="welcome">.</include>
@@ -15,5 +14,4 @@
 		<file>welcome.c</file>
 		<file>welcome.rc</file>
 	</module>
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/base/shell/cmd/cmd.rbuild
--- branches/expat-rbuild/reactos/base/shell/cmd/cmd.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/shell/cmd/cmd.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 	<module name="cmd_base" type="objectlibrary">
 		<include base="ReactOS">include/wine</include>
 		<include base="cmd_base">.</include>
@@ -78,5 +77,4 @@
 	<directory name="tests">
 		<xi:include href="tests/cmd_test.xml" />
 	</directory>
-  </group>
 </rbuild>
  _____  

Modified:
branches/expat-rbuild/reactos/base/shell/cmd/tests/cmd_test.rbuild
--- branches/expat-rbuild/reactos/base/shell/cmd/tests/cmd_test.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/shell/cmd/tests/cmd_test.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 	<module name="cmd_test" type="test">
 		<include base="rtshared">.</include>
 		<include base="ReactOS">include/wine</include>
@@ -16,5 +15,4 @@
 		<file>setup.c</file>
 		<xi:include href="stubs.xml" />
 	</module>
-  </group>
 </rbuild>
  _____  

Modified:
branches/expat-rbuild/reactos/base/shell/cmd/tests/stubs.rbuild
--- branches/expat-rbuild/reactos/base/shell/cmd/tests/stubs.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/shell/cmd/tests/stubs.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 	<component name="kernel32.dll">
 		<symbol>FindFirstFileA@8</symbol>
 		<symbol>GetLastError@0</symbol>
@@ -85,5 +84,4 @@
 		<symbol>InterlockedDecrement@4</symbol>
 		<symbol>ReleaseSemaphore@12</symbol>
 	</component>
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/base/shell/shell.rbuild
--- branches/expat-rbuild/reactos/base/shell/shell.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/shell/shell.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 <!--
   <directory name="cmd">
     <xi:include href="cmd/cmd.rbuild" />
@@ -9,5 +8,4 @@
     <xi:include href="explorer/explorer.rbuild" />
   </directory>
 -->
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/base/system/system.rbuild
--- branches/expat-rbuild/reactos/base/system/system.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/base/system/system.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,8 +1,6 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
 <!--
 
 -->
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/baseaddress.rbuild
--- branches/expat-rbuild/reactos/baseaddress.rbuild	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/baseaddress.rbuild	2006-02-12
22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-<group>
   <property name="BASEADDRESS_DPLAYX" value="0x5E080000" />
   <property name="BASEADDRESS_DPLAY" value="0x71E80000" />
   <property name="BASEADDRESS_REGTESTS" value="0x07000000" />
@@ -122,5 +121,4 @@
   <property name="BASEADDRESS_KERNEL32" value="0x7c800000" />
   <property name="BASEADDRESS_NTDLL" value="0x7C900000" />
   <property name="BASEADDRESS_FREETYPE" value="0x7F000000" />
-</group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/boot/boot.rbuild
--- branches/expat-rbuild/reactos/boot/boot.rbuild	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/boot/boot.rbuild	2006-02-12
22:21:11 UTC (rev 111)
@@ -1,11 +1,9 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
   <directory name="bootcd">
   <xi:include href="bootcd/bootcd.rbuild" />
   </directory>
   <directory name="freeldr">
   <xi:include href="freeldr/freeldr.rbuild" />
   </directory>
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/include/reactos/debug.h
--- branches/expat-rbuild/reactos/include/reactos/debug.h
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/include/reactos/debug.h
2006-02-12 22:21:11 UTC (rev 111)
@@ -99,9 +99,14 @@

 
 #else
 
+#ifdef _MSC_VER
+    #define DPRINT1
+    #define DPRINT
+#else
     /* On non-debug builds, we never show these */
     #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } }
while(0)
     #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } }
while(0)
+#endif
 
     #define CHECKPOINT1
     #define CHECKPOINT
  _____  

Modified: branches/expat-rbuild/reactos/lib/directory.rbuild
--- branches/expat-rbuild/reactos/lib/directory.rbuild	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/directory.rbuild	2006-02-12
22:21:11 UTC (rev 111)
@@ -1,8 +1,6 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
   <directory name="rossym">
     <xi:include href="rossym/rossym.rbuild" />
   </directory>
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/lib/inflib/builddep.h
--- branches/expat-rbuild/reactos/lib/inflib/builddep.h	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/inflib/builddep.h	2006-02-12
22:21:11 UTC (rev 111)
@@ -45,7 +45,7 @@

 #define STRFMT "%s"
 
 #ifdef _MSC_VER
-#define strcasecmp stricmp
+#define strcasecmp _stricmp
 #endif
 
 extern unsigned long DbgPrint(char *Fmt, ...);
  _____  

Modified: branches/expat-rbuild/reactos/lib/inflib/infcore.c
--- branches/expat-rbuild/reactos/lib/inflib/infcore.c	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/inflib/infcore.c	2006-02-12
22:21:11 UTC (rev 111)
@@ -10,7 +10,9 @@

 
 #include "inflib.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 #define CONTROL_Z  '\x1a'
  _____  

Modified: branches/expat-rbuild/reactos/lib/inflib/infget.c
--- branches/expat-rbuild/reactos/lib/inflib/infget.c	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/inflib/infget.c	2006-02-12
22:21:11 UTC (rev 111)
@@ -10,7 +10,9 @@

 
 #include "inflib.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 
  _____  

Modified: branches/expat-rbuild/reactos/lib/inflib/infhostgen.c
--- branches/expat-rbuild/reactos/lib/inflib/infhostgen.c
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/inflib/infhostgen.c
2006-02-12 22:21:11 UTC (rev 111)
@@ -11,7 +11,9 @@

 #include "inflib.h"
 #include "infhost.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 /* PUBLIC FUNCTIONS
*********************************************************/
  _____  

Modified: branches/expat-rbuild/reactos/lib/inflib/infhostget.c
--- branches/expat-rbuild/reactos/lib/inflib/infhostget.c
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/inflib/infhostget.c
2006-02-12 22:21:11 UTC (rev 111)
@@ -11,7 +11,9 @@

 #include "inflib.h"
 #include "infhost.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 int
  _____  

Modified: branches/expat-rbuild/reactos/lib/inflib/infhostglue.c
--- branches/expat-rbuild/reactos/lib/inflib/infhostglue.c
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/inflib/infhostglue.c
2006-02-12 22:21:11 UTC (rev 111)
@@ -8,7 +8,9 @@

 
 #include "inflib.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 unsigned long
  _____  

Modified: branches/expat-rbuild/reactos/lib/inflib/infhostput.c
--- branches/expat-rbuild/reactos/lib/inflib/infhostput.c
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/inflib/infhostput.c
2006-02-12 22:21:11 UTC (rev 111)
@@ -9,7 +9,9 @@

 #include "inflib.h"
 #include "infhost.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 int
  _____  

Modified: branches/expat-rbuild/reactos/lib/inflib/infput.c
--- branches/expat-rbuild/reactos/lib/inflib/infput.c	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/lib/inflib/infput.c	2006-02-12
22:21:11 UTC (rev 111)
@@ -8,7 +8,9 @@

 
 #include "inflib.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <debug.h>
 
 #define EOL      _T("\r\n")
  _____  

Modified: branches/expat-rbuild/reactos/media/media.rbuild
--- branches/expat-rbuild/reactos/media/media.rbuild	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/media/media.rbuild	2006-02-12
22:21:11 UTC (rev 111)
@@ -1,9 +1,7 @@

 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-  <group>
     <directory name="fonts">
     <xi:include href="fonts/fonts.rbuild" />
     </directory>
-  </group>
 </rbuild>
  _____  

Modified: branches/expat-rbuild/reactos/subsystems/subsystems.rbuild
--- branches/expat-rbuild/reactos/subsystems/subsystems.rbuild
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/subsystems/subsystems.rbuild
2006-02-12 22:21:11 UTC (rev 111)
@@ -1,6 +1,5 @@

 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-<group>
 <!--
 <directory name="csrss">
   <xi:include href="csrss/csrss.rbuild" />
@@ -15,5 +14,4 @@
   <xi:include href="win32k/win32k.rbuild" />
 </directory>
 -->
-</group>
 </rbuild>
  _____  

Added: branches/expat-rbuild/reactos/tools/expat/ascii.h
--- branches/expat-rbuild/reactos/tools/expat/ascii.h	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/tools/expat/ascii.h	2006-02-12
22:21:11 UTC (rev 111)
@@ -0,0 +1,85 @@

+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
+*/
+
+#define ASCII_A 0x41
+#define ASCII_B 0x42
+#define ASCII_C 0x43
+#define ASCII_D 0x44
+#define ASCII_E 0x45
+#define ASCII_F 0x46
+#define ASCII_G 0x47
+#define ASCII_H 0x48
+#define ASCII_I 0x49
+#define ASCII_J 0x4A
+#define ASCII_K 0x4B
+#define ASCII_L 0x4C
+#define ASCII_M 0x4D
+#define ASCII_N 0x4E
+#define ASCII_O 0x4F
+#define ASCII_P 0x50
+#define ASCII_Q 0x51
+#define ASCII_R 0x52
+#define ASCII_S 0x53
+#define ASCII_T 0x54
+#define ASCII_U 0x55
+#define ASCII_V 0x56
+#define ASCII_W 0x57
+#define ASCII_X 0x58
+#define ASCII_Y 0x59
+#define ASCII_Z 0x5A
+
+#define ASCII_a 0x61
+#define ASCII_b 0x62
+#define ASCII_c 0x63
+#define ASCII_d 0x64
+#define ASCII_e 0x65
+#define ASCII_f 0x66
+#define ASCII_g 0x67
+#define ASCII_h 0x68
+#define ASCII_i 0x69
+#define ASCII_j 0x6A
+#define ASCII_k 0x6B
+#define ASCII_l 0x6C
+#define ASCII_m 0x6D
+#define ASCII_n 0x6E
+#define ASCII_o 0x6F
+#define ASCII_p 0x70
+#define ASCII_q 0x71
+#define ASCII_r 0x72
+#define ASCII_s 0x73
+#define ASCII_t 0x74
+#define ASCII_u 0x75
+#define ASCII_v 0x76
+#define ASCII_w 0x77
+#define ASCII_x 0x78
+#define ASCII_y 0x79
+#define ASCII_z 0x7A
+
+#define ASCII_0 0x30
+#define ASCII_1 0x31
+#define ASCII_2 0x32
+#define ASCII_3 0x33
+#define ASCII_4 0x34
+#define ASCII_5 0x35
+#define ASCII_6 0x36
+#define ASCII_7 0x37
+#define ASCII_8 0x38
+#define ASCII_9 0x39
+
+#define ASCII_TAB 0x09
+#define ASCII_SPACE 0x20
+#define ASCII_EXCL 0x21
+#define ASCII_QUOT 0x22
+#define ASCII_AMP 0x26
+#define ASCII_APOS 0x27
+#define ASCII_MINUS 0x2D
+#define ASCII_PERIOD 0x2E
+#define ASCII_COLON 0x3A
+#define ASCII_SEMI 0x3B
+#define ASCII_LT 0x3C
+#define ASCII_EQUALS 0x3D
+#define ASCII_GT 0x3E
+#define ASCII_LSQB 0x5B
+#define ASCII_RSQB 0x5D
+#define ASCII_UNDERSCORE 0x5F
Property changes on: branches/expat-rbuild/reactos/tools/expat/ascii.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native
  _____  

Added: branches/expat-rbuild/reactos/tools/expat/asciitab.h
--- branches/expat-rbuild/reactos/tools/expat/asciitab.h
2006-02-12 19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/tools/expat/asciitab.h
2006-02-12 22:21:11 UTC (rev 111)
@@ -0,0 +1,36 @@

+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
+*/
+
+/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x04 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x08 */ BT_NONXML, BT_S, BT_LF, BT_NONXML,
+/* 0x0C */ BT_NONXML, BT_CR, BT_NONXML, BT_NONXML,
+/* 0x10 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x14 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x18 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x1C */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x20 */ BT_S, BT_EXCL, BT_QUOT, BT_NUM,
+/* 0x24 */ BT_OTHER, BT_PERCNT, BT_AMP, BT_APOS,
+/* 0x28 */ BT_LPAR, BT_RPAR, BT_AST, BT_PLUS,
+/* 0x2C */ BT_COMMA, BT_MINUS, BT_NAME, BT_SOL,
+/* 0x30 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT,
+/* 0x34 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT,
+/* 0x38 */ BT_DIGIT, BT_DIGIT, BT_COLON, BT_SEMI,
+/* 0x3C */ BT_LT, BT_EQUALS, BT_GT, BT_QUEST,
+/* 0x40 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX,
+/* 0x44 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT,
+/* 0x48 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x4C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x50 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x54 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x58 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_LSQB,
+/* 0x5C */ BT_OTHER, BT_RSQB, BT_OTHER, BT_NMSTRT,
+/* 0x60 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX,
+/* 0x64 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT,
+/* 0x68 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x6C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x70 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x74 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x78 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER,
+/* 0x7C */ BT_VERBAR, BT_OTHER, BT_OTHER, BT_OTHER,
Property changes on:
branches/expat-rbuild/reactos/tools/expat/asciitab.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native
  _____  

Added: branches/expat-rbuild/reactos/tools/expat/expat.h
--- branches/expat-rbuild/reactos/tools/expat/expat.h	2006-02-12
19:55:49 UTC (rev 110)
+++ branches/expat-rbuild/reactos/tools/expat/expat.h	2006-02-12
22:21:11 UTC (rev 111)
@@ -0,0 +1,1013 @@

+/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
+*/
+
+#ifndef Expat_INCLUDED
+#define Expat_INCLUDED 1
+
+#ifdef __VMS
+/*      0        1         2         3      0        1         2
3
+        1234567890123456789012345678901
1234567890123456789012345678901 */
+#define XML_SetProcessingInstructionHandler
XML_SetProcessingInstrHandler
+#define XML_SetUnparsedEntityDeclHandler
XML_SetUnparsedEntDeclHandler
+#define XML_SetStartNamespaceDeclHandler
XML_SetStartNamespcDeclHandler
+#define XML_SetExternalEntityRefHandlerArg
XML_SetExternalEntRefHandlerArg
+#endif
+
+#include <stdlib.h>
+#include "expat_external.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct XML_ParserStruct;
+typedef struct XML_ParserStruct *XML_Parser;
+
+/* Should this be defined using stdbool.h when C99 is available? */
+typedef unsigned char XML_Bool;
+#define XML_TRUE   ((XML_Bool) 1)
+#define XML_FALSE  ((XML_Bool) 0)
+
+/* The XML_Status enum gives the possible return values for several
+   API functions.  The preprocessor #defines are included so this
+   stanza can be added to code that still needs to support older
+   versions of Expat 1.95.x:
+
+   #ifndef XML_STATUS_OK
+   #define XML_STATUS_OK    1
+   #define XML_STATUS_ERROR 0
+   #endif
+
+   Otherwise, the #define hackery is quite ugly and would have been
+   dropped.
+*/
+enum XML_Status {
+  XML_STATUS_ERROR = 0,
+#define XML_STATUS_ERROR XML_STATUS_ERROR
+  XML_STATUS_OK = 1,
+#define XML_STATUS_OK XML_STATUS_OK
+  XML_STATUS_SUSPENDED = 2
+#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
+};
+
+enum XML_Error {
+  XML_ERROR_NONE,
+  XML_ERROR_NO_MEMORY,
+  XML_ERROR_SYNTAX,
+  XML_ERROR_NO_ELEMENTS,
+  XML_ERROR_INVALID_TOKEN,
+  XML_ERROR_UNCLOSED_TOKEN,
+  XML_ERROR_PARTIAL_CHAR,
+  XML_ERROR_TAG_MISMATCH,
+  XML_ERROR_DUPLICATE_ATTRIBUTE,
+  XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
+  XML_ERROR_PARAM_ENTITY_REF,
+  XML_ERROR_UNDEFINED_ENTITY,
+  XML_ERROR_RECURSIVE_ENTITY_REF,
+  XML_ERROR_ASYNC_ENTITY,
+  XML_ERROR_BAD_CHAR_REF,
+  XML_ERROR_BINARY_ENTITY_REF,
+  XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
+  XML_ERROR_MISPLACED_XML_PI,
+  XML_ERROR_UNKNOWN_ENCODING,
+  XML_ERROR_INCORRECT_ENCODING,
+  XML_ERROR_UNCLOSED_CDATA_SECTION,
+  XML_ERROR_EXTERNAL_ENTITY_HANDLING,
+  XML_ERROR_NOT_STANDALONE,
+  XML_ERROR_UNEXPECTED_STATE,
+  XML_ERROR_ENTITY_DECLARED_IN_PE,
+  XML_ERROR_FEATURE_REQUIRES_XML_DTD,
+  XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING,
+  /* Added in 1.95.7. */
+  XML_ERROR_UNBOUND_PREFIX,
+  /* Added in 1.95.8. */
+  XML_ERROR_UNDECLARING_PREFIX,
+  XML_ERROR_INCOMPLETE_PE,
+  XML_ERROR_XML_DECL,
+  XML_ERROR_TEXT_DECL,
+  XML_ERROR_PUBLICID,
+  XML_ERROR_SUSPENDED,
+  XML_ERROR_NOT_SUSPENDED,
+  XML_ERROR_ABORTED,
+  XML_ERROR_FINISHED,
+  XML_ERROR_SUSPEND_PE,
+  /* Added in 2.0. */
+  XML_ERROR_RESERVED_PREFIX_XML,
+  XML_ERROR_RESERVED_PREFIX_XMLNS,
+  XML_ERROR_RESERVED_NAMESPACE_URI
+};
+
+enum XML_Content_Type {
+  XML_CTYPE_EMPTY = 1,
+  XML_CTYPE_ANY,
+  XML_CTYPE_MIXED,
+  XML_CTYPE_NAME,
+  XML_CTYPE_CHOICE,
+  XML_CTYPE_SEQ
+};
+
+enum XML_Content_Quant {
+  XML_CQUANT_NONE,
+  XML_CQUANT_OPT,
+  XML_CQUANT_REP,
+  XML_CQUANT_PLUS
+};
+
+/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be
+   XML_CQUANT_NONE, and the other fields will be zero or NULL.
+   If type == XML_CTYPE_MIXED, then quant will be NONE or REP and
+   numchildren will contain number of elements that may be mixed in
+   and children point to an array of XML_Content cells that will be
+   all of XML_CTYPE_NAME type with no quantification.
+
+   If type == XML_CTYPE_NAME, then the name points to the name, and
+   the numchildren field will be zero and children will be NULL. The
+   quant fields indicates any quantifiers placed on the name.
+
+   CHOICE and SEQ will have name NULL, the number of children in
+   numchildren and children will point, recursively, to an array
+   of XML_Content cells.
+
+   The EMPTY, ANY, and MIXED types will only occur at top level.
+*/
+
+typedef struct XML_cp XML_Content;
+
+struct XML_cp {
+  enum XML_Content_Type         type;
+  enum XML_Content_Quant        quant;
+  XML_Char *                    name;
+  unsigned int                  numchildren;
+  XML_Content *                 children;
+};
+
+
+/* This is called for an element declaration. See above for
+   description of the model argument. It's the caller's responsibility
+   to free model when finished with it.
+*/
+typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData,
+                                                const XML_Char *name,
+                                                XML_Content *model);
+
+XMLPARSEAPI(void)
+XML_SetElementDeclHandler(XML_Parser parser,
+                          XML_ElementDeclHandler eldecl);
+
+/* The Attlist declaration handler is called for *each* attribute. So
+   a single Attlist declaration with multiple attributes declared will
+   generate multiple calls to this handler. The "default" parameter
+   may be NULL in the case of the "#IMPLIED" or "#REQUIRED"
+   keyword. The "isrequired" parameter will be true and the default
+   value will be NULL in the case of "#REQUIRED". If "isrequired" is
+   true and default is non-NULL, then this is a "#FIXED" default.
+*/
+typedef void (XMLCALL *XML_AttlistDeclHandler) (
+                                    void            *userData,
+                                    const XML_Char  *elname,
+                                    const XML_Char  *attname,
+                                    const XML_Char  *att_type,
+                                    const XML_Char  *dflt,
+                                    int              isrequired);
+
+XMLPARSEAPI(void)
+XML_SetAttlistDeclHandler(XML_Parser parser,
+                          XML_AttlistDeclHandler attdecl);
+
+/* The XML declaration handler is called for *both* XML declarations
+   and text declarations. The way to distinguish is that the version
+   parameter will be NULL for text declarations. The encoding
+   parameter may be NULL for XML declarations. The standalone
+   parameter will be -1, 0, or 1 indicating respectively that there
+   was no standalone parameter in the declaration, that it was given
+   as no, or that it was given as yes.
+*/
+typedef void (XMLCALL *XML_XmlDeclHandler) (void           *userData,
+                                            const XML_Char *version,
+                                            const XML_Char *encoding,
+                                            int
standalone);
+
+XMLPARSEAPI(void)
+XML_SetXmlDeclHandler(XML_Parser parser,
+                      XML_XmlDeclHandler xmldecl);
+
+
+typedef struct {
+  void *(*malloc_fcn)(size_t size);
+  void *(*realloc_fcn)(void *ptr, size_t size);
+  void (*free_fcn)(void *ptr);
+} XML_Memory_Handling_Suite;
+
+/* Constructs a new parser; encoding is the encoding specified by the
+   external protocol or NULL if there is none specified.
+*/
+XMLPARSEAPI(XML_Parser)
+XML_ParserCreate(const XML_Char *encoding);
+
+/* Constructs a new parser and namespace processor.  Element type
+   names and attribute names that belong to a namespace will be
+   expanded; unprefixed attribute names are never expanded; unprefixed
+   element type names are expanded only if there is a default
+   namespace. The expanded name is the concatenation of the namespace
+   URI, the namespace separator character, and the local part of the
+   name.  If the namespace separator is '\0' then the namespace URI
+   and the local part will be concatenated without any separator.
+   It is a programming error to use the separator '\0' with namespace
+   triplets (see XML_SetReturnNSTriplet).
+*/
+XMLPARSEAPI(XML_Parser)
+XML_ParserCreateNS(const XML_Char *encoding, XML_Char
namespaceSeparator);
+
+
+/* Constructs a new parser using the memory management suite referred
to
+   by memsuite. If memsuite is NULL, then use the standard library
memory
+   suite. If namespaceSeparator is non-NULL it creates a parser with
+   namespace processing as described above. The character pointed at
+   will serve as the namespace separator.
+
+   All further memory operations used for the created parser will come
from
+   the given suite.
+*/
+XMLPARSEAPI(XML_Parser)
+XML_ParserCreate_MM(const XML_Char *encoding,
+                    const XML_Memory_Handling_Suite *memsuite,
+                    const XML_Char *namespaceSeparator);
+
+/* Prepare a parser object to be re-used.  This is particularly
+   valuable when memory allocation overhead is disproportionatly high,
+   such as when a large number of small documnents need to be parsed.
+   All handlers are cleared from the parser, except for the
+   unknownEncodingHandler. The parser's external state is
re-initialized
+   except for the values of ns and ns_triplets.
+
+   Added in Expat 1.95.3.
+*/
+XMLPARSEAPI(XML_Bool)
+XML_ParserReset(XML_Parser parser, const XML_Char *encoding);
+
+/* atts is array of name/value pairs, terminated by 0;
+   names and values are 0 terminated.
+*/
+typedef void (XMLCALL *XML_StartElementHandler) (void *userData,
+                                                 const XML_Char *name,
+                                                 const XML_Char
**atts);
+
+typedef void (XMLCALL *XML_EndElementHandler) (void *userData,
+                                               const XML_Char *name);
+
+
+/* s is not 0 terminated. */
+typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData,
+                                                  const XML_Char *s,
+                                                  int len);
+
+/* target and data are 0 terminated */
+typedef void (XMLCALL *XML_ProcessingInstructionHandler) (
+                                                void *userData,
+                                                const XML_Char *target,
+                                                const XML_Char *data);
+
+/* data is 0 terminated */
+typedef void (XMLCALL *XML_CommentHandler) (void *userData,
+                                            const XML_Char *data);
+
+typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData);
+typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData);
+
+/* This is called for any characters in the XML document for which
+   there is no applicable handler.  This includes both characters that
+   are part of markup which is of a kind that is not reported
+   (comments, markup declarations), or characters that are part of a
+   construct which could be reported but for which no handler has been
+   supplied. The characters are passed exactly as they were in the XML
+   document except that they will be encoded in UTF-8 or UTF-16.
+   Line boundaries are not normalized. Note that a byte order mark
+   character is not passed to the default handler. There are no
+   guarantees about how characters are divided between calls to the
+   default handler: for example, a comment might be split between
+   multiple calls.
+*/
+typedef void (XMLCALL *XML_DefaultHandler) (void *userData,
+                                            const XML_Char *s,
+                                            int len);
+
+/* This is called for the start of the DOCTYPE declaration, before
+   any DTD or internal subset is parsed.
+*/
+typedef void (XMLCALL *XML_StartDoctypeDeclHandler) (
+                                            void *userData,
+                                            const XML_Char
*doctypeName,
+                                            const XML_Char *sysid,
+                                            const XML_Char *pubid,
+                                            int has_internal_subset);
+
+/* This is called for the start of the DOCTYPE declaration when the
+   closing > is encountered, but after processing any external
+   subset.
+*/
+typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
+
+/* This is called for entity declarations. The is_parameter_entity
+   argument will be non-zero if the entity is a parameter entity, zero
+   otherwise.
+
+   For internal entities (<!ENTITY foo "bar">), value will
+   be non-NULL and systemId, publicID, and notationName will be NULL.
+   The value string is NOT nul-terminated; the length is provided in
+   the value_length argument. Since it is legal to have zero-length
+   values, do not use this argument to test for internal entities.
+
+   For external entities, value will be NULL and systemId will be
+   non-NULL. The publicId argument will be NULL unless a public
+   identifier was provided. The notationName argument will have a
+   non-NULL value only for unparsed entity declarations.
+
+   Note that is_parameter_entity can't be changed to XML_Bool, since
+   that would break binary compatibility.
+*/
+typedef void (XMLCALL *XML_EntityDeclHandler) (
+                              void *userData,
+                              const XML_Char *entityName,
+                              int is_parameter_entity,
+                              const XML_Char *value,
[truncated at 1000 lines; 25969 more skipped]