include: Move coclass definitions to msxml2.idl.

This commit is contained in:
Alexandre Julliard 2010-11-10 11:43:20 +01:00
parent fd53e320c1
commit 6c90ebd5e5
4 changed files with 68 additions and 73 deletions

View file

@ -38,7 +38,6 @@
#include "initguid.h"
DEFINE_GUID(IID_IObjectSafety, 0xcb5bdc81, 0x93c1, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64);
DEFINE_GUID(CLSID_DOMDocument60, 0x88d96a05, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
static int g_unexpectedcall, g_expectedcall;

View file

@ -29,8 +29,6 @@
#include "wine/test.h"
#include "initguid.h"
typedef enum _CH {
CH_ENDTEST,
CH_PUTDOCUMENTLOCATOR,
@ -46,8 +44,6 @@ typedef enum _CH {
CH_SKIPPEDENTITY
} CH;
DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
static const WCHAR szSimpleXML[] = {
'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\"','1','.','0','\"',' ','?','>','\n',
'<','B','a','n','k','A','c','c','o','u','n','t','>','\n',

View file

@ -1323,6 +1323,15 @@ coclass DOMDocument40
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(88d96a05-f192-11d4-a65f-0040963251e5)
]
coclass DOMDocument60
{
[default] interface IXMLDOMDocument3;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(F6D90F12-9C73-11D3-B32E-00C04F990BB4)
]
@ -1359,6 +1368,15 @@ coclass FreeThreadedDOMDocument40
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(88d96a06-f192-11d4-a65f-0040963251e5),
]
coclass FreeThreadedDOMDocument60
{
[default] interface IXMLDOMDocument3;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(f5078f1e-c551-11d3-89b9-0000f81fe221)
]
@ -1421,7 +1439,15 @@ coclass XMLSchemaCache30
coclass XMLSchemaCache40
{
[default] interface IXMLDOMSchemaCollection2;
};
}
[
uuid(88d96a07-f192-11d4-a65f-0040963251e5)
]
coclass XMLSchemaCache60
{
[default] interface IXMLDOMSchemaCollection2;
}
[
uuid(2933BF94-7B36-11d2-B20E-00C04F983E60)
@ -2744,7 +2770,16 @@ coclass SAXXMLReader40
{
[default] interface IVBSAXXMLReader;
interface ISAXXMLReader;
};
}
[
uuid(88d96a0c-f192-11d4-a65f-0040963251e5)
]
coclass SAXXMLReader60
{
[default] interface IVBSAXXMLReader;
interface ISAXXMLReader;
}
[
uuid(fc220ad8-a72a-4ee8-926e-0b7ad152a020)
@ -2804,7 +2839,27 @@ coclass MXXMLWriter40
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
};
}
[
uuid(88d96a0f-f192-11d4-a65f-0040963251e5)
]
coclass MXXMLWriter60
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXDeclHandler;
interface ISAXDTDHandler;
interface ISAXErrorHandler;
interface ISAXLexicalHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
}
[
uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0)
@ -2836,6 +2891,16 @@ coclass SAXAttributes40
interface ISAXAttributes;
};
[
uuid(88d96a0e-f192-11d4-a65f-0040963251e5)
]
coclass SAXAttributes60
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
interface ISAXAttributes;
}
/*
* Error Codes
*/

View file

@ -19,68 +19,3 @@
#include <msxml6did.h>
import "msxml2.idl";
[
uuid(88d96a05-f192-11d4-a65f-0040963251e5)
]
coclass DOMDocument60
{
[default] interface IXMLDOMDocument3;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(88d96a06-f192-11d4-a65f-0040963251e5),
]
coclass FreeThreadedDOMDocument60
{
[default] interface IXMLDOMDocument3;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[
uuid(88d96a07-f192-11d4-a65f-0040963251e5)
]
coclass XMLSchemaCache60
{
[default] interface IXMLDOMSchemaCollection2;
}
[
uuid(88d96a0f-f192-11d4-a65f-0040963251e5)
]
coclass MXXMLWriter60
{
[default] interface IMXWriter;
interface ISAXContentHandler;
interface ISAXDeclHandler;
interface ISAXDTDHandler;
interface ISAXErrorHandler;
interface ISAXLexicalHandler;
interface IVBSAXContentHandler;
interface IVBSAXDeclHandler;
interface IVBSAXDTDHandler;
interface IVBSAXErrorHandler;
interface IVBSAXLexicalHandler;
}
[
uuid(88d96a0c-f192-11d4-a65f-0040963251e5)
]
coclass SAXXMLReader60
{
[default] interface IVBSAXXMLReader;
interface ISAXXMLReader;
}
[
uuid(88d96a0e-f192-11d4-a65f-0040963251e5)
]
coclass SAXAttributes60
{
[default] interface IMXAttributes;
interface IVBSAXAttributes;
interface ISAXAttributes;
}