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
Lorenzo Ferrillo
wine
Commits
e983db85
Commit
e983db85
authored
13 years ago
by
Nikolay Sivov
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msxml3: Internally call methods with interface macros.
parent
85cf92ae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/msxml3/domdoc.c
+20
-20
20 additions, 20 deletions
dlls/msxml3/domdoc.c
dlls/msxml3/pi.c
+11
-11
11 additions, 11 deletions
dlls/msxml3/pi.c
dlls/msxml3/text.c
+4
-4
4 additions, 4 deletions
dlls/msxml3/text.c
with
35 additions
and
35 deletions
dlls/msxml3/domdoc.c
+
20
−
20
View file @
e983db85
...
...
@@ -672,28 +672,28 @@ static inline domdoc *impl_from_IConnectionPointContainer(IConnectionPointContai
/************************************************************************
* domdoc implementation of IPersistStream.
*/
static
HRESULT
WINAPI
domdoc_I
PersistStreamInit_QueryInterface
(
static
HRESULT
WINAPI
PersistStreamInit_QueryInterface
(
IPersistStreamInit
*
iface
,
REFIID
riid
,
void
**
ppvObj
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
return
IXMLDOMDocument3_QueryInterface
(
&
This
->
IXMLDOMDocument3_iface
,
riid
,
ppvObj
);
}
static
ULONG
WINAPI
domdoc_I
PersistStreamInit_AddRef
(
static
ULONG
WINAPI
PersistStreamInit_AddRef
(
IPersistStreamInit
*
iface
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
return
IXMLDOMDocument3_AddRef
(
&
This
->
IXMLDOMDocument3_iface
);
}
static
ULONG
WINAPI
domdoc_I
PersistStreamInit_Release
(
static
ULONG
WINAPI
PersistStreamInit_Release
(
IPersistStreamInit
*
iface
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
return
IXMLDOMDocument3_Release
(
&
This
->
IXMLDOMDocument3_iface
);
}
static
HRESULT
WINAPI
domdoc_I
PersistStreamInit_GetClassID
(
static
HRESULT
WINAPI
PersistStreamInit_GetClassID
(
IPersistStreamInit
*
iface
,
CLSID
*
classid
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
...
...
@@ -707,7 +707,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_GetClassID(
return
S_OK
;
}
static
HRESULT
WINAPI
domdoc_I
PersistStreamInit_IsDirty
(
static
HRESULT
WINAPI
PersistStreamInit_IsDirty
(
IPersistStreamInit
*
iface
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
...
...
@@ -715,7 +715,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_IsDirty(
return
S_FALSE
;
}
static
HRESULT
WINAPI
domdoc_I
PersistStreamInit_Load
(
static
HRESULT
WINAPI
PersistStreamInit_Load
(
IPersistStreamInit
*
iface
,
LPSTREAM
pStm
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
...
...
@@ -768,7 +768,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load(
return
attach_xmldoc
(
This
,
xmldoc
);
}
static
HRESULT
WINAPI
domdoc_I
PersistStreamInit_Save
(
static
HRESULT
WINAPI
PersistStreamInit_Save
(
IPersistStreamInit
*
iface
,
IStream
*
stream
,
BOOL
clr_dirty
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
...
...
@@ -791,7 +791,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Save(
return
hr
;
}
static
HRESULT
WINAPI
domdoc_I
PersistStreamInit_GetSizeMax
(
static
HRESULT
WINAPI
PersistStreamInit_GetSizeMax
(
IPersistStreamInit
*
iface
,
ULARGE_INTEGER
*
pcbSize
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
...
...
@@ -799,7 +799,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_GetSizeMax(
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
domdoc_I
PersistStreamInit_InitNew
(
static
HRESULT
WINAPI
PersistStreamInit_InitNew
(
IPersistStreamInit
*
iface
)
{
domdoc
*
This
=
impl_from_IPersistStreamInit
(
iface
);
...
...
@@ -809,15 +809,15 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_InitNew(
static
const
IPersistStreamInitVtbl
xmldoc_IPersistStreamInit_VTable
=
{
domdoc_I
PersistStreamInit_QueryInterface
,
domdoc_I
PersistStreamInit_AddRef
,
domdoc_I
PersistStreamInit_Release
,
domdoc_I
PersistStreamInit_GetClassID
,
domdoc_I
PersistStreamInit_IsDirty
,
domdoc_I
PersistStreamInit_Load
,
domdoc_I
PersistStreamInit_Save
,
domdoc_I
PersistStreamInit_GetSizeMax
,
domdoc_I
PersistStreamInit_InitNew
PersistStreamInit_QueryInterface
,
PersistStreamInit_AddRef
,
PersistStreamInit_Release
,
PersistStreamInit_GetClassID
,
PersistStreamInit_IsDirty
,
PersistStreamInit_Load
,
PersistStreamInit_Save
,
PersistStreamInit_GetSizeMax
,
PersistStreamInit_InitNew
};
/* IXMLDOMDocument3 interface */
...
...
@@ -2665,7 +2665,7 @@ static HRESULT WINAPI domdoc_validateNode(
int
validated
=
0
;
TRACE
(
"(%p)->(%p, %p)
\n
"
,
This
,
node
,
err
);
domdoc
_get_readyState
(
iface
,
&
state
);
IXMLDOMDocument3
_get_readyState
(
iface
,
&
state
);
if
(
state
!=
READYSTATE_COMPLETE
)
{
if
(
err
)
...
...
@@ -2760,7 +2760,7 @@ static HRESULT WINAPI domdoc_validate(
{
domdoc
*
This
=
impl_from_IXMLDOMDocument3
(
iface
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
err
);
return
domdoc
_validateNode
(
iface
,
(
IXMLDOMNode
*
)
iface
,
err
);
return
IXMLDOMDocument3
_validateNode
(
iface
,
(
IXMLDOMNode
*
)
iface
,
err
);
}
static
HRESULT
WINAPI
domdoc_setProperty
(
...
...
This diff is collapsed.
Click to expand it.
dlls/msxml3/pi.c
+
11
−
11
View file @
e983db85
...
...
@@ -222,23 +222,23 @@ static HRESULT WINAPI dom_pi_put_nodeValue(
VARIANT
value
)
{
dom_pi
*
This
=
impl_from_IXMLDOMProcessingInstruction
(
iface
);
BSTR
sT
arget
;
BSTR
t
arget
;
HRESULT
hr
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
value
));
/* Cannot set data to a PI node whose target is 'xml' */
hr
=
dom_pi
_get_nodeName
(
iface
,
&
sT
arget
);
hr
=
IXMLDOMProcessingInstruction
_get_nodeName
(
iface
,
&
t
arget
);
if
(
hr
==
S_OK
)
{
static
const
WCHAR
xmlW
[]
=
{
'x'
,
'm'
,
'l'
,
0
};
if
(
l
strcmpW
(
sT
arget
,
xmlW
)
==
0
)
if
(
!
strcmpW
(
t
arget
,
xmlW
))
{
SysFreeString
(
sT
arget
);
SysFreeString
(
t
arget
);
return
E_FAIL
;
}
SysFreeString
(
sT
arget
);
SysFreeString
(
t
arget
);
}
return
node_put_value
(
&
This
->
node
,
&
value
);
...
...
@@ -637,24 +637,24 @@ static HRESULT WINAPI dom_pi_put_data(
BSTR
data
)
{
dom_pi
*
This
=
impl_from_IXMLDOMProcessingInstruction
(
iface
);
HRESULT
hr
;
VARIANT
val
;
BSTR
sTarget
;
BSTR
target
;
HRESULT
hr
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
data
)
);
/* Cannot set data to a PI node whose target is 'xml' */
hr
=
dom_pi
_get_nodeName
(
iface
,
&
sT
arget
);
hr
=
IXMLDOMProcessingInstruction
_get_nodeName
(
iface
,
&
t
arget
);
if
(
hr
==
S_OK
)
{
static
const
WCHAR
xmlW
[]
=
{
'x'
,
'm'
,
'l'
,
0
};
if
(
l
strcmpW
(
sT
arget
,
xmlW
)
==
0
)
if
(
!
strcmpW
(
t
arget
,
xmlW
))
{
SysFreeString
(
sT
arget
);
SysFreeString
(
t
arget
);
return
E_FAIL
;
}
SysFreeString
(
sT
arget
);
SysFreeString
(
t
arget
);
}
V_VT
(
&
val
)
=
VT_BSTR
;
...
...
This diff is collapsed.
Click to expand it.
dlls/msxml3/text.c
+
4
−
4
View file @
e983db85
...
...
@@ -406,7 +406,7 @@ static HRESULT WINAPI domtext_get_nodeTypedValue(
if
(
!
var1
)
return
E_INVALIDARG
;
hr
=
domt
ext_get_parentNode
(
iface
,
&
parent
);
hr
=
IXMLDOMT
ext_get_parentNode
(
iface
,
&
parent
);
if
(
hr
==
S_OK
)
{
...
...
@@ -433,7 +433,7 @@ static HRESULT WINAPI domtext_put_nodeTypedValue(
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
value
));
hr
=
domt
ext_get_parentNode
(
iface
,
&
parent
);
hr
=
IXMLDOMT
ext_get_parentNode
(
iface
,
&
parent
);
if
(
hr
==
S_OK
)
{
...
...
@@ -461,7 +461,7 @@ static HRESULT WINAPI domtext_get_dataType(
if
(
!
dtName
)
return
E_INVALIDARG
;
hr
=
domt
ext_get_parentNode
(
iface
,
&
parent
);
hr
=
IXMLDOMT
ext_get_parentNode
(
iface
,
&
parent
);
if
(
hr
==
S_OK
)
{
...
...
@@ -491,7 +491,7 @@ static HRESULT WINAPI domtext_put_dataType(
if
(
!
dtName
)
return
E_INVALIDARG
;
hr
=
domt
ext_get_parentNode
(
iface
,
&
parent
);
hr
=
IXMLDOMT
ext_get_parentNode
(
iface
,
&
parent
);
if
(
hr
==
S_OK
)
{
...
...
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