0.9.2.0

What's new?
* Using menu to insert marks into args templet.
* Simulate cmd function, enhance sometime compatibility.
* Other changes.

Bug Fix
* Some bug fix.

Author: kkocdko

UniversalGUI/IniManager.cs

@@ -21,11 +21,11 @@ public class IniManager
     /// <returns></returns>
     [DllImport("kernel32")]
     private static extern int GetPrivateProfileString(
-        string section,
-        string key,
-        string value,
-        StringBuilder cache,
-        int cacheSize,
+        string section, 
+        string key, 
+        string value, 
+        StringBuilder cache, 
+        int cacheSize, 
         string path);
 
     /// <summary>
@@ -38,9 +38,9 @@ private static extern int GetPrivateProfileString(
     /// <returns>0：error 1：success</returns>
     [DllImport("kernel32")]
     private static extern long WritePrivateProfileString(
-        string section,
-        string key,
-        string value,
+        string section, 
+        string key, 
+        string value, 
         string path);
     #endregion
 

UniversalGUI/LoadResourceDll.cs

@@ -57,7 +57,7 @@ private static Assembly AssemblyResolve(object sender, ResolveEventArgs args)
         /// <summary>
         /// 注册资源中的dll
         /// </summary>
-        /// <param name="pattern">*表示连续的未知字符,_表示单个未知字符,如*.dll</param>
+        /// <param name="pattern">*表示连续的未知字符, _表示单个未知字符, 如*.dll</param>
         public static void RegistDLL(string pattern = "*.dll")
         {
             System.IO.Directory.GetFiles("", "");
@@ -70,14 +70,14 @@ public static void RegistDLL(string pattern = "*.dll")
             }
             //程序集加入已处理集合
             Assemblies.Add(ass.FullName, null);
-            //绑定程序集加载失败事件(这里我测试了,就算重复绑也是没关系的)
+            //绑定程序集加载失败事件(这里我测试了, 就算重复绑也是没关系的)
             AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolve;
             //获取所有资源文件文件名
             var res = ass.GetManifestResourceNames();
             var regex = new Regex("^" + pattern.Replace(".", "\\.").Replace("*", ".*").Replace("_", ".") + "$", RegexOptions.IgnoreCase);
             foreach (var r in res)
             {
-                //如果是dll,则加载
+                //如果是dll, 则加载
                 if (regex.IsMatch(r))
                 {
                     try

UniversalGUI/MainWindow.xaml

@@ -35,6 +35,7 @@ public async void StartTaskAsync()
             SumConfig();
             bool settingLegal = CheckConfig();
 
+            //debug
             //Run on background thread
             await Task.Run(() =>
             {
@@ -86,7 +87,8 @@ await Task.Run(() =>
                         appPath: config.AppPath,
                         appArgs: sumAppArgs,
                         windowStyle: config.WindowStyle,
-                        priority: config.Priority);
+                        priority: config.Priority,
+                        simulateCmd: config.SimulateCmd);
                 });
                 config.CompletedFileNum++;
                 Dispatcher.Invoke(() =>
@@ -101,25 +103,24 @@ private string SumAppArgs(string argsTemplet, string inputFile, string userArgs,
             //去前后引号
             inputFile = new Regex("(^\")|(\"$)").Replace(inputFile, "");
             argsTemplet = new Regex("(^\")|(\"$)").Replace(argsTemplet, "");
-            userArgs = new Regex("(^\")|(\"$)").Replace(userArgs, "");
             outputSuffix = new Regex("(^\")|(\"$)").Replace(outputSuffix, "");
             outputExtension = new Regex("(^\")|(\"$)").Replace(outputExtension, "");
             outputFloder = new Regex("(^\")|(\"$)").Replace(outputFloder, "");
-            
-            string arguments = argsTemplet;
+
+            string args = argsTemplet;
 
             //替换 {UserParameters}
             {
                 //替换模板中的标记
-                arguments = new Regex(@"\{UserParameters\}").Replace(arguments, userArgs);
+                args = new Regex(@"\{UserParameters\}").Replace(args, userArgs);
             }
 
             //替换 {InputFile}
             {
                 //加前后引号
                 string inputFile2 = "\"" + inputFile + "\"";
                 //替换模板中的标记
-                arguments = new Regex(@"\{InputFile\}").Replace(arguments, inputFile2);
+                args = new Regex(@"\{InputFile\}").Replace(args, inputFile2);
             }
 
             //替换 {OutputFile}
@@ -166,17 +167,31 @@ private string SumAppArgs(string argsTemplet, string inputFile, string userArgs,
                 //加前后引号
                 outputFile = "\"" + outputFile + "\"";
                 //替换模板中的标记
-                arguments = new Regex(@"\{OutputFile\}").Replace(arguments, outputFile);
+                args = new Regex(@"\{OutputFile\}").Replace(args, outputFile);
             }
 
-            return arguments;
+            return args;
         }
 
-        private void NewProcess(string appPath, string appArgs, uint windowStyle, uint priority)
+        private void NewProcess(string appPath, string appArgs, uint windowStyle, uint priority, bool simulateCmd)
         {
             var process = new Process();
-            process.StartInfo.FileName = appPath;
-            process.StartInfo.Arguments = appArgs;
+            if (simulateCmd == false)
+            {
+                process.StartInfo.FileName = appPath;
+                process.StartInfo.Arguments = appArgs;
+            }
+            else
+            {
+                process.StartInfo.FileName = "cmd.exe";
+                process.StartInfo.Arguments = "/c" + " " + appPath + " " + appArgs; //这边不能给appPath加引号
+            }
+
+            Debug.WriteLine(process.StartInfo.Arguments);
+            //int id = process.Id;
+            //Process.GetProcessById(999999).Kill();
+            //Process.GetCurrentProcess().Kill();
+
             switch (windowStyle)
             {
                 case 1:
@@ -191,11 +206,16 @@ private void NewProcess(string appPath, string appArgs, uint windowStyle, uint p
                 case 4:
                     process.StartInfo.WindowStyle = ProcessWindowStyle.Maximized;
                     break;
-                default:
-                    break;
             }
 
-            process.Start();
+            try
+            {
+                process.Start();
+            }
+            catch (System.ComponentModel.Win32Exception e)
+            {
+                Debug.WriteLine(e.ToString());
+            }
 
             process.PriorityBoostEnabled = false;
             switch (priority)
@@ -241,6 +261,15 @@ private void SumConfig()
                 config.Priority = Convert.ToUInt32(Priority.SelectedValue);
                 config.ThreadNumber = Convert.ToUInt32(ThreadNumber.SelectedValue);
                 config.WindowStyle = Convert.ToUInt32(CUIWindowStyle.SelectedValue);
+                switch (Convert.ToUInt32(SimulateCmd.SelectedValue))
+                {
+                    case 1:
+                        config.SimulateCmd = false;
+                        break;
+                    case 2:
+                        config.SimulateCmd = true;
+                        break;
+                }
             });
         }
     }
@@ -321,7 +350,7 @@ private void SetProgress(double multiple = -2)
                 TaskbarManager.Instance.SetProgressValue(100, 100, this);
                 TaskbarManager.Instance.SetProgressState(TaskbarProgressBarState.Error, this);
             }
