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
702e2c6d
Commit
702e2c6d
authored
Feb 06, 2007
by
Rob Shearman
Committed by
Alexandre Julliard
Feb 06, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Copy the value directly returned from the called function
if it is not an HRESULT value, instead of getting it from a [retval] attribute.
parent
8f38cd8c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
tmarshal.c
dlls/oleaut32/tests/tmarshal.c
+1
-4
typelib.c
dlls/oleaut32/typelib.c
+13
-0
No files found.
dlls/oleaut32/tests/tmarshal.c
View file @
702e2c6d
...
...
@@ -998,10 +998,7 @@ static void test_typelibmarshal(void)
VariantInit
(
&
varresult
);
hr
=
ITypeInfo_Invoke
(
pTypeInfo
,
&
NonOleAutomation
,
DISPID_NOA_BSTRRET
,
DISPATCH_METHOD
,
&
dispparams
,
&
varresult
,
&
excepinfo
,
NULL
);
ok_ole_success
(
hr
,
ITypeInfo_Invoke
);
todo_wine
{
ok
(
V_VT
(
&
varresult
)
==
VT_BSTR
,
"V_VT(&varresult) should be VT_BSTR instead of %d
\n
"
,
V_VT
(
&
varresult
));
}
ok
(
V_VT
(
&
varresult
)
==
VT_BSTR
,
"V_VT(&varresult) should be VT_BSTR instead of %d
\n
"
,
V_VT
(
&
varresult
));
ok
(
V_BSTR
(
&
varresult
)
!=
NULL
,
"V_BSTR(&varresult) should not be NULL
\n
"
);
VariantClear
(
&
varresult
);
...
...
dlls/oleaut32/typelib.c
View file @
702e2c6d
...
...
@@ -5689,6 +5689,19 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
}
}
}
if
(
V_VT
(
&
varresult
)
!=
VT_ERROR
)
{
TRACE
(
"varresult value: "
);
dump_Variant
(
&
varresult
);
if
(
pVarResult
)
{
VariantClear
(
pVarResult
);
*
pVarResult
=
varresult
;
}
else
VariantClear
(
&
varresult
);
}
func_fail:
HeapFree
(
GetProcessHeap
(),
0
,
buffer
);
...
...
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