Merge pull request #5573 from bclothier/RemoveComProjectFlag

Remove com project flag
rubberduck-vba · Sep 17, 2020 · 8695c05 · 8695c05
2 parents a110623 + 222730b
commit 8695c05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Rubberduck.Parsing/VBA/ParseCoordinator.cs b/Rubberduck.Parsing/VBA/ParseCoordinator.cs
@@ -340,9 +340,6 @@ private void ExecuteCommonParseActivities(IReadOnlyCollection<QualifiedModuleNam
             token.ThrowIfCancellationRequested();
         }
 
-        //TODO: Remove the conditional compilation after loading from typelibs actually works.
-        //TODO: Improve the handling to avoid host crashing. See https://github.com/rubberduck-vba/Rubberduck/issues/5217
-        [Conditional("LOAD_USER_COM_PROJECTS")]
         private void ProcessUserComProjects(ref CancellationToken token, ref IReadOnlyCollection<QualifiedModuleName> toParse, ref HashSet<QualifiedModuleName> toReresolveReferences, ref IReadOnlyCollection<string> newProjectIds)
         {
             RefreshUserComProjects(toParse, newProjectIds);

diff --git a/Rubberduck.VBEEditor/ComManagement/TypeLibs/Utility/VarDescExtensions.cs b/Rubberduck.VBEEditor/ComManagement/TypeLibs/Utility/VarDescExtensions.cs
@@ -32,7 +32,7 @@ public static bool IsValidVBAConstant(this VARDESC varDesc)
 
             return (varDesc.memid & _ourConstantsDispatchMemberIDRangeBitmaskCheck) >= _ourConstantsDispatchMemberIDRangeStart
                 && varDesc.varkind == VARKIND.VAR_STATIC 
-                && varDesc.desc.lpvarValue != IntPtr.Zero;
+                && varDesc.desc.oInst != 0;
         }
     }
 }