ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Support for VT_DISPATCH in VarImp.

Browse Source
This commit is contained in:
Alex Villacís Lasso 2007-01-02 18:56:15 -05:00 committed by Alexandre Julliard
parent e02b224d57
commit 1c85155eaa
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/oleaut32/variant.c
View File

@ -5623,6 +5623,29 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result)
VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags;
VARIANT lv,rv; VARIANT lv,rv;
double d; double d;
VARIANT tempLeft, tempRight;
VariantInit(&lv);
VariantInit(&rv);
VariantInit(&tempLeft);
VariantInit(&tempRight);
TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left),
debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result);
/* Handle VT_DISPATCH by storing and taking address of returned value */
if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH)
{
hres = VARIANT_FetchDispatchValue(left, &tempLeft);
if (FAILED(hres)) goto VarImp_Exit;
left = &tempLeft;
}
if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH)
{
hres = VARIANT_FetchDispatchValue(right, &tempRight);
if (FAILED(hres)) goto VarImp_Exit;
right = &tempRight;
}
leftvt = V_VT(left)&VT_TYPEMASK; leftvt = V_VT(left)&VT_TYPEMASK;
rightvt = V_VT(right)&VT_TYPEMASK; rightvt = V_VT(right)&VT_TYPEMASK;
@ -5630,25 +5653,29 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result)
rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); rightExtraFlags = V_VT(right)&(~VT_TYPEMASK);
if (leftExtraFlags != rightExtraFlags) if (leftExtraFlags != rightExtraFlags)
return DISP_E_BADVARTYPE; {
hres = DISP_E_BADVARTYPE;
goto VarImp_Exit;
}
ExtraFlags = leftExtraFlags; ExtraFlags = leftExtraFlags;
TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left),
debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result);
/* Native VarImp always returns a error when using any extra /* Native VarImp always returns a error when using any extra
* flags or if the variants are I8 and INT. * flags or if the variants are I8 and INT.
*/ */
if ((leftvt == VT_I8 && rightvt == VT_INT) || if ((leftvt == VT_I8 && rightvt == VT_INT) ||
ExtraFlags != 0) ExtraFlags != 0)
return DISP_E_BADVARTYPE; {
hres = DISP_E_BADVARTYPE;
goto VarImp_Exit;
}
/* Determine result type */ /* Determine result type */
else if ((leftvt == VT_NULL && rightvt == VT_NULL) || else if ((leftvt == VT_NULL && rightvt == VT_NULL) ||
(leftvt == VT_NULL && rightvt == VT_EMPTY)) (leftvt == VT_NULL && rightvt == VT_EMPTY))
{ {
V_VT(result) = VT_NULL; V_VT(result) = VT_NULL;
return S_OK; hres = S_OK;
goto VarImp_Exit;
} }
else if (leftvt == VT_I8 || rightvt == VT_I8) else if (leftvt == VT_I8 || rightvt == VT_I8)
resvt = VT_I8; resvt = VT_I8;
@ -5677,9 +5704,6 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result)
leftvt == VT_BSTR || rightvt == VT_BSTR) leftvt == VT_BSTR || rightvt == VT_BSTR)
resvt = VT_BOOL; resvt = VT_BOOL;
VariantInit(&lv);
VariantInit(&rv);
/* VT_NULL requires special handling for when the opposite /* VT_NULL requires special handling for when the opposite
* variant is equal to something other than -1. * variant is equal to something other than -1.
* (NULL Imp 0 = NULL, NULL Imp n = n) * (NULL Imp 0 = NULL, NULL Imp n = n)
@ -5824,6 +5848,8 @@ VarImp_Exit:
VariantClear(&lv); VariantClear(&lv);
VariantClear(&rv); VariantClear(&rv);
VariantClear(&tempLeft);
VariantClear(&tempRight);
return hres; return hres;
} }