-            else if (multiple >= 0 && multiple <= 1) //修改
+            else if (multiple >= 0 && multiple <= 1) //一般修改
             {
                 int percent = Convert.ToInt32(Math.Round(multiple * 100));
                 SetTitleSuffix(percent + "%");
@@ -340,7 +369,7 @@ private void SetTitleSuffix(string suffix = "")
             }
             else
             {
-                Title = DefaultTitle + " [" + suffix + "]";
+                Title = DefaultTitle + " " + suffix;
             }
         }
 
@@ -365,31 +394,31 @@ await Task.Run(() =>
                     if (usedMem >= 1099511627776) //占用内存>=1TB
                     {
                         memUnit = "TB";
-                        usedMem = usedMem / 1099511627776; //1024^4（4次方）
+                        usedMem /= 1099511627776; //1024^4（4次方）
                         usedMem = Math.Round(usedMem, 3);
                     }
                     else if (usedMem >= 107374182400) //>=100GB
                     {
                         memUnit = "GB";
-                        usedMem = usedMem / 1073741824; //^3
+                        usedMem /= 1073741824; //^3
                         usedMem = Math.Round(usedMem, 1);
                     }
                     else if (usedMem >= 10737418240) //>=10GB
                     {
                         memUnit = "GB";
-                        usedMem = usedMem / 1073741824; //^3
+                        usedMem /= 1073741824; //^3
                         usedMem = Math.Round(usedMem, 2);
                     }
                     else if (usedMem >= 1073741824) //>=1GB
                     {
                         memUnit = "GB";
-                        usedMem = usedMem / 1073741824; //^3
+                        usedMem /= 1073741824; //^3
                         usedMem = Math.Round(usedMem, 3);
                     }
                     else if (usedMem >= 104857600) //>=100MB
                     {
                         memUnit = "MB";
-                        usedMem = usedMem / 1048576;//^2
+                        usedMem /= 1048576;//^2
                         usedMem = Math.Round(usedMem, 1);
                     }
 
@@ -415,13 +444,7 @@ private bool CheckConfig()
             }
             else if (AppPath.Text == "")
             {
-                string content = QueryLangDict("MessageBox_Content_CheckConfig_CommandApplicationIsUnspecified");
-                MessageBox.Show(content, title);
-                return false;
-            }
-            else if (ArgsTemplet.Text == "")
-            {
-                string content = QueryLangDict("MessageBox_Content_CheckConfig_ArgumentsTempletIsUnspecified");
+                string content = QueryLangDict("MessageBox_Content_CheckConfig_CommandAppIsUnspecified");
                 MessageBox.Show(content, title);
                 return false;
             }
