Module: wine Branch: master Commit: fd53e320c1395dd459dd1c6a70819722c90a6c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd53e320c1395dd459dd1c6a70...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 10 10:23:46 2010 +0100
include: Move IXMLDOMDocument3 definition to msxml2.idl.
---
include/msxml2.idl | 21 +++++++++++++++++++++ include/msxml2did.h | 5 +++++ include/msxml6.idl | 21 --------------------- include/msxml6did.h | 5 +---- 4 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/include/msxml2.idl b/include/msxml2.idl index 9a5fe1d..0235e18 100644 --- a/include/msxml2.idl +++ b/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, diff --git a/include/msxml2did.h b/include/msxml2did.h index d7489d0..2bbe3bf 100644 --- a/include/msxml2did.h +++ b/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 diff --git a/include/msxml6.idl b/include/msxml6.idl index 5b14e47..62d680e 100644 --- a/include/msxml6.idl +++ b/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 diff --git a/include/msxml6did.h b/include/msxml6did.h index 192976f..1e52578 100644 --- a/include/msxml6did.h +++ b/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__ */