Elevate privileges when required. Version up.

jwaliszko · Apr 2, 2014 · 3f0de96 · 3f0de96
1 parent 4801b62
commit 3f0de96
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 12 deletions.
diff --git a/src/Resurrect/AttachCenter.cs b/src/Resurrect/AttachCenter.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel.Design;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Threading;
 using EnvDTE80;
 using EnvDTE90;
@@ -21,7 +22,7 @@ public class AttachCenter
         private OleMenuCommand _command;
 
         private static AttachCenter _instance;
-        private static readonly object _locker = new object();
+        private static readonly object _locker = new object();        
 
         private AttachCenter(IServiceProvider provider, Debugger3 dteDebugger)
         {
@@ -136,19 +137,42 @@ private void AttachToProcesses(object sender, EventArgs e)
                             }
                         }
                     }
-                    foreach (var process in processes)
-                    {
-                        process.Attach2(engines.Any() ? engines.ToArray() : new[] { transport.Engines.Item("Managed/Native") });
-                    }
+
+                    PerformAttachOperation(processes, engines, transport);
                 }
                 else
                 {
-                    ShowMessage("No historic processes found alive. Debug session cannot be resurrected.");
+                    ShowMessage("No historic processes found alive. Debug session cannot be resurrected.", OLEMSGICON.OLEMSGICON_INFO);
                 }
             }
         }
 
-        private void ShowMessage(string message)
+        private void PerformAttachOperation(IList<Process3> processes, IList<Engine> engines, Transport transport)
+        {
+            try
+            {
+                foreach (var process in processes)
+                {
+                    process.Attach2(engines.Any() ? engines.ToArray() : new[] {transport.Engines.Item("Managed/Native")});
+                }
+            }
+            catch (COMException ex)
+            {
+                ThrowElevationRequired();
+            }
+            catch (Exception ex)
+            {
+                ShowMessage(string.Format("Unexpected problem: {0}.", ex.Message), OLEMSGICON.OLEMSGICON_CRITICAL);
+            }
+        }
+
+        private void ThrowElevationRequired()
+        {
+            const int ERROR_ELEVATION_REQUIRED = unchecked((int)0x800702E4);
+            Marshal.ThrowExceptionForHR(ERROR_ELEVATION_REQUIRED);
+        }
+
+        private void ShowMessage(string message, OLEMSGICON type)
         {
 			var shell = (IVsUIShell)_provider.GetService(typeof(SVsUIShell));
 			var clsid = Guid.Empty;
@@ -163,7 +187,7 @@ private void ShowMessage(string message)
 				0,
 				OLEMSGBUTTON.OLEMSGBUTTON_OK,
 				OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST,
-				OLEMSGICON.OLEMSGICON_INFO,
+                type,
 				0, // false
                 out pnResult);
         }
@@ -187,6 +211,6 @@ private int AskQuestion(string message)
                 0, // false
                 out pnResult);
             return pnResult;
-        }
+        }        
     }
 }
diff --git a/src/Resurrect/Properties/AssemblyInfo.cs b/src/Resurrect/Properties/AssemblyInfo.cs
@@ -28,8 +28,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
 
 
 
diff --git a/src/Resurrect/source.extension.vsixmanifest b/src/Resurrect/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="ae98c9e5-8e14-4c92-b45a-c4fd24a498ef">
     <Name>Resurrect</Name>
     <Author>Jaroslaw Waliszko</Author>
-    <Version>1.2</Version>
+    <Version>1.3</Version>
     <Description xml:space="preserve">Resurrects debugging session with previously attached processes.</Description>
     <MoreInfoUrl>https://github.com/JaroslawWaliszko/Resurrect</MoreInfoUrl>
     <License>LICENSE.txt</License>