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
Zsolt Vadász
wine
Commits
83ff8560
Commit
83ff8560
authored
19 years ago
by
Robert Shearman
Committed by
Alexandre Julliard
19 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ole: Store the result from _invoke in a VARIANTARG structure.
parent
ac37f4cc
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/oleaut32/typelib.c
+11
-6
11 additions, 6 deletions
dlls/oleaut32/typelib.c
with
11 additions
and
6 deletions
dlls/oleaut32/typelib.c
+
11
−
6
View file @
83ff8560
...
...
@@ -5335,10 +5335,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
switch
(
func_desc
->
funckind
)
{
case
FUNC_PUREVIRTUAL
:
case
FUNC_VIRTUAL
:
{
DWORD
res
;
int
numargs
,
numargs2
,
argspos
,
args2pos
;
DWORD
*
args
,
*
args2
;
VARIANT
*
rgvarg
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
VARIANT
)
*
func_desc
->
cParams
);
VARIANT
varresult
;
memcpy
(
rgvarg
,
pDispParams
->
rgvarg
,
sizeof
(
VARIANT
)
*
pDispParams
->
cArgs
);
hres
=
S_OK
;
...
...
@@ -5433,7 +5434,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
if
(
func_desc
->
cParamsOpt
<
0
)
FIXME
(
"Does not support optional parameters (%d)
\n
"
,
func_desc
->
cParamsOpt
);
res
=
_invoke
((
*
(
FARPROC
**
)
pIUnk
)[
func_desc
->
oVft
/
4
],
V_VT
(
&
varresult
)
=
0
;
hres
=
typedescvt_to_variantvt
((
ITypeInfo
*
)
iface
,
&
func_desc
->
elemdescFunc
.
tdesc
,
&
V_VT
(
&
varresult
));
if
(
FAILED
(
hres
))
goto
func_fail
;
/* FIXME: we don't free changed types here */
V_ERROR
(
&
varresult
)
=
_invoke
((
*
(
FARPROC
**
)
pIUnk
)[
func_desc
->
oVft
/
4
],
func_desc
->
callconv
,
numargs
,
args
...
...
@@ -5479,11 +5484,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
}
}
if
((
func_desc
->
elemdescFunc
.
tdesc
.
vt
==
VT_HRESULT
)
&&
FAILED
(
res
))
if
((
V_VT
(
&
varresult
)
==
VT_ERROR
)
&&
FAILED
(
V_ERROR
(
&
varresult
)
))
{
WARN
(
"invoked function failed with error 0x%08lx
\n
"
,
res
);
WARN
(
"invoked function failed with error 0x%08lx
\n
"
,
V_ERROR
(
&
varresult
)
);
hres
=
DISP_E_EXCEPTION
;
if
(
pExcepInfo
)
pExcepInfo
->
scode
=
res
;
if
(
pExcepInfo
)
pExcepInfo
->
scode
=
V_ERROR
(
&
varresult
)
;
}
func_fail:
...
...
@@ -5491,7 +5496,7 @@ func_fail:
HeapFree
(
GetProcessHeap
(),
0
,
args2
);
HeapFree
(
GetProcessHeap
(),
0
,
args
);
break
;
}
}
case
FUNC_DISPATCH
:
{
IDispatch
*
disp
;
...
...
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