ChangeSet ID: 21178 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/11/08 13:59:37
Modified files: dlls/msxml3/tests: domdoc.c dlls/msxml3 : parseerror.c nodemap.c nodelist.c node.c msxml_private.h main.c factory.c element.c domdoc.c
Log message: Huw Davies huw@codeweavers.com Include msxml2.h rather than msxml.h and xmldom.h.
Patch: http://cvs.winehq.org/patch.py?id=21178
Old revision New revision Changes Path 1.8 1.9 +3 -4 wine/dlls/msxml3/tests/domdoc.c 1.1 1.2 +1 -2 wine/dlls/msxml3/parseerror.c 1.8 1.9 +1 -4 wine/dlls/msxml3/nodemap.c 1.6 1.7 +1 -5 wine/dlls/msxml3/nodelist.c 1.14 1.15 +1 -4 wine/dlls/msxml3/node.c 1.11 1.12 +0 -2 wine/dlls/msxml3/msxml_private.h 1.4 1.5 +1 -0 wine/dlls/msxml3/main.c 1.4 1.5 +1 -3 wine/dlls/msxml3/factory.c 1.10 1.11 +1 -4 wine/dlls/msxml3/element.c 1.17 1.18 +2 -4 wine/dlls/msxml3/domdoc.c
Index: wine/dlls/msxml3/tests/domdoc.c diff -u -p wine/dlls/msxml3/tests/domdoc.c:1.8 wine/dlls/msxml3/tests/domdoc.c:1.9 --- wine/dlls/msxml3/tests/domdoc.c:1.8 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/tests/domdoc.c 8 Nov 2005 19:59:37 -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) Index: wine/dlls/msxml3/parseerror.c diff -u -p wine/dlls/msxml3/parseerror.c:1.1 wine/dlls/msxml3/parseerror.c:1.2 --- wine/dlls/msxml3/parseerror.c:1.1 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/parseerror.c 8 Nov 2005 19:59:37 -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: wine/dlls/msxml3/nodemap.c diff -u -p wine/dlls/msxml3/nodemap.c:1.8 wine/dlls/msxml3/nodemap.c:1.9 --- wine/dlls/msxml3/nodemap.c:1.8 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/nodemap.c 8 Nov 2005 19:59:37 -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: wine/dlls/msxml3/nodelist.c diff -u -p wine/dlls/msxml3/nodelist.c:1.6 wine/dlls/msxml3/nodelist.c:1.7 --- wine/dlls/msxml3/nodelist.c:1.6 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/nodelist.c 8 Nov 2005 19:59:37 -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: wine/dlls/msxml3/node.c diff -u -p wine/dlls/msxml3/node.c:1.14 wine/dlls/msxml3/node.c:1.15 --- wine/dlls/msxml3/node.c:1.14 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/node.c 8 Nov 2005 19:59:37 -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: wine/dlls/msxml3/msxml_private.h diff -u -p wine/dlls/msxml3/msxml_private.h:1.11 wine/dlls/msxml3/msxml_private.h:1.12 --- wine/dlls/msxml3/msxml_private.h:1.11 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/msxml_private.h 8 Nov 2005 19:59:37 -0000 @@ -21,8 +21,6 @@ #ifndef __MSXML_PRIVATE__ #define __MSXML_PRIVATE__
-#include "xmldom.h" - #ifdef HAVE_LIBXML2
#ifdef HAVE_LIBXML_PARSER_H Index: wine/dlls/msxml3/main.c diff -u -p wine/dlls/msxml3/main.c:1.4 wine/dlls/msxml3/main.c:1.5 --- wine/dlls/msxml3/main.c:1.4 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/main.c 8 Nov 2005 19:59:37 -0000 @@ -27,6 +27,7 @@ #include "winuser.h" #include "winreg.h" #include "ole2.h" +#include "msxml2.h"
#include "wine/debug.h"
Index: wine/dlls/msxml3/factory.c diff -u -p wine/dlls/msxml3/factory.c:1.4 wine/dlls/msxml3/factory.c:1.5 --- wine/dlls/msxml3/factory.c:1.4 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/factory.c 8 Nov 2005 19:59:37 -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: wine/dlls/msxml3/element.c diff -u -p wine/dlls/msxml3/element.c:1.10 wine/dlls/msxml3/element.c:1.11 --- wine/dlls/msxml3/element.c:1.10 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/element.c 8 Nov 2005 19:59:37 -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: wine/dlls/msxml3/domdoc.c diff -u -p wine/dlls/msxml3/domdoc.c:1.17 wine/dlls/msxml3/domdoc.c:1.18 --- wine/dlls/msxml3/domdoc.c:1.17 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/domdoc.c 8 Nov 2005 19:59:37 -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"
@@ -487,7 +485,7 @@ static HRESULT WINAPI domdoc_transformNo
static HRESULT WINAPI domdoc_get_doctype( IXMLDOMDocument *iface, - IXMLDOMDocument** documentType ) + IXMLDOMDocumentType** documentType ) { FIXME("\n"); return E_NOTIMPL;
-
Alexandre Julliard