Robert Shearman : oleaut: Move the initialisation of memidConstructor and

[Alexandre Julliard]

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

Author: Robert Shearman <rob at codeweavers.com>
Date:   Mon Jul  3 13:54:21 2006 +0100

oleaut: Move the initialisation of memidConstructor and
memidDestructor of type infos to the common ITypeInfo creation
function.

Remove the WARN message as this functionality isn't implemented in
native either.

---

 dlls/oleaut32/typelib.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 35dd770..efe1720 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -2047,12 +2047,9 @@ static ITypeInfoImpl * MSFT_DoTypeInfo(
     ptiRet->pTypeLib = pLibInfo;
     ptiRet->index=count;
 /* fill in the typeattr fields */
-    WARN("Assign constructor/destructor memid\n");
 
     MSFT_ReadGuid(&ptiRet->TypeAttr.guid, tiBase.posguid, pcx);
     ptiRet->TypeAttr.lcid=pLibInfo->LibAttr.lcid;   /* FIXME: correct? */
-    ptiRet->TypeAttr.memidConstructor=MEMBERID_NIL ;/* FIXME */
-    ptiRet->TypeAttr.memidDestructor=MEMBERID_NIL ; /* FIXME */
     ptiRet->TypeAttr.lpstrSchema=NULL;              /* reserved */
     ptiRet->TypeAttr.cbSizeInstance=tiBase.size;
     ptiRet->TypeAttr.typekind=tiBase.typekind & 0xF;
@@ -4193,6 +4190,8 @@ static ITypeInfo2 * WINAPI ITypeInfo_Con
       pTypeInfoImpl->lpVtblTypeComp = &tcompvt;
       pTypeInfoImpl->ref=1;
       pTypeInfoImpl->hreftype = -1;
+      pTypeInfoImpl->TypeAttr.memidConstructor = MEMBERID_NIL;
+      pTypeInfoImpl->TypeAttr.memidDestructor = MEMBERID_NIL;
     }
     TRACE("(%p)\n", pTypeInfoImpl);
     return (ITypeInfo2*) pTypeInfoImpl;