Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
1f04fc6a
Commit
1f04fc6a
authored
Jan 16, 2006
by
Robert Shearman
Committed by
Alexandre Julliard
Jan 16, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut: Handle a non-byref variant being passed for a byref param in
ITypeInfo::Invoke.
parent
d86f8d2e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
4 deletions
+17
-4
typelib.c
dlls/oleaut32/typelib.c
+17
-4
No files found.
dlls/oleaut32/typelib.c
View file @
1f04fc6a
...
...
@@ -5262,14 +5262,27 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
}
else
if
(
i
<
pDispParams
->
cArgs
)
{
V_VT
(
&
rgvarg
[
i
])
=
V_VT
(
&
pDispParams
->
rgvarg
[
pDispParams
->
cArgs
-
1
-
i
]);
dump_Variant
(
&
pDispParams
->
rgvarg
[
pDispParams
->
cArgs
-
1
-
i
]);
VARIANTARG
*
src_arg
=
&
pDispParams
->
rgvarg
[
pDispParams
->
cArgs
-
1
-
i
];
V_VT
(
&
rgvarg
[
i
])
=
V_VT
(
src_arg
);
dump_Variant
(
src_arg
);
/* FIXME: this doesn't work for VT_BYREF arguments if
* they are not the same type as in the paramdesc */
hres
=
VariantChangeType
(
&
rgvarg
[
i
],
&
pDispParams
->
rgvarg
[
pDispParams
->
cArgs
-
1
-
i
],
0
,
rgvt
[
i
]);
if
((
rgvt
[
i
]
&
VT_BYREF
)
&&
!
V_ISBYREF
(
src_arg
))
{
VARIANTARG
*
missing_arg
=
INVBUF_GET_MISSING_ARG_ARRAY
(
buffer
,
func_desc
->
cParams
);
V_VT
(
&
missing_arg
[
i
])
=
V_VT
(
src_arg
);
hres
=
VariantChangeType
(
&
missing_arg
[
i
],
src_arg
,
0
,
rgvt
[
i
]
&
~
VT_BYREF
);
V_BYREF
(
&
rgvarg
[
i
])
=
&
V_NONE
(
&
missing_arg
[
i
]);
}
else
hres
=
VariantChangeType
(
&
rgvarg
[
i
],
src_arg
,
0
,
rgvt
[
i
]);
if
(
FAILED
(
hres
))
{
ERR
(
"failed to convert param %d to vt %d
\n
"
,
i
,
rgvt
[
i
]);
ERR
(
"failed to convert param %d to %s%s from %s%s
\n
"
,
i
,
debugstr_vt
(
rgvt
[
i
]),
debugstr_vf
(
rgvt
[
i
]),
debugstr_VT
(
src_arg
),
debugstr_VF
(
src_arg
));
break
;
}
V_VT
(
&
rgvarg
[
i
])
=
rgvt
[
i
];
...
...
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