msxml: #include tidy up

[Huw D M Davies]

        Huw Davies <huw at codeweavers.com>
        include msxml2.h rather than msxml.h and xmldom.h
-- 
Huw Davies
huw at codeweavers.com
Index: dlls/msxml3/domdoc.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/domdoc.c,v
retrieving revision 1.17
diff -u -p -r1.17 domdoc.c
--- dlls/msxml3/domdoc.c	8 Nov 2005 13:10:49 -0000	1.17
+++ dlls/msxml3/domdoc.c	8 Nov 2005 16:38:04 -0000
@@ -28,9 +28,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
+#include "msxml2.h"
 
 #include "wine/debug.h"
 
Index: dlls/msxml3/element.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/element.c,v
retrieving revision 1.10
diff -u -p -r1.10 element.c
--- dlls/msxml3/element.c	8 Nov 2005 12:46:43 -0000	1.10
+++ dlls/msxml3/element.c	8 Nov 2005 16:38:04 -0000
@@ -27,10 +27,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
-#include "msxml.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 
Index: dlls/msxml3/factory.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/factory.c,v
retrieving revision 1.4
diff -u -p -r1.4 factory.c
--- dlls/msxml3/factory.c	10 Aug 2005 09:53:47 -0000	1.4
+++ dlls/msxml3/factory.c	8 Nov 2005 16:38:04 -0000
@@ -26,9 +26,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "uuids.h"
-#include "msxml.h"
-#include "xmldom.h"
+#include "msxml2.h"
 
 #include "wine/debug.h"
 
Index: dlls/msxml3/main.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/main.c,v
retrieving revision 1.4
diff -u -p -r1.4 main.c
--- dlls/msxml3/main.c	12 Aug 2005 11:20:26 -0000	1.4
+++ dlls/msxml3/main.c	8 Nov 2005 16:38:04 -0000
@@ -27,6 +27,7 @@
 #include "winuser.h"
 #include "winreg.h"
 #include "ole2.h"
+#include "msxml2.h"
 
 #include "wine/debug.h"
 
Index: dlls/msxml3/msxml_private.h
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/msxml_private.h,v
retrieving revision 1.11
diff -u -p -r1.11 msxml_private.h
--- dlls/msxml3/msxml_private.h	8 Nov 2005 13:10:49 -0000	1.11
+++ dlls/msxml3/msxml_private.h	8 Nov 2005 16:38:04 -0000
@@ -21,8 +21,6 @@
 #ifndef __MSXML_PRIVATE__
 #define __MSXML_PRIVATE__
 
-#include "xmldom.h"
-
 #ifdef HAVE_LIBXML2
 
 #ifdef HAVE_LIBXML_PARSER_H
Index: dlls/msxml3/node.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/node.c,v
retrieving revision 1.14
diff -u -p -r1.14 node.c
--- dlls/msxml3/node.c	8 Nov 2005 16:10:13 -0000	1.14
+++ dlls/msxml3/node.c	8 Nov 2005 16:38:04 -0000
@@ -29,10 +29,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
-#include "msxml.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 
Index: dlls/msxml3/nodelist.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/nodelist.c,v
retrieving revision 1.6
diff -u -p -r1.6 nodelist.c
--- dlls/msxml3/nodelist.c	8 Nov 2005 12:46:43 -0000	1.6
+++ dlls/msxml3/nodelist.c	8 Nov 2005 16:38:04 -0000
@@ -26,12 +26,8 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "winnls.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
-#include "msxml.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 
Index: dlls/msxml3/nodemap.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/nodemap.c,v
retrieving revision 1.8
diff -u -p -r1.8 nodemap.c
--- dlls/msxml3/nodemap.c	8 Nov 2005 12:46:43 -0000	1.8
+++ dlls/msxml3/nodemap.c	8 Nov 2005 16:38:04 -0000
@@ -28,10 +28,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
-#include "msxml.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 
Index: dlls/msxml3/parseerror.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/parseerror.c,v
retrieving revision 1.1
diff -u -p -r1.1 parseerror.c
--- dlls/msxml3/parseerror.c	8 Nov 2005 13:10:49 -0000	1.1
+++ dlls/msxml3/parseerror.c	8 Nov 2005 16:38:04 -0000
@@ -28,8 +28,7 @@
 #include "winerror.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "msxml.h"
-#include "xmldom.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 
Index: dlls/msxml3/tests/domdoc.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/tests/domdoc.c,v
retrieving revision 1.8
diff -u -p -r1.8 domdoc.c
--- dlls/msxml3/tests/domdoc.c	8 Nov 2005 16:10:13 -0000	1.8
+++ dlls/msxml3/tests/domdoc.c	8 Nov 2005 16:38:04 -0000
@@ -23,8 +23,7 @@
 
 #include "windows.h"
 #include "ole2.h"
-#include "msxml.h"
-#include "xmldom.h"
+#include "msxml2.h"
 #include <stdio.h>
 
 #include "wine/test.h"
@@ -235,7 +234,7 @@ void test_domdoc( void )
     ok( code == 0, "code %ld\n", code );
     IXMLDOMParseError_Release( error );
 
-    r = IXMLDocument_Release( doc );
+    r = IXMLDOMDocument_Release( doc );
     ok( r == 0, "document ref count incorrect\n");
 
 }
@@ -503,7 +502,7 @@ void test_domnode( void )
     if (element)
         IXMLDOMElement_Release( element );
     if (doc)
-        IXMLDocument_Release( doc );
+        IXMLDOMDocument_Release( doc );
 }
 
 START_TEST(domdoc)