Huw Davies : msxml3: Add the CLSID_DOMDocument define in msxml2. idl to match the PSDK.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9e1284df231cfb8da78b66ea29a1d39b1c900990
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9e1284df231cfb8da78b66ea29...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Mon Nov 13 15:31:45 2006 +0000

msxml3: Add the CLSID_DOMDocument define in msxml2.idl to match the PSDK.

---

 dlls/msxml3/factory.c      |    6 ++++++
 dlls/msxml3/tests/domdoc.c |    2 ++
 include/msxml2.idl         |    3 +++
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index 5d15751..3d042bc 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -26,8 +26,14 @@ #include "windef.h"
 #include "winbase.h"
 #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
+   independent CLSID as well as the v.3 one. */
+#undef CLSID_DOMDocument
+
 #include "wine/debug.h"
 
 #include "msxml_private.h"
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 547436b..f082991 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -28,6 +28,8 @@ #include <stdio.h>
 
 #include "wine/test.h"
 
+const CLSID CLSID_DOMDocument2 = {0xf6d90f11, 0x9c73, 0x11d3, {0xb3, 0x2e, 0x00,0xc0, 0x4f, 0x99, 0x0b, 0xb4}};
+
 static const WCHAR szEmpty[] = { 0 };
 static const WCHAR szIncomplete[] = {
     '<','?','x','m','l',' ',
diff --git a/include/msxml2.idl b/include/msxml2.idl
index dc50aad..fb32a79 100644
--- a/include/msxml2.idl
+++ b/include/msxml2.idl
@@ -47,6 +47,9 @@ interface IXTLRuntime;
 interface IXSLTemplate;
 interface IXSLProcessor;
 
+cpp_quote("#define DOMDocument DOMDocument2")
+cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2")
+
 cpp_quote("#ifndef __WIDL_XMLDOM_H")
 typedef enum tagDOMNodeType 
 {