Fix constant types, finished the struct members I forgot, consolidate enums and types in 2 pseudo-modules.

Author: comintern

Rubberduck.Parsing/ComReflection/ComField.cs

@@ -35,7 +35,9 @@ public ComField(string name, VARDESC varDesc, int index, DeclarationType type)
             }
             else
             {
-                
+                Debug.Assert(varDesc.varkind == VARKIND.VAR_PERINSTANCE);
+                string typeName;
+                ValueType = ComVariant.TypeNames.TryGetValue((VarEnum)varDesc.elemdescVar.tdesc.vt, out typeName) ? typeName : "Object";                
             }
         }
     }

Rubberduck.Parsing/ComReflection/ComProject.cs

@@ -59,6 +59,8 @@ public IEnumerable<IComType> Members
         {
             get
             {
+                //Note - Enums and Types should enumerate *last*. That will prevent a duplicate module in the unlikely(?)
+                //instance where the TypeLib defines a module named "Enums" or "Types".
                 return _modules.Cast<IComType>()
                     .Union(_interfaces)
                     .Union(_classes)
@@ -118,6 +120,10 @@ private void LoadModules(ITypeLib typeLibrary)
                             if (type != null) KnownTypes.TryAdd(typeAttributes.guid, coclass);
                             break;
                         case TYPEKIND.TKIND_ALIAS:
+                            //The current handling of this is wrong - these don't have to be classes or interfaces. In the VBE module for example,
+                            //"LongPtr" is defined as an alias to "Long" (at least on a 32 bit system) - RD is currently treating is like a class.  
+                            //Unclear if these can *also* define alternative names for interfaces as well, but all the ones I've seen have been basically
+                            //a C typedef.  So... this needs work. Don't make any assumptions about these elsewhere in the code until this is nailed down.
                         case TYPEKIND.TKIND_DISPATCH:
                         case TYPEKIND.TKIND_INTERFACE:
                             var intface = type ?? new ComInterface(typeLibrary, info, typeAttributes, index);
@@ -138,10 +144,7 @@ private void LoadModules(ITypeLib typeLibrary)
                     }
                     info.ReleaseTypeAttr(typeAttributesPointer);
                 }
-                catch (NullReferenceException)
-                {
-                    return;
-                }
+                catch (COMException) { }
             }
         }
     }

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -168,7 +168,7 @@ public Declaration(ComEnumeration enumeration, Declaration parent, QualifiedModu
                 module.QualifyMemberName(enumeration.Name),
                 parent,
                 parent,
-                enumeration.Name,
+                "Long",     //Match the VBA default type declaration.  Technically these *can* be a LongLong on 64 bit systems, but would likely crash the VBE... 
                 null,
                 false,
                 false,
@@ -182,6 +182,25 @@ public Declaration(ComEnumeration enumeration, Declaration parent, QualifiedModu
                 null,
                 new Attributes()) { }
 
+        public Declaration(ComStruct structure, Declaration parent, QualifiedModuleName module)
+            : this(
+                module.QualifyMemberName(structure.Name),
+                parent,
+                parent,
+                structure.Name,
+                null,
+                false,
+                false,
+                Accessibility.Global,
+                DeclarationType.UserDefinedType,
+                null,
+                Selection.Home,
+                false,
+                null,
+                true,
+                null,
+                new Attributes()) { }
+
         public Declaration(ComEnumerationMember member, Declaration parent, QualifiedModuleName module) : this(
                 module.QualifyMemberName(member.Name),
                 parent,
@@ -202,7 +221,7 @@ public Declaration(ComField field, Declaration parent, QualifiedModuleName modul
                 module.QualifyMemberName(field.Name),
                 parent,
                 parent,
-                field.Name,
+                field.ValueType,
                 null,
                 false,
                 false,

Rubberduck.Parsing/Symbols/ProceduralModuleDeclaration.cs

@@ -46,17 +46,7 @@ public ProceduralModuleDeclaration(ComModule statics, Declaration parent, Qualif
             IsPrivateModule = statics.IsRestricted;
         }
 
-        //This is the pseudo-module ctor for COM enumerations.
-        public ProceduralModuleDeclaration(ComEnumeration enumeration, Declaration parent, QualifiedModuleName module)
-            : this(
-                module.QualifyMemberName(string.Format("_{0}", enumeration.Name)),
-                parent,
-                string.Format("_{0}", enumeration.Name),
-                true,
-                new List<IAnnotation>(),
-                new Attributes()) { }
-
-        //This is the pseudo-module ctor for anything else from COM with fields instead of members.
+        //This is the pseudo-module ctor for COM enumerations and types.
         public ProceduralModuleDeclaration(string pseudo, Declaration parent, QualifiedModuleName module)
             : this(
                 module.QualifyMemberName(pseudo),