Changeset 1153 for trunk/eraser6

Timestamp:

7/1/2009 11:31:34 AM (4 years ago)

Author:

lowjoel

Message:

If while executing a command-line call we get an Unauthorised access exception, return ERROR_ACCESS_DENIED to the calling process. In the case of the shell extension, this will re-spawn the process with administrator privileges. Implements #216.

Location:

trunk/eraser6

Files:

• Eraser/Program.cs (modified) (1 diff)
• ShellExt/CtxMenu.cpp (modified) (1 diff)

trunk/eraser6/Eraser/Program.cs

@@ -93 +93 @@
 
                 return 0;
+            }
+            catch (UnauthorizedAccessException)
+            {
+                return 5; //ERROR_ACCESS_DENIED
             }
             catch (Win32Exception e)

trunk/eraser6/ShellExt/CtxMenu.cpp

@@ -846 +846 @@
             DWORD exitCode = 0;
             
-            if (GetExitCodeProcess(processInfo.hProcess, &exitCode) && exitCode)
-            {
-                char buffer[8192];
-                DWORD lastRead = 0;
-                std::wstring output;
-
-                while (ReadFile(readPipe, buffer, sizeof(buffer), &lastRead, NULL) && lastRead != 0)
+            if (GetExitCodeProcess(processInfo.hProcess, &exitCode))
+                if (exitCode == ERROR_ACCESS_DENIED)
                 {
-                    size_t lastConvert = 0;
-                    wchar_t wBuffer[8192];
-                    if (!mbstowcs_s(&lastConvert, wBuffer, sizeof(wBuffer) / sizeof(wBuffer[0]),
-                        buffer, lastRead))
+                    //The spawned instance could not connect with the master instance
+                    //because it is running as an administrator. Spawn the new instance
+                    //again, this time as an administrator
+                    RunEraser(action, parameters, true, parent, show);
+                }
+                else if (exitCode)
+                {
+                    char buffer[8192];
+                    DWORD lastRead = 0;
+                    std::wstring output;
+
+                    while (ReadFile(readPipe, buffer, sizeof(buffer), &lastRead, NULL) && lastRead != 0)
                     {
-                        output += std::wstring(wBuffer, lastConvert);
+                        size_t lastConvert = 0;
+                        wchar_t wBuffer[8192];
+                        if (!mbstowcs_s(&lastConvert, wBuffer, sizeof(wBuffer) / sizeof(wBuffer[0]),
+                            buffer, lastRead))
+                        {
+                            output += std::wstring(wBuffer, lastConvert);
+                        }
                     }
+
+                    //Show the error message.
+                    throw output;
                 }
-
-                //Show the error message.
-                throw output;
-            }
         }
     }