Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
21fddfe2
Commit
21fddfe2
authored
14 years ago
by
Nikolay Sivov
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msxml3: Use proper naming and types for IObject* interfaces.
parent
b9956f75
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/msxml3/domdoc.c
+38
-42
38 additions, 42 deletions
dlls/msxml3/domdoc.c
with
38 additions
and
42 deletions
dlls/msxml3/domdoc.c
+
38
−
42
View file @
21fddfe2
...
...
@@ -2986,30 +2986,27 @@ void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid)
cp
->
container
=
(
IConnectionPointContainer
*
)
&
doc
->
lpVtblConnectionPointContainer
;
}
/*
xml
doc implementation of IObjectWithSite */
/*
dom
doc implementation of IObjectWithSite */
static
HRESULT
WINAPI
xml
doc_ObjectWithSite_QueryInterface
(
IObjectWithSite
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
dom
doc_ObjectWithSite_QueryInterface
(
IObjectWithSite
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
{
domdoc
*
This
=
impl_from_IObjectWithSite
(
iface
);
return
IXMLDocument_QueryInterface
(
(
IXMLDocument
*
)
This
,
riid
,
ppvObject
);
return
IXMLD
OMD
ocument
3
_QueryInterface
(
(
IXMLD
OMD
ocument
3
*
)
This
,
riid
,
ppvObject
);
}
static
ULONG
WINAPI
xmldoc_ObjectWithSite_AddRef
(
IObjectWithSite
*
iface
)
static
ULONG
WINAPI
domdoc_ObjectWithSite_AddRef
(
IObjectWithSite
*
iface
)
{
domdoc
*
This
=
impl_from_IObjectWithSite
(
iface
);
return
IXMLDocument_AddRef
((
IXMLDocument
*
)
This
);
return
IXMLD
OMD
ocument
3
_AddRef
((
IXMLD
OMD
ocument
3
*
)
This
);
}
static
ULONG
WINAPI
xmldoc_ObjectWithSite_Release
(
IObjectWithSite
*
iface
)
static
ULONG
WINAPI
domdoc_ObjectWithSite_Release
(
IObjectWithSite
*
iface
)
{
domdoc
*
This
=
impl_from_IObjectWithSite
(
iface
);
return
IXMLDocument_Release
((
IXMLDocument
*
)
This
);
return
IXMLD
OMD
ocument
3
_Release
((
IXMLD
OMD
ocument
3
*
)
This
);
}
static
HRESULT
WINAPI
xmldoc_GetSite
(
IObjectWithSite
*
iface
,
REFIID
iid
,
void
**
ppvSite
)
static
HRESULT
WINAPI
domdoc_ObjectWithSite_GetSite
(
IObjectWithSite
*
iface
,
REFIID
iid
,
void
**
ppvSite
)
{
domdoc
*
This
=
impl_from_IObjectWithSite
(
iface
);
...
...
@@ -3021,8 +3018,7 @@ xmldoc_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite )
return
IUnknown_QueryInterface
(
This
->
site
,
iid
,
ppvSite
);
}
static
HRESULT
WINAPI
xmldoc_SetSite
(
IObjectWithSite
*
iface
,
IUnknown
*
punk
)
static
HRESULT
WINAPI
domdoc_ObjectWithSite_SetSite
(
IObjectWithSite
*
iface
,
IUnknown
*
punk
)
{
domdoc
*
This
=
impl_from_IObjectWithSite
(
iface
);
...
...
@@ -3051,71 +3047,71 @@ xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk )
static
const
IObjectWithSiteVtbl
domdocObjectSite
=
{
xml
doc_ObjectWithSite_QueryInterface
,
xml
doc_ObjectWithSite_AddRef
,
xml
doc_ObjectWithSite_Release
,
xmldoc
_SetSite
,
xml
doc_GetSite
,
dom
doc_ObjectWithSite_QueryInterface
,
dom
doc_ObjectWithSite_AddRef
,
dom
doc_ObjectWithSite_Release
,
domdoc_ObjectWithSite
_SetSite
,
dom
doc_
ObjectWithSite_
GetSite
};
static
HRESULT
WINAPI
xml
doc_Safety_QueryInterface
(
IObjectSafety
*
iface
,
REFIID
riid
,
void
**
ppv
)
static
HRESULT
WINAPI
dom
doc_Safety_QueryInterface
(
IObjectSafety
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
domdoc
*
This
=
impl_from_IObjectSafety
(
iface
);
return
IXMLDocument_QueryInterface
(
(
IXMLDocument
*
)
This
,
riid
,
ppv
);
return
IXMLD
OMD
ocument
3
_QueryInterface
(
(
IXMLD
OMD
ocument
3
*
)
This
,
riid
,
ppv
);
}
static
ULONG
WINAPI
xml
doc_Safety_AddRef
(
IObjectSafety
*
iface
)
static
ULONG
WINAPI
dom
doc_Safety_AddRef
(
IObjectSafety
*
iface
)
{
domdoc
*
This
=
impl_from_IObjectSafety
(
iface
);
return
IXMLDocument_AddRef
((
IXMLDocument
*
)
This
);
return
IXMLD
OMD
ocument
3
_AddRef
((
IXMLD
OMD
ocument
3
*
)
This
);
}
static
ULONG
WINAPI
xml
doc_Safety_Release
(
IObjectSafety
*
iface
)
static
ULONG
WINAPI
dom
doc_Safety_Release
(
IObjectSafety
*
iface
)
{
domdoc
*
This
=
impl_from_IObjectSafety
(
iface
);
return
IXMLDocument_Release
((
IXMLDocument
*
)
This
);
return
IXMLD
OMD
ocument
3
_Release
((
IXMLD
OMD
ocument
3
*
)
This
);
}
#define SAFETY_SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER)
static
HRESULT
WINAPI
xml
doc_Safety_GetInterfaceSafetyOptions
(
IObjectSafety
*
iface
,
REFIID
riid
,
DWORD
*
pdwS
upported
Options
,
DWORD
*
pdwE
nabled
Options
)
static
HRESULT
WINAPI
dom
doc_Safety_GetInterfaceSafetyOptions
(
IObjectSafety
*
iface
,
REFIID
riid
,
DWORD
*
s
upported
,
DWORD
*
e
nabled
)
{
domdoc
*
This
=
impl_from_IObjectSafety
(
iface
);
TRACE
(
"(%p)->(%s %p %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
pdwS
upported
Options
,
pdwEnabledOptions
);
TRACE
(
"(%p)->(%s %p %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
s
upported
,
enabled
);
if
(
!
pdwSupportedOptions
||
!
pdwEnabledOptions
)
return
E_POINTER
;
if
(
!
supported
||
!
enabled
)
return
E_POINTER
;
*
pdwS
upported
Options
=
SAFETY_SUPPORTED_OPTIONS
;
*
pdwE
nabled
Options
=
This
->
safeopt
;
*
s
upported
=
SAFETY_SUPPORTED_OPTIONS
;
*
e
nabled
=
This
->
safeopt
;
return
S_OK
;
}
static
HRESULT
WINAPI
xml
doc_Safety_SetInterfaceSafetyOptions
(
IObjectSafety
*
iface
,
REFIID
riid
,
DWORD
dwOptionSetM
ask
,
DWORD
dwE
nabled
Options
)
static
HRESULT
WINAPI
dom
doc_Safety_SetInterfaceSafetyOptions
(
IObjectSafety
*
iface
,
REFIID
riid
,
DWORD
m
ask
,
DWORD
e
nabled
)
{
domdoc
*
This
=
impl_from_IObjectSafety
(
iface
);
TRACE
(
"(%p)->(%s %x %x)
\n
"
,
This
,
debugstr_guid
(
riid
),
dwOptionSetM
ask
,
dwE
nabled
Options
);
TRACE
(
"(%p)->(%s %x %x)
\n
"
,
This
,
debugstr_guid
(
riid
),
m
ask
,
e
nabled
);
if
((
dwOptionSetM
ask
&
~
SAFETY_SUPPORTED_OPTIONS
)
!=
0
)
if
((
m
ask
&
~
SAFETY_SUPPORTED_OPTIONS
)
!=
0
)
return
E_FAIL
;
This
->
safeopt
=
dwE
nabled
Options
&
dwOptionSetM
ask
&
SAFETY_SUPPORTED_OPTIONS
;
This
->
safeopt
=
e
nabled
&
m
ask
&
SAFETY_SUPPORTED_OPTIONS
;
return
S_OK
;
}
#undef SAFETY_SUPPORTED_OPTIONS
static
const
IObjectSafetyVtbl
domdocObjectSafetyVtbl
=
{
xml
doc_Safety_QueryInterface
,
xml
doc_Safety_AddRef
,
xml
doc_Safety_Release
,
xml
doc_Safety_GetInterfaceSafetyOptions
,
xml
doc_Safety_SetInterfaceSafetyOptions
dom
doc_Safety_QueryInterface
,
dom
doc_Safety_AddRef
,
dom
doc_Safety_Release
,
dom
doc_Safety_GetInterfaceSafetyOptions
,
dom
doc_Safety_SetInterfaceSafetyOptions
};
static
const
tid_t
domdoc_iface_tids
[]
=
{
IXMLDOMNode_tid
,
IXMLDOMDocument_tid
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment