reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 04:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oleaut32: Add a test for non-oleautomation error handling.

Browse Source
This commit is contained in:
Huw Davies 2010-03-02 14:49:47 +00:00 committed by Alexandre Julliard
parent 75ec82bbaf
commit dba91c0643
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -895,12 +895,18 @@ static BSTR WINAPI NonOleAutomation_BstrRet(INonOleAutomation *iface)
return SysAllocString(wszTestString);
}
static HRESULT WINAPI NonOleAutomation_Error(INonOleAutomation *iface)
{
return E_NOTIMPL;
}
static INonOleAutomationVtbl NonOleAutomation_VTable =
{
NonOleAutomation_QueryInterface,
NonOleAutomation_AddRef,
NonOleAutomation_Release,
NonOleAutomation_BstrRet,
NonOleAutomation_Error
};
static INonOleAutomation NonOleAutomation = { &NonOleAutomation_VTable };
@ -1239,6 +1245,19 @@ static void test_typelibmarshal(void)
ok(V_BSTR(&varresult) != NULL, "V_BSTR(&varresult) should not be NULL\n");
VariantClear(&varresult);
dispparams.cNamedArgs = 0;
dispparams.cArgs = 0;
dispparams.rgdispidNamedArgs = NULL;
dispparams.rgvarg = NULL;
hr = ITypeInfo_Invoke(pTypeInfo, &NonOleAutomation, DISPID_NOA_ERROR, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
ok(hr == DISP_E_EXCEPTION, "ITypeInfo_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr);
ok(V_VT(&varresult) == VT_EMPTY, "V_VT(&varresult) should be VT_EMPTY instead of %d\n", V_VT(&varresult));
ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
VariantClear(&varresult);
ITypeInfo_Release(pTypeInfo);
/* tests call put_Name without named arg */

3
dlls/oleaut32/tests/tmarshal.idl
View File

@ -184,6 +184,9 @@ library TestTypelib
{
[id(DISPID_NOA_BSTRRET)]
BSTR BstrRet();
[id(DISPID_NOA_ERROR)]
HRESULT Error();
}

1
dlls/oleaut32/tests/tmarshal_dispids.h
View File

@ -40,3 +40,4 @@
#define DISPID_TM_BYREF_UINT 21
#define DISPID_NOA_BSTRRET 1
#define DISPID_NOA_ERROR 2