調整訊息框、錯誤處理

kouji6309 · Apr 26, 2022 · 99bab9a · 99bab9a
1 parent 41a72db
commit 99bab9a
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 45 deletions.
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
diff --git a/MainForm.cs b/MainForm.cs
@@ -82,7 +82,7 @@ private void capacityBox_KeyUp(object sender, KeyEventArgs e) {
 
             if (!Program.TryParseCapacity(capacityBox.Text, out var value)) {
                 capacityBox.ForeColor = Color.Red;
-                capacityToolTip.SetToolTip(capacityBox, "The capacity vaue is not valid.");
+                capacityToolTip.SetToolTip(capacityBox, "The capacity vaue is invalid.");
                 capacity = -1;
                 return;
             }
@@ -104,7 +104,11 @@ private void capacityBox_KeyUp(object sender, KeyEventArgs e) {
         private String _filename = "";
         public String Filename {
             get {
-                return Path.Combine(_basepath, _filename);
+                var filename = _filename;
+                if (!filename.ToLower().EndsWith(".vhdx")) {
+                    filename = Path.ChangeExtension(filename, ".vhdx");
+                }
+                return Path.Combine(_basepath, filename);
             }
             set {
                 try {
@@ -130,7 +134,7 @@ private void filenameBox_KeyUp(object sender, KeyEventArgs e) {
 
             if (filename.IndexOfAny(Path.GetInvalidFileNameChars()) > 0) {
                 filenameBox.ForeColor = Color.Red;
-                filenameToolTip.SetToolTip(filenameBox, "The file name is not valid.");
+                filenameToolTip.SetToolTip(filenameBox, "The file name is invalid.");
                 return;
             }
 
@@ -159,10 +163,15 @@ private void actionButton_Click(object sender, EventArgs e) {
             command.Add("--capacity");
             command.Add(Capacity.ToString());
 
-            var result = Program.RunProcess(Program.Location, command);
-            if (result != 0) {
-                MessageBox.Show(result.ToString(), Program.Title, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            try {
+                var result = Program.RunProcess(Program.Location, command);
+                if (result != 0) {
+                    Program.Msgbox("Unable to create VHDX.", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                }
+            } catch (Exception ex) {
+                Program.Msgbox(ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
             }
+
             Close();
         }
     }

diff --git a/Program.cs b/Program.cs
@@ -34,13 +34,13 @@ internal static class Program {
 
         [STAThread]
         private static Int32 Main(String[] args) {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+
             Attached = AttachConsole(-1);
             var errorCode = 0;
             var message = "";
             try {
-                Application.EnableVisualStyles();
-                Application.SetCompatibleTextRenderingDefault(false);
-
                 var command = args.FirstOrDefault()?.ToLower();
                 if (command == "create") {
                     DoCreate(args);
@@ -67,7 +67,7 @@ private static Int32 Main(String[] args) {
 
             if (!String.IsNullOrEmpty(message)) {
                 if (!Attached) {
-                    MessageBox.Show(message, Title, MessageBoxButtons.OK, errorCode == 0 ? MessageBoxIcon.Information : MessageBoxIcon.Exclamation);
+                    Msgbox(message, MessageBoxButtons.OK, errorCode == 0 ? MessageBoxIcon.Information : MessageBoxIcon.Exclamation);
                 } else {
                     Console.WriteLine("");
                     Console.WriteLine(message);
@@ -114,7 +114,7 @@ private static void DoCreate(String[] args) {
             }
 
             if (!IsPathValid(file)) {
-                throw new CvhdxXException("The file name is not valid.");
+                throw new CvhdxXException("The file name is invalid.");
             }
 
             if (File.Exists(file)) {
@@ -162,7 +162,7 @@ private static void DoExpand(String[] args) {
             }
 
             if (!IsPathValid(file)) {
-                throw new CvhdxXException("The file name is not valid.");
+                throw new CvhdxXException("The file name is invalid.");
             }
 
             if (!File.Exists(file)) {
@@ -198,7 +198,11 @@ private static Boolean DoCompact(String[] args) {
             }
 
             if (!IsElevated) {
-                RunProcess(Location, args);
+                try {
+                    RunProcess(Location, args);
+                } catch (Exception ex) {
+                    Msgbox(ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                }
                 return false;
             }
 
@@ -207,7 +211,7 @@ private static Boolean DoCompact(String[] args) {
             }
 
             if (!IsPathValid(file)) {
-                throw new CvhdxXException("The file name is not valid.");
+                throw new CvhdxXException("The file name is invalid.");
             }
 
             if (!File.Exists(file)) {
@@ -235,7 +239,11 @@ private static void ShowForm(String[] args) {
                 var filename = args[0];
                 var fileExists = File.Exists(filename);
                 if (fileExists && !IsElevated) {
-                    RunProcess(Location, args);
+                    try {
+                        RunProcess(Location, args);
+                    } catch (Exception ex) {
+                        Msgbox(ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                    }
                     return;
                 }
 
@@ -251,14 +259,14 @@ private static void ShowForm(String[] args) {
 
                 Application.Run(form);
             } catch (Exception ex) {
-                MessageBox.Show(ex.Message, Program.Title, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                Msgbox(ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                 throw;
             }
         }
 
         private static void DoRegister() {
             if (!IsElevated) {
-                MessageBox.Show("Run as administrator to register.", Program.Title, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                Msgbox("Run as administrator to register.", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                 throw new CvhdxXException("Access is denied.");
             }
 
@@ -324,7 +332,7 @@ public static Int32 RunProcess(String filename, IEnumerable<String> args) {
                 p.WaitForExit();
                 return p.ExitCode;
             } catch {
-                return -1;
+                throw;
             }
         }
 
@@ -373,6 +381,10 @@ public static Boolean TryParseCapacity(String str, out Int32 capacity) {
             capacity = (Int32)(value * UnitMapping[matches[0].Groups[2].Value] / UnitMapping["MB"]);
             return true;
         }
+
+        public static DialogResult Msgbox(String text, MessageBoxButtons button, MessageBoxIcon icon) {
+            return MessageBox.Show(text, Title, button, icon);
+        }
     }
 
     internal class CvhdxXException : Exception {