include: Move IXMLDOMDocument3 definition to msxml2.idl.

include/msxml2.idl

@@ -632,6 +632,27 @@ interface IXMLDOMDocument2 : IXMLDOMDocument
 }
 
 [
+    local,
+    object,
+    dual,
+    uuid(2933bf96-7b36-11d2-b20e-00c04f983e60),
+    oleautomation,
+]
+interface IXMLDOMDocument3 : IXMLDOMDocument2
+{
+    [id(DISPID_XMLDOM_DOCUMENT3_VALIDATENODE)]
+    HRESULT validateNode(
+        [in] IXMLDOMNode *node,
+        [out, retval] IXMLDOMParseError **error);
+
+    [id(DISPID_XMLDOM_DOCUMENT3_IMPORTNODE)]
+    HRESULT importNode(
+        [in] IXMLDOMNode *node,
+        [in] VARIANT_BOOL deep,
+        [out, retval] IXMLDOMNode **clone);
+}
+
+[
 local,
 object,
 dual,

include/msxml2did.h

@@ -224,6 +224,11 @@
 #define DISPID_XMLDOM_DOCUMENT2_GETPROPERTY    0x000000cc
 #define DISPID_XMLDOM_DOCUMENT2__TOP           0x000000cd
 
+#define DISPID_XMLDOM_DOCUMENT3                0x000000ce
+#define DISPID_XMLDOM_DOCUMENT3_VALIDATENODE   0x000000cf
+#define DISPID_XMLDOM_DOCUMENT3_IMPORTNODE     0x000000d0
+#define DISPID_XMLDOM_DOCUMENT3__TOP           0x000000d1
+
 #define DISPID_XMLDOM_SCHEMACOLLECTION                 0x00000002
 #define DISPID_XMLDOM_SCHEMACOLLECTION_ADD             0x00000003
 #define DISPID_XMLDOM_SCHEMACOLLECTION_GET             0x00000004

include/msxml6.idl

@@ -39,27 +39,6 @@ coclass FreeThreadedDOMDocument60
 }
 
 [
-    local,
-    object,
-    dual,
-    uuid(2933bf96-7b36-11d2-b20e-00c04f983e60),
-    oleautomation,
-]
-interface IXMLDOMDocument3 : IXMLDOMDocument2
-{
-    [id(DISPID_XMLDOM_DOCUMENT3_VALIDATENODE)]
-    HRESULT validateNode(
-        [in] IXMLDOMNode *node,
-        [out, retval] IXMLDOMParseError **error);
-
-    [id(DISPID_XMLDOM_DOCUMENT3_IMPORTNODE)]
-    HRESULT importNode(
-        [in] IXMLDOMNode *node,
-        [in] VARIANT_BOOL deep,
-        [out, retval] IXMLDOMNode **clone);
-}
-
-[
     uuid(88d96a07-f192-11d4-a65f-0040963251e5)
 ]
 coclass XMLSchemaCache60

include/msxml6did.h

@@ -19,9 +19,6 @@
 #ifndef __MSXML6DID_H__
 #define __MSXML6DID_H__
 
-#define DISPID_XMLDOM_DOCUMENT3                0x000000ce
-#define DISPID_XMLDOM_DOCUMENT3_VALIDATENODE   0x000000cf
-#define DISPID_XMLDOM_DOCUMENT3_IMPORTNODE     0x000000d0
-#define DISPID_XMLDOM_DOCUMENT3__TOP           0x000000d1
+#include <msxml2did.h>
 
 #endif /* __MSXML6DID_H__ */