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
5ab513bd
Commit
5ab513bd
authored
Jun 20, 2011
by
Adam Martinson
Committed by
Alexandre Julliard
Jun 21, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Fix a couple incorrect uses of VariantChangeType().
parent
809dd1a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
10 deletions
+13
-10
element.c
dlls/msxml3/element.c
+9
-7
httprequest.c
dlls/msxml3/httprequest.c
+4
-3
No files found.
dlls/msxml3/element.c
View file @
5ab513bd
...
...
@@ -761,21 +761,24 @@ static HRESULT WINAPI domelem_put_nodeTypedValue(
VARIANT
value
)
{
domelem
*
This
=
impl_from_IXMLDOMElement
(
iface
);
VARIANT
type
;
XDR_DT
dt
;
HRESULT
hr
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
value
));
dt
=
element_get_dt
(
get_element
(
This
));
/* for untyped node coerce to BSTR and set */
if
(
IXMLDOMElement_get_dataType
(
iface
,
&
type
)
==
S_FALSE
)
if
(
dt
==
DT_INVALID
)
{
if
(
V_VT
(
&
value
)
!=
VT_BSTR
)
{
hr
=
VariantChangeType
(
&
value
,
&
value
,
0
,
VT_BSTR
);
VARIANT
content
;
VariantInit
(
&
content
);
hr
=
VariantChangeType
(
&
content
,
&
value
,
0
,
VT_BSTR
);
if
(
hr
==
S_OK
)
{
hr
=
node_set_content
(
&
This
->
node
,
V_BSTR
(
&
value
));
VariantClear
(
&
value
);
hr
=
node_set_content
(
&
This
->
node
,
V_BSTR
(
&
content
));
VariantClear
(
&
content
);
}
}
else
...
...
@@ -783,8 +786,7 @@ static HRESULT WINAPI domelem_put_nodeTypedValue(
}
else
{
FIXME
(
"not implemented for typed nodes. type %s
\n
"
,
debugstr_w
(
V_BSTR
(
&
value
)));
VariantClear
(
&
type
);
FIXME
(
"not implemented for dt:%s
\n
"
,
dt_to_str
(
dt
));
return
E_NOTIMPL
;
}
...
...
dlls/msxml3/httprequest.c
View file @
5ab513bd
...
...
@@ -666,7 +666,7 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR
{
httprequest
*
This
=
impl_from_IXMLHTTPRequest
(
iface
);
HRESULT
hr
;
VARIANT
str
;
VARIANT
str
,
is_async
;
TRACE
(
"(%p)->(%s %s %s)
\n
"
,
This
,
debugstr_w
(
method
),
debugstr_w
(
url
),
debugstr_variant
(
&
async
));
...
...
@@ -700,8 +700,9 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR
This
->
url
=
SysAllocString
(
url
);
hr
=
VariantChangeType
(
&
async
,
&
async
,
0
,
VT_BOOL
);
This
->
async
=
hr
==
S_OK
&&
V_BOOL
(
&
async
)
==
VARIANT_TRUE
;
VariantInit
(
&
is_async
);
hr
=
VariantChangeType
(
&
is_async
,
&
async
,
0
,
VT_BOOL
);
This
->
async
=
hr
==
S_OK
&&
V_BOOL
(
&
is_async
)
==
VARIANT_TRUE
;
VariantInit
(
&
str
);
hr
=
VariantChangeType
(
&
str
,
&
user
,
0
,
VT_BSTR
);
...
...
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