Fix Application.Run call for CorelDraw host.

Author: comintern

Rubberduck.VBEEditor/Application/CorelDRAWApp.cs

@@ -15,7 +15,7 @@ public CorelDRAWApp(IVBE vbe) : base(vbe, "CorelDRAW") { }
 
         public override void Run(QualifiedMemberName qualifiedMemberName)
         {
-            var projectName = qualifiedMemberName.QualifiedModuleName.ProjectId;
+            var projectName = qualifiedMemberName.QualifiedModuleName.ProjectName;
             var memberName = qualifiedMemberName.QualifiedModuleName.ComponentName + "." + qualifiedMemberName.MemberName;
 
             if (Application != null)

Rubberduck.VBEEditor/QualifiedModuleName.cs

@@ -10,22 +10,22 @@ namespace Rubberduck.VBEditor
     /// </summary>
     public struct QualifiedModuleName
     {
-        public static string GetProjectId(IVBProject project)
+        public static Guid GetProjectId(IVBProject project)
         {
             if (project.IsWrappingNullReference)
             {
-                return string.Empty;
+                return Guid.Empty;
             }
 
             if (string.IsNullOrEmpty(project.HelpFile))
             {
-                project.HelpFile = project.GetHashCode().ToString();
+                project.HelpFile = GetGuidFromHashCode(project.GetHashCode()).ToString();
             }
 
-            return project.HelpFile;
+            return new Guid(project.HelpFile);
         }
 
-        public static string GetProjectId(IReference reference)
+        public static Guid GetProjectId(IReference reference)
         {
             var projectName = reference.Name;
             return new QualifiedModuleName(projectName, reference.FullPath, projectName).ProjectId;
@@ -90,7 +90,7 @@ public QualifiedModuleName(string projectName, string projectPath, string compon
             _projectName = projectName;
             _projectDisplayName = null;
             _projectPath = projectPath;
-            _projectId = string.Format("{0};{1}", _projectName, _projectPath).GetHashCode().ToString();
+            _projectId = GetGuidFromHashCode(string.Format("{0};{1}", _projectName, _projectPath).GetHashCode());
             _componentName = componentName;
             _component = null;
             _componentType = ComponentType.ComComponent;
@@ -114,8 +114,8 @@ public QualifiedMemberName QualifyMemberName(string member)
         private readonly int _contentHashCode;
         public int ContentHashCode { get { return _contentHashCode; } }
 
-        private readonly string _projectId;
-        public string ProjectId { get { return _projectId; } }
+        private readonly Guid _projectId;
+        public Guid ProjectId { get { return _projectId; } }
 
         private readonly string _componentName;
         public string ComponentName { get { return _componentName ?? string.Empty; } }
@@ -209,5 +209,12 @@ public override bool Equals(object obj)
         {
             return !a.Equals(b);
         }
+
+        // Start all project IDs with the Rubberduck GUID as defined in AssemblyInfo.cs, add hashcode as last 12 bytes.
+        private const string ProjectGuidFormat = "E07C841C-14B4-4890-83E9-{0}";
+        public static Guid GetGuidFromHashCode(int hash)
+        {
+            return new Guid(string.Format(ProjectGuidFormat, hash.ToString("X12")));
+        }
     }
 }