[ros-diffs] [fireball] 31514: - Turn on libxml2 support in msxml3.dll. - Move libxml2 includes to include/reactos/libs/libxml. - Add one reactos-specific hack into libxml2/trionan.c (fpclassify-related). - With a number of glitches in msi, ole32 and rpcrt4, I was able to half-complete the Office 2003 setup.

Author: fireball
Date: Mon Dec 31 13:48:43 2007
New Revision: 31514

URL: http://svn.reactos.org/svn/reactos?rev=31514&view=rev
Log:
- Turn on libxml2 support in msxml3.dll.
- Move libxml2 includes to include/reactos/libs/libxml.
- Add one reactos-specific hack into libxml2/trionan.c (fpclassify-related).
- With a number of glitches in msi, ole32 and rpcrt4, I was able to half-complete the
Office 2003 setup.

Added:
    trunk/reactos/include/reactos/libs/libxml/
      - copied from r31497, trunk/reactos/lib/3rdparty/libxml2/include/libxml/
Removed:
    trunk/reactos/lib/3rdparty/libxml2/include/libxml/
Modified:
    trunk/reactos/dll/win32/msxml3/msxml3.rbuild
    trunk/reactos/include/reactos/wine/config.h
    trunk/reactos/lib/3rdparty/3rdparty.rbuild
    trunk/reactos/lib/3rdparty/libxml2/trionan.c

Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb…
==============================================================================
--- trunk/reactos/dll/win32/msxml3/msxml3.rbuild (original)
+++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild Mon Dec 31 13:48:43 2007
@@ -9,9 +9,12 @@
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x601</define>
 	<define name="WINVER">0x501</define>
+	<define name="LIBXML_STATIC" />
+	<library>libxml2</library>
 	<library>wine</library>
 	<library>urlmon</library>
 	<library>wininet</library>
+	<library>ws2_32</library>
 	<library>comctl32</library>
 	<library>shell32</library>
 	<library>shlwapi</library>

Modified: trunk/reactos/include/reactos/wine/config.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi…
==============================================================================
--- trunk/reactos/include/reactos/wine/config.h (original)
+++ trunk/reactos/include/reactos/wine/config.h Mon Dec 31 13:48:43 2007
@@ -276,10 +276,10 @@
 /* #undef HAVE_LIBSOCKET */
 
 /* Define if you have the libxml2 library */
-/* #undef HAVE_LIBXML2 */
+#define HAVE_LIBXML2
 
 /* Define to 1 if you have the <libxml/parser.h> header file. */
-/* #undef HAVE_LIBXML_PARSER_H */
+#define HAVE_LIBXML_PARSER_H
 
 /* Define to 1 if you have the `xpg4' library (-lxpg4). */
 /* #undef HAVE_LIBXPG4 */

Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/3rdparty.rbui…
==============================================================================
--- trunk/reactos/lib/3rdparty/3rdparty.rbuild (original)
+++ trunk/reactos/lib/3rdparty/3rdparty.rbuild Mon Dec 31 13:48:43 2007
@@ -13,9 +13,9 @@
 	<directory name="libwine">
 		<xi:include href="libwine/libwine.rbuild" />
 	</directory>
-	<!--directory name="libxml2">
+	<directory name="libxml2">
 		<xi:include href="libxml2/libxml2.rbuild" />
-	</directory-->
+	</directory>
 	<directory name="mingw">
 		<xi:include href="mingw/mingw.rbuild" />
 	</directory>

Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trion…
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/trionan.c (original)
+++ trunk/reactos/lib/3rdparty/libxml2/trionan.c Mon Dec 31 13:48:43 2007
@@ -57,6 +57,9 @@
 #   include <fp_class.h>
 #  endif
 #endif
+
+/* Small ReactOS hack */
+#define fpclassify fpclass
 #include <assert.h>
 
 #if defined(TRIO_DOCUMENTATION)