Merge pull request #964 from ThunderFrame/next

Hosch250 · Hosch250 · commit efebe3c20947 · 2016-02-08T13:36:22.000-06:00
Adds CorelDRAW
diff --git a/RetailCoder.VBE/UnitTesting/ProjectTestExtensions.cs b/RetailCoder.VBE/UnitTesting/ProjectTestExtensions.cs
@@ -36,7 +36,6 @@ public static void RunMethodsWithAttribute<TAttribute>(this VBComponent componen
 
         public static IEnumerable<TestMethod> TestMethods(this VBProject project)
         {
-            var hostApp = project.VBE.HostApplication();
 
             var result = project.VBComponents
                           .Cast<VBComponent>()
@@ -50,7 +49,6 @@ public static IEnumerable<TestMethod> TestMethods(this VBProject project)
 
         public static IEnumerable<TestMethod> TestMethods(this VBComponent component)
         {
-            var hostApp = component.VBE.HostApplication();
 
             if (component.Type == vbext_ComponentType.vbext_ct_StdModule 
                 && component.CodeModule.HasAttribute<TestModuleAttribute>())
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -106,6 +106,7 @@ private void ParseParallel()
             try
             {
                 var components = _vbe.VBProjects.Cast<VBProject>()
+                    .Where(project => project.Protection == vbext_ProjectProtection.vbext_pp_none)
                     .SelectMany(project => project.VBComponents.Cast<VBComponent>())
                     .ToList();
 
diff --git a/Rubberduck.VBEEditor/Extensions/VbeExtensions.cs b/Rubberduck.VBEEditor/Extensions/VbeExtensions.cs
@@ -62,11 +62,11 @@ public static IHostApplication HostApplication(this VBE vbe)
                 switch (reference.Name)
                 {
                     case "Excel":
-                        return new ExcelApp();
+                        return new ExcelApp(vbe);
                     case "Access":
                         return new AccessApp();
                     case "Word":
-                        return new WordApp();
+                        return new WordApp(vbe);
                     case "PowerPoint":
                         return new PowerPointApp();
                     case "Outlook":
@@ -75,6 +75,8 @@ public static IHostApplication HostApplication(this VBE vbe)
                         return new PublisherApp();
 					case "AutoCAD":
                         return new AutoCADApp();
+                    case "CorelDRAW":
+                        return new CorelDRAWApp(vbe);
                 }
             }
 
diff --git a/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj b/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj
@@ -55,14 +55,18 @@
       <HintPath>..\libs\Microsoft.Office.Interop.Publisher.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-	<Reference Include="Autodesk.AutoCAD.Interop">
+    <Reference Include="Autodesk.AutoCAD.Interop">
       <HintPath>..\libs\Autodesk.AutoCAD.Interop.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-	<Reference Include="Autodesk.AutoCAD.Interop.Common">
+    <Reference Include="Autodesk.AutoCAD.Interop.Common">
       <HintPath>..\libs\Autodesk.AutoCAD.Interop.Common.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Corel.GraphicsSuite.Interop.CorelDRAW">
+      <HintPath>..\libs\Corel.GraphicsSuite.Interop.CorelDRAW.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Microsoft.Office.Interop.Word, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -95,14 +99,15 @@
     <Compile Include="Extensions\VBComponentsExtensions.cs" />
     <Compile Include="Extensions\VbeExtensions.cs" />
     <Compile Include="VBEHost\AccessApp.cs" />
+    <Compile Include="VBEHost\CorelDRAWApp.cs" />
     <Compile Include="VBEHost\ExcelApp.cs" />
     <Compile Include="VBEHost\HostApplicationBase.cs" />
     <Compile Include="VBEHost\IHostApplication.cs" />
     <Compile Include="VBEHost\OutlookApp.cs" />
     <Compile Include="VBEHost\PowerPointApp.cs" />
     <Compile Include="VBEHost\PublisherApp.cs" />
     <Compile Include="VBEHost\WordApp.cs" />
-	<Compile Include="VBEHost\AutoCADApp.cs" />
+    <Compile Include="VBEHost\AutoCADApp.cs" />
     <Compile Include="Extensions\VbProjectExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Extensions\WindowExtensions.cs" />
diff --git a/Rubberduck.VBEEditor/VBEHost/CorelDRAWApp.cs b/Rubberduck.VBEEditor/VBEHost/CorelDRAWApp.cs
@@ -0,0 +1,28 @@
+using Corel.GraphicsSuite.Interop.CorelDRAW;
+using Microsoft.Vbe.Interop;
+
+namespace Rubberduck.VBEditor.VBEHost
+{
+    public class CorelDRAWApp : HostApplicationBase<Corel.GraphicsSuite.Interop.CorelDRAW.Application>
+    {
+        public CorelDRAWApp() : base("CorelDRAW") { }
+        public CorelDRAWApp(VBE vbe) : base(vbe, "CorelDRAW") { }
+
+		//Function RunMacro(ModuleName As String, MacroName As String, Parameter() As Variant) As Variant
+		//Where ModuleName appears to mean ProjectName, and MacroName has to be provided as "ModuleName.ProcName"
+
+        //TODO:RunMacro can only execute methods in stand-alone projects (not document hosted projects)
+        //TODO:Can only get a CorelDraw application if at least one document is open in CorelDraw.
+		
+        public override void Run(QualifiedMemberName qualifiedMemberName)
+        {
+            var projectName = qualifiedMemberName.QualifiedModuleName.ProjectName;
+            var memberName = qualifiedMemberName.QualifiedModuleName.ComponentName + "." + qualifiedMemberName.MemberName;
+
+            if (Application != null)
+            {
+                Application.GMSManager.RunMacro(projectName, memberName, new object[] {});
+            }
+        }
+    }
+}
diff --git a/Rubberduck.VBEEditor/VBEHost/ExcelApp.cs b/Rubberduck.VBEEditor/VBEHost/ExcelApp.cs
@@ -1,11 +1,13 @@
 ﻿using System.Reflection;
 using Microsoft.Office.Interop.Excel;
+using Microsoft.Vbe.Interop;
 
 namespace Rubberduck.VBEditor.VBEHost
 {
-    public class ExcelApp : HostApplicationBase<Application>
+    public class ExcelApp : HostApplicationBase<Microsoft.Office.Interop.Excel.Application>
     {
         public ExcelApp() : base("Excel") { }
+        public ExcelApp(VBE vbe) : base(vbe, "Excel") { }
 
         public override void Run(QualifiedMemberName qualifiedMemberName)
         {
diff --git a/Rubberduck.VBEEditor/VBEHost/HostApplicationBase.cs b/Rubberduck.VBEEditor/VBEHost/HostApplicationBase.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using Microsoft.Vbe.Interop;
+using System.Linq;
 
 namespace Rubberduck.VBEditor.VBEHost
 {
@@ -24,6 +26,36 @@ protected HostApplicationBase(string applicationName)
             }
         }
 
+        protected HostApplicationBase(VBE vbe, string applicationName)
+        {
+            _applicationName = applicationName;
+
+            try
+            {
+                var appProperty = vbe.VBProjects
+                    .Cast<VBProject>()
+                    .Where(project => project.Protection == vbext_ProjectProtection.vbext_pp_none)
+                    .SelectMany(project => project.VBComponents.Cast<VBComponent>())
+                    .Where(component => component.Type == vbext_ComponentType.vbext_ct_Document
+                    && component.Properties.Count > 1)
+                    .SelectMany(component => component.Properties.OfType<Property>())
+                    .FirstOrDefault(property => property.Name == "Application");
+                if (appProperty != null)
+                {
+                    Application = (TApplication)appProperty.Object;
+                }
+                else
+                {
+                    Application = (TApplication)Marshal.GetActiveObject(applicationName + ".Application");
+                }
+                    
+            }
+            catch (COMException)
+            {
+                Application = null; // unit tests don't need it anyway.
+            }
+        }
+
         ~HostApplicationBase()
         {
 			Dispose(false);
diff --git a/Rubberduck.VBEEditor/VBEHost/WordApp.cs b/Rubberduck.VBEEditor/VBEHost/WordApp.cs
@@ -1,10 +1,12 @@
 using Microsoft.Office.Interop.Word;
+using Microsoft.Vbe.Interop;
 
 namespace Rubberduck.VBEditor.VBEHost
 {
-    public class WordApp : HostApplicationBase<Application>
+    public class WordApp : HostApplicationBase<Microsoft.Office.Interop.Word.Application>
     {
         public WordApp() : base("Word") { }
+        public WordApp(VBE vbe) : base(vbe, "Word") { }
 
         public override void Run(QualifiedMemberName qualifiedMemberName)
         {
diff --git a/Rubberduck.sln b/Rubberduck.sln
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		appveyor.yml = appveyor.yml
 		libs\Autodesk.AutoCAD.Interop.Common.dll = libs\Autodesk.AutoCAD.Interop.Common.dll
 		libs\Autodesk.AutoCAD.Interop.dll = libs\Autodesk.AutoCAD.Interop.dll
+		libs\Corel.GraphicsSuite.Interop.CorelDRAW.dll = libs\Corel.GraphicsSuite.Interop.CorelDRAW.dll
 		libs\Interop.VisioViewer.dll = libs\Interop.VisioViewer.dll
 		libs\Microsoft.Office.Interop.Access.dll = libs\Microsoft.Office.Interop.Access.dll
 		libs\Microsoft.Office.Interop.Excel.dll = libs\Microsoft.Office.Interop.Excel.dll
diff --git a/libs/Corel.GraphicsSuite.Interop.CorelDRAW.dll b/libs/Corel.GraphicsSuite.Interop.CorelDRAW.dll

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ public static void RunMethodsWithAttribute<TAttribute>(this VBComponent componen`
`36`	`36`
`37`	`37`	`public static IEnumerable<TestMethod> TestMethods(this VBProject project)`
`38`	`38`	`{`
`39`		`- var hostApp = project.VBE.HostApplication();`
`40`	`39`
`41`	`40`	`var result = project.VBComponents`
`42`	`41`	`.Cast<VBComponent>()`
`@@ -50,7 +49,6 @@ public static IEnumerable<TestMethod> TestMethods(this VBProject project)`
`50`	`49`
`51`	`50`	`public static IEnumerable<TestMethod> TestMethods(this VBComponent component)`
`52`	`51`	`{`
`53`		`- var hostApp = component.VBE.HostApplication();`
`54`	`52`
`55`	`53`	`if (component.Type == vbext_ComponentType.vbext_ct_StdModule`
`56`	`54`	`&& component.CodeModule.HasAttribute<TestModuleAttribute>())`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ private void ParseParallel()`
`106`	`106`	`try`
`107`	`107`	`{`
`108`	`108`	`var components = _vbe.VBProjects.Cast<VBProject>()`
	`109`	`+ .Where(project => project.Protection == vbext_ProjectProtection.vbext_pp_none)`
`109`	`110`	`.SelectMany(project => project.VBComponents.Cast<VBComponent>())`
`110`	`111`	`.ToList();`
`111`	`112`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`	`1`	`using System.Reflection;`
`2`	`2`	`using Microsoft.Office.Interop.Excel;`
	`3`	`+using Microsoft.Vbe.Interop;`
`3`	`4`
`4`	`5`	`namespace Rubberduck.VBEditor.VBEHost`
`5`	`6`	`{`
`6`		`- public class ExcelApp : HostApplicationBase<Application>`
	`7`	`+ public class ExcelApp : HostApplicationBase<Microsoft.Office.Interop.Excel.Application>`
`7`	`8`	`{`
`8`	`9`	`public ExcelApp() : base("Excel") { }`
	`10`	`+ public ExcelApp(VBE vbe) : base(vbe, "Excel") { }`
`9`	`11`
`10`	`12`	`public override void Run(QualifiedMemberName qualifiedMemberName)`
`11`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`using Microsoft.Office.Interop.Word;`
	`2`	`+using Microsoft.Vbe.Interop;`
`2`	`3`
`3`	`4`	`namespace Rubberduck.VBEditor.VBEHost`
`4`	`5`	`{`
`5`		`- public class WordApp : HostApplicationBase<Application>`
	`6`	`+ public class WordApp : HostApplicationBase<Microsoft.Office.Interop.Word.Application>`
`6`	`7`	`{`
`7`	`8`	`public WordApp() : base("Word") { }`
	`9`	`+ public WordApp(VBE vbe) : base(vbe, "Word") { }`
`8`	`10`
`9`	`11`	`public override void Run(QualifiedMemberName qualifiedMemberName)`
`10`	`12`	`{`