Commit 16cc1858 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

ole: Initialize a few more funcdesc members in CreateDispTypeInfo.

parent c13ae562
...@@ -6396,12 +6396,15 @@ HRESULT WINAPI CreateDispTypeInfo( ...@@ -6396,12 +6396,15 @@ HRESULT WINAPI CreateDispTypeInfo(
*ppFuncDesc = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppFuncDesc)); *ppFuncDesc = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppFuncDesc));
(*ppFuncDesc)->Name = SysAllocString(md->szName); (*ppFuncDesc)->Name = SysAllocString(md->szName);
(*ppFuncDesc)->funcdesc.memid = md->dispid; (*ppFuncDesc)->funcdesc.memid = md->dispid;
(*ppFuncDesc)->funcdesc.funckind = FUNC_DISPATCH;
(*ppFuncDesc)->funcdesc.invkind = md->wFlags; (*ppFuncDesc)->funcdesc.invkind = md->wFlags;
(*ppFuncDesc)->funcdesc.callconv = md->cc; (*ppFuncDesc)->funcdesc.callconv = md->cc;
(*ppFuncDesc)->funcdesc.cParams = md->cArgs; (*ppFuncDesc)->funcdesc.cParams = md->cArgs;
(*ppFuncDesc)->funcdesc.cParamsOpt = 0; (*ppFuncDesc)->funcdesc.cParamsOpt = 0;
(*ppFuncDesc)->funcdesc.oVft = md->iMeth; (*ppFuncDesc)->funcdesc.oVft = md->iMeth;
(*ppFuncDesc)->funcdesc.wFuncFlags = 0; /*??*/ (*ppFuncDesc)->funcdesc.wFuncFlags = 0; /*??*/
(*ppFuncDesc)->funcdesc.elemdescFunc.u.paramdesc.wParamFlags = PARAMFLAG_NONE;
(*ppFuncDesc)->funcdesc.elemdescFunc.u.paramdesc.pparamdescex = NULL;
(*ppFuncDesc)->funcdesc.elemdescFunc.tdesc.vt = md->vtReturn; (*ppFuncDesc)->funcdesc.elemdescFunc.tdesc.vt = md->vtReturn;
(*ppFuncDesc)->funcdesc.lprgelemdescParam = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (*ppFuncDesc)->funcdesc.lprgelemdescParam = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
md->cArgs * sizeof(ELEMDESC)); md->cArgs * sizeof(ELEMDESC));
...@@ -6417,6 +6420,7 @@ HRESULT WINAPI CreateDispTypeInfo( ...@@ -6417,6 +6420,7 @@ HRESULT WINAPI CreateDispTypeInfo(
(*ppFuncDesc)->Entry = NULL; (*ppFuncDesc)->Entry = NULL;
(*ppFuncDesc)->ctCustData = 0; (*ppFuncDesc)->ctCustData = 0;
(*ppFuncDesc)->pCustData = NULL; (*ppFuncDesc)->pCustData = NULL;
(*ppFuncDesc)->next = NULL;
ppFuncDesc = &(*ppFuncDesc)->next; ppFuncDesc = &(*ppFuncDesc)->next;
} }
*pptinfo = (ITypeInfo*)pTIImpl; *pptinfo = (ITypeInfo*)pTIImpl;
......
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