Huw Davies : ole: Initialize a few more funcdesc members in CreateDispTypeInfo.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Feb 3 05:39:25 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 16cc1858d04f9e2b355df2b273ad137903c5bd50
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=16cc1858d04f9e2b355df2b273ad137903c5bd50

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Feb  3 12:29:39 2006 +0100

ole: Initialize a few more funcdesc members in CreateDispTypeInfo.

---

 dlls/oleaut32/typelib.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index b6693fc..bf4a21b 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -6396,12 +6396,15 @@ HRESULT WINAPI CreateDispTypeInfo(
         *ppFuncDesc = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppFuncDesc));
         (*ppFuncDesc)->Name = SysAllocString(md->szName);
         (*ppFuncDesc)->funcdesc.memid = md->dispid;
+        (*ppFuncDesc)->funcdesc.funckind = FUNC_DISPATCH;
         (*ppFuncDesc)->funcdesc.invkind = md->wFlags;
         (*ppFuncDesc)->funcdesc.callconv = md->cc;
         (*ppFuncDesc)->funcdesc.cParams = md->cArgs;
         (*ppFuncDesc)->funcdesc.cParamsOpt = 0;
         (*ppFuncDesc)->funcdesc.oVft = md->iMeth;
         (*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.lprgelemdescParam = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
                                                               md->cArgs * sizeof(ELEMDESC));
@@ -6417,6 +6420,7 @@ HRESULT WINAPI CreateDispTypeInfo(
         (*ppFuncDesc)->Entry = NULL;
         (*ppFuncDesc)->ctCustData = 0;
         (*ppFuncDesc)->pCustData = NULL;
+        (*ppFuncDesc)->next = NULL;
         ppFuncDesc = &(*ppFuncDesc)->next;
     }        
     *pptinfo = (ITypeInfo*)pTIImpl;




More information about the wine-cvs mailing list