Include msxml2.h rather than msxml.h and xmldom.h.

This commit is contained in:
Huw Davies 2005-11-08 19:59:36 +00:00 committed by Alexandre Julliard
parent 7e6b325929
commit 5b8be5dca6
10 changed files with 12 additions and 32 deletions

View File

@ -28,9 +28,7 @@
#include "winuser.h" #include "winuser.h"
#include "winnls.h" #include "winnls.h"
#include "ole2.h" #include "ole2.h"
#include "ocidl.h" #include "msxml2.h"
#include "msxml.h"
#include "xmldom.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -487,7 +485,7 @@ static HRESULT WINAPI domdoc_transformNodeToObject(
static HRESULT WINAPI domdoc_get_doctype( static HRESULT WINAPI domdoc_get_doctype(
IXMLDOMDocument *iface, IXMLDOMDocument *iface,
IXMLDOMDocument** documentType ) IXMLDOMDocumentType** documentType )
{ {
FIXME("\n"); FIXME("\n");
return E_NOTIMPL; return E_NOTIMPL;

View File

@ -27,10 +27,7 @@
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "ole2.h" #include "ole2.h"
#include "ocidl.h" #include "msxml2.h"
#include "msxml.h"
#include "xmldom.h"
#include "msxml.h"
#include "msxml_private.h" #include "msxml_private.h"

View File

@ -26,9 +26,7 @@
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "ole2.h" #include "ole2.h"
#include "uuids.h" #include "msxml2.h"
#include "msxml.h"
#include "xmldom.h"
#include "wine/debug.h" #include "wine/debug.h"

View File

@ -27,6 +27,7 @@
#include "winuser.h" #include "winuser.h"
#include "winreg.h" #include "winreg.h"
#include "ole2.h" #include "ole2.h"
#include "msxml2.h"
#include "wine/debug.h" #include "wine/debug.h"

View File

@ -21,8 +21,6 @@
#ifndef __MSXML_PRIVATE__ #ifndef __MSXML_PRIVATE__
#define __MSXML_PRIVATE__ #define __MSXML_PRIVATE__
#include "xmldom.h"
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
#ifdef HAVE_LIBXML_PARSER_H #ifdef HAVE_LIBXML_PARSER_H

View File

@ -29,10 +29,7 @@
#include "winuser.h" #include "winuser.h"
#include "winnls.h" #include "winnls.h"
#include "ole2.h" #include "ole2.h"
#include "ocidl.h" #include "msxml2.h"
#include "msxml.h"
#include "xmldom.h"
#include "msxml.h"
#include "msxml_private.h" #include "msxml_private.h"

View File

@ -26,12 +26,8 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "ole2.h" #include "ole2.h"
#include "ocidl.h" #include "msxml2.h"
#include "msxml.h"
#include "xmldom.h"
#include "msxml.h"
#include "msxml_private.h" #include "msxml_private.h"

View File

@ -28,10 +28,7 @@
#include "winuser.h" #include "winuser.h"
#include "winnls.h" #include "winnls.h"
#include "ole2.h" #include "ole2.h"
#include "ocidl.h" #include "msxml2.h"
#include "msxml.h"
#include "xmldom.h"
#include "msxml.h"
#include "msxml_private.h" #include "msxml_private.h"

View File

@ -28,8 +28,7 @@
#include "winerror.h" #include "winerror.h"
#include "winuser.h" #include "winuser.h"
#include "ole2.h" #include "ole2.h"
#include "msxml.h" #include "msxml2.h"
#include "xmldom.h"
#include "msxml_private.h" #include "msxml_private.h"

View File

@ -23,8 +23,7 @@
#include "windows.h" #include "windows.h"
#include "ole2.h" #include "ole2.h"
#include "msxml.h" #include "msxml2.h"
#include "xmldom.h"
#include <stdio.h> #include <stdio.h>
#include "wine/test.h" #include "wine/test.h"
@ -235,7 +234,7 @@ void test_domdoc( void )
ok( code == 0, "code %ld\n", code ); ok( code == 0, "code %ld\n", code );
IXMLDOMParseError_Release( error ); IXMLDOMParseError_Release( error );
r = IXMLDocument_Release( doc ); r = IXMLDOMDocument_Release( doc );
ok( r == 0, "document ref count incorrect\n"); ok( r == 0, "document ref count incorrect\n");
} }
@ -503,7 +502,7 @@ void test_domnode( void )
if (element) if (element)
IXMLDOMElement_Release( element ); IXMLDOMElement_Release( element );
if (doc) if (doc)
IXMLDocument_Release( doc ); IXMLDOMDocument_Release( doc );
} }
START_TEST(domdoc) START_TEST(domdoc)