Nikolay Sivov : oleaut32: Fix return value when converting from NULL interface pointers.
Alexandre Julliard
julliard at winehq.org
Fri Oct 7 15:09:13 CDT 2016
Module: wine
Branch: stable
Commit: ff970fbbd1d102b652dbd38e46134444cb84c857
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff970fbbd1d102b652dbd38e46134444cb84c857
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Aug 2 12:03:48 2016 +0300
oleaut32: Fix return value when converting from NULL interface pointers.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 806ea12766849660a4cfa20e189b6d96ba8f2891)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/oleaut32/tests/vartype.c | 20 ++++++++++++++++++++
dlls/oleaut32/variant.c | 6 ++++++
2 files changed, 26 insertions(+)
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 7cbb059..8a42af1 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -5854,6 +5854,16 @@ static void test_IUnknownChangeTypeEx(void)
lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+ /* NULL IUnknown -> IDispatch */
+ V_VT(&vSrc) = VT_UNKNOWN;
+ V_UNKNOWN(&vSrc) = NULL;
+ VariantInit(&vDst);
+ V_DISPATCH(&vDst) = (void*)0xdeadbeef;
+ hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_DISPATCH);
+ ok(hres == S_OK && V_VT(&vDst) == VT_DISPATCH && V_DISPATCH(&vDst) == NULL,
+ "change unk(src,dst): expected 0x%08x,%d,%p, got 0x%08x,%d,%p\n",
+ S_OK, VT_DISPATCH, NULL, hres, V_VT(&vDst), V_DISPATCH(&vDst));
+
V_VT(&vSrc) = VT_UNKNOWN;
V_UNKNOWN(&vSrc) = pu;
@@ -5998,6 +6008,16 @@ static void test_IDispatchChangeTypeEx(void)
lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+ /* NULL IDispatch -> IUnknown */
+ V_VT(&vSrc) = VT_DISPATCH;
+ V_DISPATCH(&vSrc) = NULL;
+ VariantInit(&vDst);
+ V_UNKNOWN(&vDst) = (void*)0xdeadbeef;
+ hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_UNKNOWN);
+ ok(hres == S_OK && V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == NULL,
+ "change unk(src,dst): expected 0x%08x,%d,%p, got 0x%08x,%d,%p\n",
+ S_OK, VT_UNKNOWN, NULL, hres, V_VT(&vDst), V_UNKNOWN(&vDst));
+
V_VT(&vSrc) = VT_DISPATCH;
V_DISPATCH(&vSrc) = pd;
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index b31e8bc..f60fef5 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -460,7 +460,10 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
{
case VT_DISPATCH:
if (V_DISPATCH(ps) == NULL)
+ {
V_UNKNOWN(pd) = NULL;
+ res = S_OK;
+ }
else
res = IDispatch_QueryInterface(V_DISPATCH(ps), &IID_IUnknown, (LPVOID*)&V_UNKNOWN(pd));
break;
@@ -472,7 +475,10 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
{
case VT_UNKNOWN:
if (V_UNKNOWN(ps) == NULL)
+ {
V_DISPATCH(pd) = NULL;
+ res = S_OK;
+ }
else
res = IUnknown_QueryInterface(V_UNKNOWN(ps), &IID_IDispatch, (LPVOID*)&V_DISPATCH(pd));
break;
More information about the wine-cvs
mailing list