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

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.
This commit is contained in:
Rob Shearman 2007-02-06 19:24:51 +00:00 committed by Alexandre Julliard
parent 8f38cd8c8c
commit 702e2c6dc2
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/oleaut32/tests/tmarshal.c
View File

@ -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);

13
dlls/oleaut32/typelib.c
View File

@ -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);