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
be4d45ca
Commit
be4d45ca
authored
Feb 17, 2012
by
Huw Davies
Committed by
Alexandre Julliard
Feb 17, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Zero-init [out] only parameters.
parent
a91097ed
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
tmarshal.c
dlls/oleaut32/tests/tmarshal.c
+1
-1
tmarshal.c
dlls/oleaut32/tmarshal.c
+11
-2
No files found.
dlls/oleaut32/tests/tmarshal.c
View file @
be4d45ca
...
...
@@ -1118,7 +1118,7 @@ static void test_typelibmarshal(void)
VariantClear
(
&
varresult
);
/* call get_Name (direct) */
bstr
=
NULL
;
bstr
=
(
void
*
)
0xdeadbeef
;
hr
=
IWidget_get_Name
(
pWidget
,
&
bstr
);
ok_ole_success
(
hr
,
IWidget_get_Name
);
ok
(
!
lstrcmpW
(
bstr
,
szCat
),
"IWidget_get_Name should have returned string
\"
Cat
\"
instead of %s
\n
"
,
wine_dbgstr_w
(
bstr
));
...
...
dlls/oleaut32/tmarshal.c
View file @
be4d45ca
...
...
@@ -723,7 +723,7 @@ serialize_param(
return
S_OK
;
}
case
VT_BSTR
:
{
if
(
debugout
)
{
if
(
writeit
&&
debugout
)
{
if
(
*
arg
)
TRACE_
(
olerelay
)(
"%s"
,
relaystr
((
WCHAR
*
)
*
arg
));
else
...
...
@@ -1402,11 +1402,20 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */)
TRACE_
(
olerelay
)(
"%s="
,
relaystr
(
names
[
i
+
1
]));
}
/* No need to marshal other data than FIN and any VT_PTR. */
if
(
!
is_in_elem
(
elem
)
&&
(
elem
->
tdesc
.
vt
!=
VT_PTR
))
{
if
(
!
is_in_elem
(
elem
))
{
if
(
elem
->
tdesc
.
vt
!=
VT_PTR
)
{
xargs
+=
_argsize
(
&
elem
->
tdesc
,
tinfo
);
if
(
relaydeb
)
TRACE_
(
olerelay
)(
"[out]"
);
continue
;
}
else
{
memset
(
*
(
void
**
)
xargs
,
0
,
_xsize
(
elem
->
tdesc
.
u
.
lptdesc
,
tinfo
)
);
}
}
hres
=
serialize_param
(
tinfo
,
is_in_elem
(
elem
),
...
...
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