Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
40fdc88e
Commit
40fdc88e
authored
Dec 19, 2008
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Dec 20, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Add ISupportErrorInfo interface to IXMLDOMDocument.
parent
c5c29c28
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
0 deletions
+60
-0
domdoc.c
dlls/msxml3/domdoc.c
+50
-0
domdoc.c
dlls/msxml3/tests/domdoc.c
+10
-0
No files found.
dlls/msxml3/domdoc.c
View file @
40fdc88e
...
...
@@ -57,6 +57,7 @@ typedef struct _domdoc
const
struct
IPersistStreamVtbl
*
lpvtblIPersistStream
;
const
struct
IObjectWithSiteVtbl
*
lpvtblIObjectWithSite
;
const
struct
IObjectSafetyVtbl
*
lpvtblIObjectSafety
;
const
struct
ISupportErrorInfoVtbl
*
lpvtblISupportErrorInfo
;
LONG
ref
;
VARIANT_BOOL
async
;
VARIANT_BOOL
validating
;
...
...
@@ -248,6 +249,10 @@ static inline domdoc *impl_from_IObjectSafety(IObjectSafety *iface)
return
(
domdoc
*
)((
char
*
)
iface
-
FIELD_OFFSET
(
domdoc
,
lpvtblIObjectSafety
));
}
static
inline
domdoc
*
impl_from_ISupportErrorInfo
(
ISupportErrorInfo
*
iface
)
{
return
(
domdoc
*
)((
char
*
)
iface
-
FIELD_OFFSET
(
domdoc
,
lpvtblISupportErrorInfo
));
}
/************************************************************************
* xmldoc implementation of IPersistStream.
...
...
@@ -375,6 +380,46 @@ static const IPersistStreamVtbl xmldoc_IPersistStream_VTable =
xmldoc_IPersistStream_GetSizeMax
,
};
/* ISupportErrorInfo interface */
static
HRESULT
WINAPI
support_error_QueryInterface
(
ISupportErrorInfo
*
iface
,
REFIID
riid
,
void
**
ppvObj
)
{
domdoc
*
This
=
impl_from_ISupportErrorInfo
(
iface
);
return
IXMLDocument_QueryInterface
((
IXMLDocument
*
)
This
,
riid
,
ppvObj
);
}
static
ULONG
WINAPI
support_error_AddRef
(
ISupportErrorInfo
*
iface
)
{
domdoc
*
This
=
impl_from_ISupportErrorInfo
(
iface
);
return
IXMLDocument_AddRef
((
IXMLDocument
*
)
This
);
}
static
ULONG
WINAPI
support_error_Release
(
ISupportErrorInfo
*
iface
)
{
domdoc
*
This
=
impl_from_ISupportErrorInfo
(
iface
);
return
IXMLDocument_Release
((
IXMLDocument
*
)
This
);
}
static
HRESULT
WINAPI
support_error_InterfaceSupportsErrorInfo
(
ISupportErrorInfo
*
iface
,
REFIID
riid
)
{
FIXME
(
"(%p)->(%s)
\n
"
,
iface
,
debugstr_guid
(
riid
));
return
S_FALSE
;
}
static
const
struct
ISupportErrorInfoVtbl
support_error_vtbl
=
{
support_error_QueryInterface
,
support_error_AddRef
,
support_error_Release
,
support_error_InterfaceSupportsErrorInfo
};
/* IXMLDOMDocument2 interface */
static
HRESULT
WINAPI
domdoc_QueryInterface
(
IXMLDOMDocument2
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
{
domdoc
*
This
=
impl_from_IXMLDOMDocument2
(
iface
);
...
...
@@ -402,6 +447,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii
{
*
ppvObject
=
(
IObjectWithSite
*
)
&
(
This
->
lpvtblIObjectWithSite
);
}
else
if
(
IsEqualGUID
(
riid
,
&
IID_ISupportErrorInfo
))
{
*
ppvObject
=
&
This
->
lpvtblISupportErrorInfo
;
}
else
if
(
dispex_query_interface
(
&
This
->
dispex
,
riid
,
ppvObject
))
{
return
*
ppvObject
?
S_OK
:
E_NOINTERFACE
;
...
...
@@ -2138,6 +2187,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **docu
doc
->
lpvtblIPersistStream
=
&
xmldoc_IPersistStream_VTable
;
doc
->
lpvtblIObjectWithSite
=
&
domdocObjectSite
;
doc
->
lpvtblIObjectSafety
=
&
domdocObjectSafetyVtbl
;
doc
->
lpvtblISupportErrorInfo
=
&
support_error_vtbl
;
doc
->
ref
=
1
;
doc
->
async
=
0
;
doc
->
validating
=
0
;
...
...
dlls/msxml3/tests/domdoc.c
View file @
40fdc88e
...
...
@@ -400,6 +400,7 @@ static void test_domdoc( void )
IXMLDOMAttribute
*
node_attr
=
NULL
;
IXMLDOMNode
*
nodeChild
=
NULL
;
IXMLDOMProcessingInstruction
*
nodePI
=
NULL
;
ISupportErrorInfo
*
support_error
=
NULL
;
VARIANT_BOOL
b
;
VARIANT
var
;
BSTR
str
;
...
...
@@ -862,6 +863,15 @@ static void test_domdoc( void )
IXMLDOMProcessingInstruction_Release
(
nodePI
);
}
r
=
IXMLDOMDocument_QueryInterface
(
doc
,
&
IID_ISupportErrorInfo
,
(
LPVOID
*
)
&
support_error
);
ok
(
r
==
S_OK
,
"ret %08x
\n
"
,
r
);
if
(
r
==
S_OK
)
{
r
=
ISupportErrorInfo_InterfaceSupportsErrorInfo
(
support_error
,
&
IID_IXMLDOMDocument
);
todo_wine
ok
(
r
==
S_OK
,
"ret %08x
\n
"
,
r
);
ISupportErrorInfo_Release
(
support_error
);
}
r
=
IXMLDOMDocument_Release
(
doc
);
ok
(
r
==
0
,
"document ref count incorrect
\n
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment