include: Correctly define the msxml typelib by directly including xmldom.idl and xmldso.idl.

.gitignore

@@ -252,8 +252,6 @@ include/wine/winedxgi.h
 include/winsxs.h
 include/wtypes.h
 include/wuapi.h
-include/xmldom.h
-include/xmldso.h
 include/xmllite.h
 libs/wpp/ppl.yy.c
 libs/wpp/ppy.tab.c

dlls/gameux/gameexplorer.c

@@ -23,7 +23,6 @@
 
 #include "ole2.h"
 #include "sddl.h"
-#include "xmldom.h"
 
 #include "gameux.h"
 #include "gameux_private.h"

dlls/mscoree/mscoree_main.c

@@ -32,8 +32,6 @@
 #include "ole2.h"
 #include "ocidl.h"
 #include "shellapi.h"
-#include "xmldom.h"
-#include "xmldso.h"
 
 #include "initguid.h"
 #include "msxml2.h"

dlls/msxml3/factory.c

@@ -29,7 +29,6 @@
 #include "winuser.h"
 #include "ole2.h"
 #include "msxml.h"
-#include "xmldom.h"
 #include "msxml2.h"
 
 /* undef the #define in msxml2 so that we can access the v.2 version

dlls/msxml3/regsvr.c

@@ -34,8 +34,6 @@
 #include "winerror.h"
 #include "ole2.h"
 #include "msxml.h"
-#include "xmldom.h"
-#include "xmldso.h"
 #include "msxml6.h"
 
 /* undef the #define in msxml2 so that we can access the v.2 version

dlls/msxml3/tests/domdoc.c

@@ -26,7 +26,6 @@
 #include "windows.h"
 #include "ole2.h"
 #include "objsafe.h"
-#include "xmldom.h"
 #include "msxml2.h"
 #include "msxml2did.h"
 #include "dispex.h"

dlls/msxml3/tests/schema.c

@@ -26,7 +26,6 @@
 #include "initguid.h"
 #include "windows.h"
 #include "ole2.h"
-#include "xmldom.h"
 #include "msxml2.h"
 #include "dispex.h"
 

dlls/msxml3/tests/xmlelem.c

@@ -24,7 +24,6 @@
 
 #include "windows.h"
 #include "ole2.h"
-#include "xmldom.h"
 #include "msxml2.h"
 #include "ocidl.h"
 

dlls/msxml3/uuid.c

@@ -35,8 +35,6 @@
  * First include the version 2 headers so that we don't redefine their
  * uuids - they're already in libuuid
  */
-#include "xmldom.h"
-#include "xmldso.h"
 #include "msxml.h"
 
 /* Now we can initialize the rest of the uuids */

dlls/uuid/uuid.c

@@ -63,8 +63,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 #include "mshtml.h"
 #include "mshtmhst.h"
 #include "richole.h"
-#include "xmldom.h"
-#include "xmldso.h"
 #include "downloadmgr.h"
 #include "objsel.h"
 #include "hlink.h"

include/Makefile.in

@@ -101,8 +101,6 @@ PUBLIC_IDL_H_SRCS = \
 	winsxs.idl \
 	wtypes.idl \
 	wuapi.idl \
-	xmldom.idl \
-	xmldso.idl \
 	xmllite.idl
 
 IDL_TLB_SRCS = \
@@ -549,7 +547,10 @@ SRCDIR_INCLUDES = \
 	wtsapi32.h \
 	xcmc.h \
 	xinput.h \
+	xmldom.h \
+	xmldom.idl \
 	xmldomdid.h \
+	xmldso.idl \
 	xmldsodid.h \
 	zmouse.h
 

include/msxml.idl

@@ -18,6 +18,8 @@
  */
 
 #include <msxmldid.h>
+#include <msxml2did.h>
+#include <idispids.h>
 
 #ifndef DO_NO_IMPORTS
 import "unknwn.idl";
@@ -27,6 +29,19 @@ import "oaidl.idl";
 #endif
 
 [
+    uuid(d63e0ce2-a0a2-11d0-9c02-00c04fc99c8e),
+    version(2.0),
+    helpstring("Microsoft XML, v2.0")
+]
+library MSXML
+{
+
+importlib("stdole2.tlb");
+
+#include <xmldom.idl>
+#include <xmldso.idl>
+
+[
 local,
 object,
 odl,
@@ -334,3 +349,5 @@ coclass XMLDocument
 {
     [default] interface IXMLDocument;
 }
+
+} /* Library MSXML */

include/msxml2.idl

@@ -107,7 +107,8 @@ interface ISchemaNotation;
 cpp_quote("#define DOMDocument DOMDocument2")
 cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2")
 
-cpp_quote("#ifndef __WIDL_XMLDOM_H")
+cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED")
+cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED")
 typedef enum tagDOMNodeType 
 {  
     NODE_INVALID  		= 0,
@@ -124,7 +125,7 @@ typedef enum tagDOMNodeType
     NODE_DOCUMENT_FRAGMENT 	= 11,
     NODE_NOTATION 		= 12
 } DOMNodeType;
-cpp_quote("#endif   /* __WIDL_XMLDOM_H */")
+cpp_quote("#endif")
 
 typedef enum _SOMITEMTYPE
 {

include/msxml6.idl

@@ -113,7 +113,8 @@ interface ISchemaNotation;
 cpp_quote("#define DOMDocument DOMDocument2")
 cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2")
 
-cpp_quote("#ifndef __WIDL_XMLDOM_H")
+cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED")
+cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED")
 typedef enum tagDOMNodeType
 {
     NODE_INVALID  		= 0,
@@ -130,7 +131,7 @@ typedef enum tagDOMNodeType
     NODE_DOCUMENT_FRAGMENT 	= 11,
     NODE_NOTATION 		= 12
 } DOMNodeType;
-cpp_quote("#endif   /* __WIDL_XMLDOM_H */")
+cpp_quote("#endif")
 
 typedef enum _SOMITEMTYPE
 {

include/xmldom.h

+/*
+ * Copyright 2010 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* xmldom.idl is included by msxml.idl so it doesn't need a stand-alone header */
+#include <msxml.h>

include/xmldom.idl

@@ -19,8 +19,6 @@
 #include <xmldomdid.h>
 #include <idispids.h>
 
-import "ocidl.idl";
-
 interface IXMLDOMImplementation;
 interface IXMLDOMNode;
 interface IXMLDOMDocumentFragment;
@@ -39,8 +37,9 @@ interface IXMLDOMNotation;
 interface IXMLDOMEntity;
 interface IXMLDOMEntityReference;
 interface IXMLDOMParseError;
-interface IXTLRuntime;
 
+cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED")
+cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED")
 typedef enum tagDOMNodeType {
     NODE_INVALID,
     NODE_ELEMENT,
@@ -56,6 +55,7 @@ typedef enum tagDOMNodeType {
     NODE_DOCUMENT_FRAGMENT,
     NODE_NOTATION
 } DOMNodeType;
+cpp_quote("#endif")
 
 [
 local,

include/xmldso.idl

@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-import "wtypes.idl";
-import "ocidl.idl";
-
 #include <idispids.h>
 #include <xmldsodid.h>
 

tools/make_makefiles

@@ -156,6 +156,8 @@ my %private_idl_headers = (
     "rstloc.idl" => 1,
     "sesprp.idl" => 1,
     "vmrender.idl" => 1,
+    "xmldom.idl" => 1,
+    "xmldso.idl" => 1,
     "wine/wined3d.idl" => 1,
     "wine/winedxgi.idl" => 1,
 );