@@ -440,6 +463,12 @@ private bool CheckConfig()
                     return false;
                 }
             }
+            else if (AppPath.Text.IndexOf(' ') != -1 && Convert.ToInt32(SimulateCmd.SelectedValue) == 2)
+            {
+                string content = QueryLangDict("MessageBox_Content_CheckConfig_SimulateCmdConfigIsIllegal");
+                MessageBox.Show(content, title);
+                return false;
+            }
             return true;
         }
 
@@ -495,7 +524,7 @@ private void FilesList_Drop(object sender, DragEventArgs e)
             }
         }
 
-        private void SwitchApplicationPath(object sender, RoutedEventArgs e)
+        private void SwitchAppPath(object sender, RoutedEventArgs e)
         {
             var openFileDialog = new Microsoft.Win32.OpenFileDialog()
             {
@@ -508,18 +537,44 @@ private void SwitchApplicationPath(object sender, RoutedEventArgs e)
             }
         }
 
-        private void ApplicationPath_PreviewDragOver(object sender, DragEventArgs e)
+        private void AppPath_PreviewDragOver(object sender, DragEventArgs e)
         {
             e.Effects = DragDropEffects.Copy;
             e.Handled = true;
         }
 
-        private void ApplicationPath_PreviewDrop(object sender, DragEventArgs e)
+        private void AppPath_PreviewDrop(object sender, DragEventArgs e)
         {
             string[] dropFiles = (string[])e.Data.GetData(DataFormats.FileDrop);
             AppPath.Text = dropFiles[0];
         }
-        
+
+        private void InsertArgsTempletTag(string tagContent)
+        {
+            string text = ArgsTemplet.Text;
+            string insertContent = "{" + tagContent + "}";
+            int selectionStart = ArgsTemplet.SelectionStart;
+            text = text.Insert(selectionStart, insertContent);
+            ArgsTemplet.Text = text;
+            ArgsTemplet.SelectionStart = selectionStart + insertContent.Length;
+            ArgsTemplet.Focus();
+        }
+
+        private void InsertArgsTempletMark_UserParameters(object sender, RoutedEventArgs e)
+        {
+            InsertArgsTempletTag("UserParameters");
+        }
+
+        private void InsertArgsTempletMark_InputFile(object sender, RoutedEventArgs e)
+        {
+            InsertArgsTempletTag("InputFile");
+        }
+
+        private void InsertArgsTempletMark_OutputFile(object sender, RoutedEventArgs e)
+        {
+            InsertArgsTempletTag("OutputFile");
+        }
+
         private void ShowArgsTempletHelp(object sender, RoutedEventArgs e)
         {
             string title = QueryLangDict("MessageBox_Title_Hint");
@@ -656,13 +711,14 @@ private void ImputIniConfig(IniManager ini)
                         }
                         ThreadNumber.SelectedValue = threadNumber;
                         CUIWindowStyle.SelectedValue = ini.Read("Process", "WindowStyle");
+                        SimulateCmd.SelectedValue = ini.Read("Process", "SimulateCmd");
                         string culture = ini.Read("Language", "Culture");
                         if (culture != "")
                         {
                             Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
                         }
                     }
-                    catch(Exception e)
+                    catch (Exception e)
                     {
                         string title = QueryLangDict("MessageBox_Title_Error");
                         string content = QueryLangDict("MessageBox_Content_Configfile_FormatMistake");
@@ -696,6 +752,7 @@ private void SaveIniConfig(IniManager ini)
                     ini.Write("Process", "Priority", Priority.SelectedValue);
                     ini.Write("Process", "ThreadNumber", ThreadNumber.SelectedValue);
                     ini.Write("Process", "WindowStyle", CUIWindowStyle.SelectedValue);
+                    ini.Write("Process", "SimulateCmd", SimulateCmd.SelectedValue);
                 }
                 else
                 {
@@ -723,6 +780,8 @@ public class Config
         public int FilesSum = 0;
         public int CompletedFileNum = 0;
 
+        public LinkedList<int> runningProcessesID = new LinkedList<int>();
+
         public string AppPath;
         public string ArgsTemplet;
         public string UserArgs;
@@ -733,5 +792,6 @@ public class Config
         public uint Priority;
         public uint ThreadNumber;
         public uint WindowStyle;
+        public bool SimulateCmd;
     }
 }

UniversalGUI/MainWindow.xaml.cs

@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.2.9")]
-[assembly: AssemblyFileVersion("0.8.2.9")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]