Skip to content

Commit 8695c05

Browse files
authored
Merge pull request #5573 from bclothier/RemoveComProjectFlag
Remove com project flag
2 parents a110623 + 222730b commit 8695c05

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Rubberduck.Parsing/VBA/ParseCoordinator.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,6 @@ private void ExecuteCommonParseActivities(IReadOnlyCollection<QualifiedModuleNam
340340
token.ThrowIfCancellationRequested();
341341
}
342342

343-
//TODO: Remove the conditional compilation after loading from typelibs actually works.
344-
//TODO: Improve the handling to avoid host crashing. See https://github.com/rubberduck-vba/Rubberduck/issues/5217
345-
[Conditional("LOAD_USER_COM_PROJECTS")]
346343
private void ProcessUserComProjects(ref CancellationToken token, ref IReadOnlyCollection<QualifiedModuleName> toParse, ref HashSet<QualifiedModuleName> toReresolveReferences, ref IReadOnlyCollection<string> newProjectIds)
347344
{
348345
RefreshUserComProjects(toParse, newProjectIds);

Rubberduck.VBEEditor/ComManagement/TypeLibs/Utility/VarDescExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static bool IsValidVBAConstant(this VARDESC varDesc)
3232

3333
return (varDesc.memid & _ourConstantsDispatchMemberIDRangeBitmaskCheck) >= _ourConstantsDispatchMemberIDRangeStart
3434
&& varDesc.varkind == VARKIND.VAR_STATIC
35-
&& varDesc.desc.lpvarValue != IntPtr.Zero;
35+
&& varDesc.desc.oInst != 0;
3636
}
3737
}
3838
}

0 commit comments

Comments
 (0)