From 79f23f108ad799eb24f32b0cd777295319122d37 Mon Sep 17 00:00:00 2001
From: bclothier <bgclothier@gmail.com>
Date: Thu, 3 Sep 2020 19:35:28 -0500
Subject: [PATCH 1/2] Remove the conditional flag to put the loading of user
 project in use.

---
 Rubberduck.Parsing/VBA/ParseCoordinator.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Rubberduck.Parsing/VBA/ParseCoordinator.cs b/Rubberduck.Parsing/VBA/ParseCoordinator.cs
index 858a834348..216fbb567f 100644
--- 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);

From 222730b5ccae78a86d5917c466867b92175a34d2 Mon Sep 17 00:00:00 2001
From: bclothier <bgclothier@gmail.com>
Date: Sat, 5 Sep 2020 21:27:12 -0500
Subject: [PATCH 2/2] Fix incorrect check of IntPtr.Zero and check oInst as the
 xml-docs said to do...

---
 .../ComManagement/TypeLibs/Utility/VarDescExtensions.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rubberduck.VBEEditor/ComManagement/TypeLibs/Utility/VarDescExtensions.cs b/Rubberduck.VBEEditor/ComManagement/TypeLibs/Utility/VarDescExtensions.cs
index 14eaa3b9bd..787251194e 100644
--- 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;
         }
     }
 }