Commit b698b290 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

oleaut32: Fix CreateDispTypeInfo to store the correct number of functions.

parent c24a53dc
...@@ -350,10 +350,15 @@ static void test_CreateDispTypeInfo(void) ...@@ -350,10 +350,15 @@ static void test_CreateDispTypeInfo(void)
hr = ITypeInfo_GetTypeAttr(pTI2, &pTypeAttr); hr = ITypeInfo_GetTypeAttr(pTI2, &pTypeAttr);
ok(hr == S_OK, "hr %08x\n", hr); ok(hr == S_OK, "hr %08x\n", hr);
ok(pTypeAttr->typekind == TKIND_INTERFACE, "typekind %0x\n", pTypeAttr->typekind); ok(pTypeAttr->typekind == TKIND_INTERFACE, "typekind %0x\n", pTypeAttr->typekind);
ok(pTypeAttr->cFuncs == 4, "cFuncs %d\n", pTypeAttr->cFuncs);
ok(IsEqualGUID(&pTypeAttr->guid, &GUID_NULL), "guid {%08x-...}\n", pTypeAttr->guid.Data1);
ok(pTypeAttr->wTypeFlags == 0, "typeflags %08x\n", pTypeAttr->wTypeFlags);
ITypeInfo_ReleaseTypeAttr(pTI2, pTypeAttr); ITypeInfo_ReleaseTypeAttr(pTI2, pTypeAttr);
hr = ITypeInfo_GetFuncDesc(pTI2, 0, &pFuncDesc); hr = ITypeInfo_GetFuncDesc(pTI2, 0, &pFuncDesc);
ok(hr == S_OK, "hr %08x\n", hr); ok(hr == S_OK, "hr %08x\n", hr);
ok(pFuncDesc->memid == 0x123, "memid %x\n", pFuncDesc->memid);
ok(pFuncDesc->funckind == FUNC_VIRTUAL, "funckind %d\n", pFuncDesc->funckind); ok(pFuncDesc->funckind == FUNC_VIRTUAL, "funckind %d\n", pFuncDesc->funckind);
ok(pFuncDesc->invkind == methdata[0].wFlags, "invkind %d\n", pFuncDesc->invkind); ok(pFuncDesc->invkind == methdata[0].wFlags, "invkind %d\n", pFuncDesc->invkind);
ok(pFuncDesc->callconv == methdata[0].cc, "callconv %d\n", pFuncDesc->callconv); ok(pFuncDesc->callconv == methdata[0].cc, "callconv %d\n", pFuncDesc->callconv);
......
...@@ -6884,6 +6884,7 @@ HRESULT WINAPI CreateDispTypeInfo( ...@@ -6884,6 +6884,7 @@ HRESULT WINAPI CreateDispTypeInfo(
(*ppFuncDesc)->ctCustData = 0; (*ppFuncDesc)->ctCustData = 0;
(*ppFuncDesc)->pCustData = NULL; (*ppFuncDesc)->pCustData = NULL;
(*ppFuncDesc)->next = NULL; (*ppFuncDesc)->next = NULL;
pTIIface->TypeAttr.cFuncs++;
ppFuncDesc = &(*ppFuncDesc)->next; ppFuncDesc = &(*ppFuncDesc)->next;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment