Merge lp:~wwahammy-deactivatedaccount/coapp-toolkit/developing into lp:coapp-toolkit

[Eric Schultz]

The current version of ProgramFinder.GetToolVersion fails when the application using the library is built for x64 or is built for AnyCPU but is running on x64. The last call to NativeMethods.VerQueryValue in GetToolVersion crashes because it expects versionInfo to have a 32-bit address, not a 64-bit one. I really don't know why this is going on but in order to fix it, I've removed the unsafe code with managed code that performs the same purpose.

Also because of this change we're not using any of the methods in NativeMethods anymore so I removed that class.

[lp:~wwahammy-deactivatedaccount/coapp-toolkit/developing]

35. By Garrett Serack on 2010-12-19

Fixed Garrett's Insanity

=== modified file 'Utility/NativeMethods.cs'
--- Utility/NativeMethods.cs	2010-07-13 19:45:09 +0000
+++ Utility/NativeMethods.cs	2010-12-19 05:21:14 +0000
@@ -17,18 +17,6 @@
     using System;
     using System.Runtime.InteropServices;
 
-    class NativeMethods
-    {
-        [DllImport("version.dll")]
-        public static extern int GetFileVersionInfoSize(string sFileName, out int handle);
-        [DllImport("version.dll")]
-        public static extern bool GetFileVersionInfo(string sFileName, int handle, int size, byte[] infoBuffer);
-        [DllImport("version.dll")]
-        unsafe public static extern bool VerQueryValue(byte[] pBlock, string pSubBlock, out string pValue, out uint len);
-        [DllImport("version.dll")]
-        unsafe public static extern bool VerQueryValue(byte[] pBlock, string pSubBlock, out short* pValue, out uint len);
-    }
-
     public enum MachineType
     {
         Native = 0,

=== modified file 'Utility/ProgramFinder.cs'
--- Utility/ProgramFinder.cs	2010-11-19 20:29:47 +0000
+++ Utility/ProgramFinder.cs	2010-12-19 05:21:14 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright company="CoApp Project">
 //     Original Copyright (c) 2009 Microsoft Corporation. All rights reserved.
-//     Changes Copyright (c) 2010  Garrett Serack. All rights reserved.
+//     Changes Copyright (c) 2010  Eric Schultz, Garrett Serack. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
 
@@ -18,6 +18,7 @@
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using System.Diagnostics;
 
     public class ProgramFinder
     {
@@ -287,32 +288,18 @@
 
         }
 
-        unsafe public virtual string GetToolVersion(string FileName)
+        public virtual string GetToolVersion(string FileName)
         {
-            int handle;
-            // Figure out how much version info there is:
-            int size = NativeMethods.GetFileVersionInfoSize(FileName, out handle);
-
-            if (0 == size)
-                return null;
-
-            byte[] buffer = new byte[size];
-
-            if (!NativeMethods.GetFileVersionInfo(FileName, handle, size, buffer))
-                return null;
-
-            short* subBlock;
-            uint len;
-            // Get the locale info from the version info:
-            if (!NativeMethods.VerQueryValue(buffer, @"\VarFileInfo\Translation", out subBlock, out len))
-                return null;
-
-            string spv = @"\StringFileInfo\" + subBlock[0].ToString("X4") + subBlock[1].ToString("X4") + @"\ProductVersion";
-
-            // Get the ProductVersion value for this program:
-            string versionInfo;
-
-            return !NativeMethods.VerQueryValue(buffer, spv, out versionInfo, out len) ? null : versionInfo;
+            
+            try
+            {
+                FileVersionInfo info = FileVersionInfo.GetVersionInfo(FileName);
+                return info.FileVersion;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public static ExecutableInfo GetExeType(string filename)