Merge pull request rubberduck-vba#3702 from WaynePhillipsEA/com-colle…

…ctor-corrections Minor corrections to uses of ITypeLib/ITypeInfo
retailcoder · Jan 17, 2018 · 88c6e7c · 88c6e7c
2 parents 1efea16 + d722ce3
commit 88c6e7c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Rubberduck.Parsing/ComReflection/ComEnumerationMember.cs b/Rubberduck.Parsing/ComReflection/ComEnumerationMember.cs
@@ -18,9 +18,9 @@ public ComEnumerationMember(ITypeInfo info, VARDESC varDesc)
             Value = (int)value.Value;
             ValueType = value.VariantType;
 
-            var names = new string[255];
+            var names = new string[1];
             int count;
-            info.GetNames(varDesc.memid, names, 1, out count);
+            info.GetNames(varDesc.memid, names, names.Length, out count);
             Debug.Assert(count == 1);
             Name = names[0];
         }

diff --git a/Rubberduck.Parsing/ComReflection/ComMember.cs b/Rubberduck.Parsing/ComReflection/ComMember.cs
@@ -85,7 +85,7 @@ private void LoadParameters(FUNCDESC funcDesc, ITypeInfo info)
             Parameters = new List<ComParameter>();
             var names = new string[255];
             int count;
-            info.GetNames(Index, names, 255, out count);
+            info.GetNames(Index, names, names.Length, out count);
 
             for (var index = 0; index < count - 1; index++)
             {

diff --git a/Rubberduck.Parsing/ComReflection/ComModule.cs b/Rubberduck.Parsing/ComReflection/ComModule.cs
@@ -52,14 +52,14 @@ public ComModule(ITypeLib typeLib, ITypeInfo info, TYPEATTR attrib, int index) :
 
         private void GetComFields(ITypeInfo info, TYPEATTR attrib)
         {
-            var names = new string[255];
+            var names = new string[1];
             for (var index = 0; index < attrib.cVars; index++)
             {
                 IntPtr varPtr;
                 info.GetVarDesc(index, out varPtr);
                 var desc = (VARDESC)Marshal.PtrToStructure(varPtr, typeof(VARDESC));
                 int length;
-                info.GetNames(desc.memid, names, 255, out length);
+                info.GetNames(desc.memid, names, names.Length, out length);
                 Debug.Assert(length == 1);
 
                 _fields.Add(new ComField(names[0], desc, index, DeclarationType.Constant));

diff --git a/Rubberduck.Parsing/ComReflection/ComProject.cs b/Rubberduck.Parsing/ComReflection/ComProject.cs
@@ -93,6 +93,8 @@ private void ProcessLibraryAttributes(ITypeLib typeLibrary)
                 MinorVersion = typeAttr.wMinorVerNum;
                 _flags = (TypeLibTypeFlags)typeAttr.wLibFlags;
                 Guid = typeAttr.guid;
+
+                typeLibrary.ReleaseTLibAttr(attribPtr);
             }
             catch (COMException) { }
         }

diff --git a/Rubberduck.Parsing/ComReflection/ComStruct.cs b/Rubberduck.Parsing/ComReflection/ComStruct.cs
@@ -27,14 +27,14 @@ public ComStruct(ITypeLib typeLib, ITypeInfo info, TYPEATTR attrib, int index)
 
         private void GetFields(ITypeInfo info, TYPEATTR attrib)
         {
-            var names = new string[255];
+            var names = new string[1];
             for (var index = 0; index < attrib.cVars; index++)
             {
                 IntPtr varPtr;
                 info.GetVarDesc(index, out varPtr);
                 var desc = (VARDESC)Marshal.PtrToStructure(varPtr, typeof(VARDESC));
                 int length;
-                info.GetNames(desc.memid, names, 255, out length);
+                info.GetNames(desc.memid, names, names.Length, out length);
                 Debug.Assert(length == 1);
 
                 _fields.Add(new ComField(names[0], desc, index, DeclarationType.UserDefinedTypeMember));