diff --git a/ArchiSteamFarm.sln b/ArchiSteamFarm.sln index b74f8f9f2..594a90385 100644 --- a/ArchiSteamFarm.sln +++ b/ArchiSteamFarm.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchiSteamFarm", "ArchiSteamFarm\ArchiSteamFarm.csproj", "{35AF7887-08B9-40E8-A5EA-797D8B60B30C}" EndProject @@ -12,6 +12,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigGenerator", "ConfigGe {35AF7887-08B9-40E8-A5EA-797D8B60B30C} = {35AF7887-08B9-40E8-A5EA-797D8B60B30C} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gui2", "WcfClientGui\Gui2.csproj", "{599121A9-5887-4522-A3D6-61470B90BAD4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -30,6 +32,10 @@ Global {C3F6FE68-5E75-415E-BEA1-1E7C16D6A433}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3F6FE68-5E75-415E-BEA1-1E7C16D6A433}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3F6FE68-5E75-415E-BEA1-1E7C16D6A433}.Release|Any CPU.Build.0 = Release|Any CPU + {599121A9-5887-4522-A3D6-61470B90BAD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {599121A9-5887-4522-A3D6-61470B90BAD4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {599121A9-5887-4522-A3D6-61470B90BAD4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {599121A9-5887-4522-A3D6-61470B90BAD4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs index f12d370d9..0909fddc3 100644 --- a/ArchiSteamFarm/Program.cs +++ b/ArchiSteamFarm/Program.cs @@ -329,8 +329,10 @@ namespace ArchiSteamFarm { break; } result = Console.ReadLine(); + if (!Console.IsOutputRedirected) { Console.Clear(); // For security purposes - ConsoleIsBusy = false; + } + ConsoleIsBusy = false; } return string.IsNullOrEmpty(result) ? null : result.Trim(); diff --git a/WcfClientGui/App.config b/WcfClientGui/App.config new file mode 100644 index 000000000..8e1564635 --- /dev/null +++ b/WcfClientGui/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/WcfClientGui/Form1.Designer.cs b/WcfClientGui/Form1.Designer.cs new file mode 100644 index 000000000..9bfbf5a8c --- /dev/null +++ b/WcfClientGui/Form1.Designer.cs @@ -0,0 +1,482 @@ +namespace Gui2 +{ + partial class Form1 + { + /// + /// Erforderliche Designervariable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Verwendete Ressourcen bereinigen. + /// + /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Vom Windows Form-Designer generierter Code + + /// + /// Erforderliche Methode für die Designerunterstützung. + /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.button5 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.ASFGUI = new System.Windows.Forms.NotifyIcon(this.components); + this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.button6 = new System.Windows.Forms.Button(); + this.button7 = new System.Windows.Forms.Button(); + this.button8 = new System.Windows.Forms.Button(); + this.button9 = new System.Windows.Forms.Button(); + this.button10 = new System.Windows.Forms.Button(); + this.button11 = new System.Windows.Forms.Button(); + this.button12 = new System.Windows.Forms.Button(); + this.button13 = new System.Windows.Forms.Button(); + this.button14 = new System.Windows.Forms.Button(); + this.button15 = new System.Windows.Forms.Button(); + this.button16 = new System.Windows.Forms.Button(); + this.button17 = new System.Windows.Forms.Button(); + this.button18 = new System.Windows.Forms.Button(); + this.button19 = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.button20 = new System.Windows.Forms.Button(); + this.label5 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // button5 + // + this.button5.Location = new System.Drawing.Point(115, 251); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(75, 23); + this.button5.TabIndex = 27; + this.button5.Text = "2fa ok"; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.button5_Click); + // + // button4 + // + this.button4.Location = new System.Drawing.Point(34, 251); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 26; + this.button4.Text = "2fa code"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // button3 + // + this.button3.Location = new System.Drawing.Point(35, 352); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(75, 23); + this.button3.TabIndex = 24; + this.button3.Text = "Redeem"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(35, 211); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 23; + this.button2.Text = "Loot"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(225, 160); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 22; + this.button1.Text = "Send"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(772, 16); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(51, 17); + this.label2.TabIndex = 21; + this.label2.Text = "Output"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(344, 48); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(39, 17); + this.label1.TabIndex = 20; + this.label1.Text = "Input"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(551, 42); + this.textBox2.Multiline = true; + this.textBox2.Name = "textBox2"; + this.textBox2.ReadOnly = true; + this.textBox2.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBox2.Size = new System.Drawing.Size(575, 454); + this.textBox2.TabIndex = 19; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(225, 75); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(296, 79); + this.textBox1.TabIndex = 18; + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(35, 143); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 24); + this.comboBox1.TabIndex = 17; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + // + // checkBox3 + // + this.checkBox3.AutoSize = true; + this.checkBox3.Location = new System.Drawing.Point(35, 116); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(130, 21); + this.checkBox3.TabIndex = 16; + this.checkBox3.Text = "Send to specific"; + this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox3.CheckedChanged += new System.EventHandler(this.checkBox3_CheckedChanged); + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Location = new System.Drawing.Point(35, 89); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(129, 21); + this.checkBox2.TabIndex = 15; + this.checkBox2.Text = "Send to all Bots"; + this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged); + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(143, 14); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(94, 21); + this.checkBox1.TabIndex = 14; + this.checkBox1.Text = "Safemode"; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(35, 476); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(486, 22); + this.textBox3.TabIndex = 28; + this.textBox3.TextChanged += new System.EventHandler(this.textBox3_TextChanged); + // + // ASFGUI + // + this.ASFGUI.Text = "notifyIcon1"; + this.ASFGUI.Visible = true; + this.ASFGUI.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.ASFGUI_MouseDoubleClick); + // + // checkBox4 + // + this.checkBox4.AutoSize = true; + this.checkBox4.Location = new System.Drawing.Point(35, 14); + this.checkBox4.Name = "checkBox4"; + this.checkBox4.Size = new System.Drawing.Size(106, 21); + this.checkBox4.TabIndex = 29; + this.checkBox4.Text = "Send to any"; + this.checkBox4.UseVisualStyleBackColor = true; + this.checkBox4.CheckedChanged += new System.EventHandler(this.checkBox4_CheckedChanged); + // + // button6 + // + this.button6.Location = new System.Drawing.Point(34, 50); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(126, 33); + this.button6.TabIndex = 30; + this.button6.Text = "generate Botlist"; + this.button6.UseVisualStyleBackColor = true; + this.button6.Click += new System.EventHandler(this.button6_Click); + // + // button7 + // + this.button7.Location = new System.Drawing.Point(196, 251); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(75, 23); + this.button7.TabIndex = 31; + this.button7.Text = "2fano"; + this.button7.UseVisualStyleBackColor = true; + this.button7.Click += new System.EventHandler(this.button7_Click); + // + // button8 + // + this.button8.Location = new System.Drawing.Point(116, 352); + this.button8.Name = "button8"; + this.button8.Size = new System.Drawing.Size(75, 23); + this.button8.TabIndex = 32; + this.button8.Text = "2faoff"; + this.button8.UseVisualStyleBackColor = true; + this.button8.Click += new System.EventHandler(this.button8_Click); + // + // button9 + // + this.button9.Location = new System.Drawing.Point(197, 352); + this.button9.Name = "button9"; + this.button9.Size = new System.Drawing.Size(75, 23); + this.button9.TabIndex = 33; + this.button9.Text = "exit"; + this.button9.UseVisualStyleBackColor = true; + this.button9.Click += new System.EventHandler(this.button9_Click); + // + // button10 + // + this.button10.Location = new System.Drawing.Point(115, 211); + this.button10.Name = "button10"; + this.button10.Size = new System.Drawing.Size(75, 23); + this.button10.TabIndex = 34; + this.button10.Text = "farm"; + this.button10.UseVisualStyleBackColor = true; + this.button10.Click += new System.EventHandler(this.button10_Click); + // + // button11 + // + this.button11.Location = new System.Drawing.Point(196, 211); + this.button11.Name = "button11"; + this.button11.Size = new System.Drawing.Size(75, 23); + this.button11.TabIndex = 35; + this.button11.Text = "help"; + this.button11.UseVisualStyleBackColor = true; + this.button11.Click += new System.EventHandler(this.button11_Click); + // + // button12 + // + this.button12.Location = new System.Drawing.Point(277, 211); + this.button12.Name = "button12"; + this.button12.Size = new System.Drawing.Size(75, 23); + this.button12.TabIndex = 36; + this.button12.Text = "start"; + this.button12.UseVisualStyleBackColor = true; + this.button12.Click += new System.EventHandler(this.button12_Click); + // + // button13 + // + this.button13.Location = new System.Drawing.Point(358, 211); + this.button13.Name = "button13"; + this.button13.Size = new System.Drawing.Size(75, 23); + this.button13.TabIndex = 37; + this.button13.Text = "stop"; + this.button13.UseVisualStyleBackColor = true; + this.button13.Click += new System.EventHandler(this.button13_Click); + // + // button14 + // + this.button14.Location = new System.Drawing.Point(439, 211); + this.button14.Name = "button14"; + this.button14.Size = new System.Drawing.Size(75, 23); + this.button14.TabIndex = 38; + this.button14.Text = "pause"; + this.button14.UseVisualStyleBackColor = true; + this.button14.Click += new System.EventHandler(this.button14_Click); + // + // button15 + // + this.button15.Location = new System.Drawing.Point(358, 251); + this.button15.Name = "button15"; + this.button15.Size = new System.Drawing.Size(75, 23); + this.button15.TabIndex = 39; + this.button15.Text = "status"; + this.button15.UseVisualStyleBackColor = true; + this.button15.Click += new System.EventHandler(this.button15_Click); + // + // button16 + // + this.button16.Location = new System.Drawing.Point(439, 251); + this.button16.Name = "button16"; + this.button16.Size = new System.Drawing.Size(75, 23); + this.button16.TabIndex = 40; + this.button16.Text = "status all"; + this.button16.UseVisualStyleBackColor = true; + this.button16.Click += new System.EventHandler(this.button16_Click); + // + // button17 + // + this.button17.Location = new System.Drawing.Point(35, 391); + this.button17.Name = "button17"; + this.button17.Size = new System.Drawing.Size(75, 23); + this.button17.TabIndex = 41; + this.button17.Text = "owns"; + this.button17.UseVisualStyleBackColor = true; + this.button17.Click += new System.EventHandler(this.button17_Click); + // + // button18 + // + this.button18.Location = new System.Drawing.Point(196, 391); + this.button18.Name = "button18"; + this.button18.Size = new System.Drawing.Size(75, 23); + this.button18.TabIndex = 42; + this.button18.Text = "addlicense"; + this.button18.UseVisualStyleBackColor = true; + this.button18.Click += new System.EventHandler(this.button18_Click); + // + // button19 + // + this.button19.Location = new System.Drawing.Point(116, 391); + this.button19.Name = "button19"; + this.button19.Size = new System.Drawing.Size(75, 23); + this.button19.TabIndex = 43; + this.button19.Text = "play"; + this.button19.UseVisualStyleBackColor = true; + this.button19.Click += new System.EventHandler(this.button19_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(32, 302); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(305, 17); + this.label3.TabIndex = 44; + this.label3.Text = "The following do not work with \"Send to all\" and"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(32, 319); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(295, 17); + this.label4.TabIndex = 45; + this.label4.Text = "require confirmation even without \"Safemode\""; + // + // button20 + // + this.button20.Location = new System.Drawing.Point(308, 160); + this.button20.Name = "button20"; + this.button20.Size = new System.Drawing.Size(75, 23); + this.button20.TabIndex = 46; + this.button20.Text = "clear"; + this.button20.UseVisualStyleBackColor = true; + this.button20.Click += new System.EventHandler(this.button20_Click); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(39, 456); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(288, 17); + this.label5.TabIndex = 47; + this.label5.Text = "If you don\'t know what this is... Don\'t touch it!"; + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1138, 510); + this.Controls.Add(this.label5); + this.Controls.Add(this.button20); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.button19); + this.Controls.Add(this.button18); + this.Controls.Add(this.button17); + this.Controls.Add(this.button16); + this.Controls.Add(this.button15); + this.Controls.Add(this.button14); + this.Controls.Add(this.button13); + this.Controls.Add(this.button12); + this.Controls.Add(this.button11); + this.Controls.Add(this.button10); + this.Controls.Add(this.button9); + this.Controls.Add(this.button8); + this.Controls.Add(this.button7); + this.Controls.Add(this.button6); + this.Controls.Add(this.checkBox4); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.button5); + this.Controls.Add(this.button4); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.comboBox1); + this.Controls.Add(this.checkBox3); + this.Controls.Add(this.checkBox2); + this.Controls.Add(this.checkBox1); + this.Name = "Form1"; + this.Text = "Form1"; + this.Load += new System.EventHandler(this.Form1_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button button5; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.NotifyIcon ASFGUI; + private System.Windows.Forms.CheckBox checkBox4; + private System.Windows.Forms.Button button6; + private System.Windows.Forms.Button button7; + private System.Windows.Forms.Button button8; + private System.Windows.Forms.Button button9; + private System.Windows.Forms.Button button10; + private System.Windows.Forms.Button button11; + private System.Windows.Forms.Button button12; + private System.Windows.Forms.Button button13; + private System.Windows.Forms.Button button14; + private System.Windows.Forms.Button button15; + private System.Windows.Forms.Button button16; + private System.Windows.Forms.Button button17; + private System.Windows.Forms.Button button18; + private System.Windows.Forms.Button button19; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Button button20; + private System.Windows.Forms.Label label5; + } +} + diff --git a/WcfClientGui/Form1.cs b/WcfClientGui/Form1.cs new file mode 100644 index 000000000..76db1d018 --- /dev/null +++ b/WcfClientGui/Form1.cs @@ -0,0 +1,364 @@ +/* + _ _ _ ____ _ _____ + / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___ + / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \ + / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | | +/_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_| + + Copyright 2015-2016 Florian "KlappPC" Lang + Contact: ichhoeremusik@gmx.net + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/ + +using System; +using System.Drawing; +using System.Windows.Forms; +using System.ServiceModel; + +namespace Gui2 +{ + + public partial class Form1 : Form + { + private bool safeMode = false; + private bool sendAll = false; + private bool sendAny = true; + private bool sendOne = false; + private string botName = ""; + string[] botList; + private string URL = ""; + ServerProcess proc; + private Client Client; + public Form1() + { + InitializeComponent(); + + // So either the ASF.exe is in the same directory, or we assume development environment. + if (System.IO.File.Exists("ASF.exe")) + { + proc = new ServerProcess("ASF.exe", "--server", textBox2); + } + else + { + proc = new ServerProcess("../../../ArchiSteamFarm/bin/Release/ArchiSteamFarm.exe", "--server", textBox2); + } + proc.Start(); + } + + + protected override void OnFormClosing(FormClosingEventArgs e) + { + proc.Stop(); + base.OnFormClosing(e); + } + + /** + * Sends a single command. can be lead by a ! but it does not have to. + */ + private string sendCommand(string command) + { + if (command.StartsWith("!")) + { + command=command.Substring(1); + } + if (Client == null) + { + Client = new Client(new BasicHttpBinding(), new EndpointAddress(URL)); + } + return Client.HandleCommand(command); + } + + /** + * Maximize again when double clicked on tray icon + */ + private void ASFGUI_MouseDoubleClick(object sender, MouseEventArgs e) + { + this.Show(); + this.WindowState = FormWindowState.Normal; + } + + private void Form1_Load(object sender, System.EventArgs e) + { + this.Resize += new System.EventHandler(this.Form1_Resize); + ASFGUI.Icon = new Icon("cirno.ico"); + textBox2.ScrollBars = ScrollBars.Vertical; + textBox1.ScrollBars = ScrollBars.Vertical; + checkBox4.Checked = true; + textBox3.Text = "http://localhost:1242/ASF"; + URL = "http://localhost:1242/ASF"; + textBox2.Anchor = (AnchorStyles.Right | AnchorStyles.Left); + } + /** + * Minimize to tray instead of taskbar + */ + private void Form1_Resize(object sender, EventArgs e) + { + if (FormWindowState.Minimized == this.WindowState) + { + ASFGUI.Visible = true; + this.Hide(); + } + else if (FormWindowState.Normal == this.WindowState) + { + ASFGUI.Visible = false; + } + } + + /** + * generate a command from a simple command + * That means, adds a botName or makes multiple commands for multiple bots. + */ + private string generateCommand(string command, string arg = "") + { + if (sendOne) + return command + " " + botName + " " + arg; + if (sendAll) + { + string ret = ""; + foreach (string str in botList) + { + ret = ret + command + " " + str + " " + arg + "\r\n"; + } + return ret; + } + return command + arg; + } + /** + * One of the simple buttons got pressed + */ + private void buttonPressed(string command) + { + textBox1.Text = generateCommand(command); + if (!safeMode) + button1_Click(this, null); + } + /** + * One of the complicated buttons was pressed + * We get an argumentlist + */ + private void multiCommand(string command) + { + if (sendAll) + return; + string[] arr = textBox1.Lines; + string cmd = ""; + for (int i = 0; i < arr.Length; i++) + { + if (!String.IsNullOrEmpty(arr[i].Trim())) + { + cmd = cmd + generateCommand(command, arr[i].Trim()) + "\r\n"; + } + } + textBox1.Text = cmd; + } + + /** + * updates the WCF URL in case of custom URL + */ + private void textBox3_TextChanged(object sender, EventArgs e) + { + URL = textBox3.Text; + } + + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + botName= comboBox1.SelectedItem.ToString(); + } + //Ok, radiobuttons would have been better I guess, to lazy to change now. + private void checkBox3_CheckedChanged(object sender, EventArgs e) + { + //specific + if (checkBox3.Checked) + { + sendAll = false; + sendAny = false; + sendOne = true; + checkBox2.Checked = false; + checkBox4.Checked = false; + } + } + + private void checkBox2_CheckedChanged(object sender, EventArgs e) + { + //all + if (checkBox2.Checked) + { + sendAll = true; + sendAny = false; + sendOne = false; + checkBox3.Checked = false; + checkBox4.Checked = false; + } + } + + private void checkBox4_CheckedChanged(object sender, EventArgs e) + { + //any + if (checkBox4.Checked) + { + sendAll = false; + sendAny = true; + sendOne = false; + checkBox2.Checked = false; + checkBox3.Checked = false; + } + } + + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + safeMode = checkBox1.Checked; + } + + + /** + * Send command button. + */ + private void button1_Click(object sender, System.EventArgs e) + { + for (int i = 0; i < textBox1.Lines.Length; i++) + { + string command = textBox1.Lines[i]; + if (!String.IsNullOrEmpty(command.Trim())) + { + sendCommand(command); + } + } + + } + /** + * Update /Generate Botlist button + */ + private void button6_Click(object sender, EventArgs e) + { + string ret = sendCommand("statusall"); + string[] arr = ret.Split('\n'); + int botAmount = Convert.ToInt16(arr[arr.Length - 1].Split('/')[1].Trim().Split(' ')[0]); + botList = new string[botAmount]; + for (int i = 0; i < botAmount; i++) + { + botList[i] = arr[arr.Length - 2 - i].Substring(3).Trim().Split(' ')[0]; + } + comboBox1.Items.AddRange(botList); + } + + //The Rest are simple buttons. + private void button3_Click(object sender, EventArgs e) + { + multiCommand("redeem"); + } + private void button2_Click(object sender, EventArgs e) + { + textBox1.Text = generateCommand("loot"); + if (!safeMode) + button1_Click(this, null); + } + private void button4_Click(object sender, EventArgs e) + { + //2fa + textBox1.Text = generateCommand("2fa"); + if (!safeMode) + button1_Click(this, null); + } + private void button5_Click(object sender, EventArgs e) + { + buttonPressed("2faok"); + } + private void button7_Click(object sender, EventArgs e) + { + buttonPressed("2fano"); + } + private void button8_Click(object sender, EventArgs e) + { + if (sendAll) + return; + textBox1.Text = generateCommand("2faoff"); + } + private void button9_Click(object sender, EventArgs e) + { + textBox1.Text = "exit"; + } + private void button10_Click(object sender, EventArgs e) + { + buttonPressed("farm"); + } + private void button11_Click(object sender, EventArgs e) + { + buttonPressed("help"); + } + private void button12_Click(object sender, EventArgs e) + { + buttonPressed("start"); + } + private void button13_Click(object sender, EventArgs e) + { + buttonPressed("stop"); + } + private void button14_Click(object sender, EventArgs e) + { + buttonPressed("pause"); + } + private void button15_Click(object sender, EventArgs e) + { + buttonPressed("status"); + } + private void button16_Click(object sender, EventArgs e) + { + textBox1.Text = "statusall"; + if (!safeMode) + button1_Click(this, null); + } + private void button17_Click(object sender, EventArgs e) + { + multiCommand("owns"); + } + private void button18_Click(object sender, EventArgs e) + { + multiCommand("addlicense"); + } + private void button19_Click(object sender, EventArgs e) + { + multiCommand("play"); + } + private void button20_Click(object sender, EventArgs e) + { + textBox1.Text = ""; + } + } + + //############### After this point copied from Archie's WCF ################### + [ServiceContract] + interface IWCF + { + [OperationContract] + string HandleCommand(string input); + } + class Client : ClientBase, IWCF + { + internal Client(System.ServiceModel.Channels.Binding binding, EndpointAddress address) : base(binding, address) { } + + public string HandleCommand(string input) + { + try + { + return Channel.HandleCommand(input); + } + catch (Exception e) + { + //Logging.LogGenericException(e); + return null; + } + } + } +} diff --git a/WcfClientGui/Form1.resx b/WcfClientGui/Form1.resx new file mode 100644 index 000000000..768adece5 --- /dev/null +++ b/WcfClientGui/Form1.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/WcfClientGui/Form2.Designer.cs b/WcfClientGui/Form2.Designer.cs new file mode 100644 index 000000000..357f4956a --- /dev/null +++ b/WcfClientGui/Form2.Designer.cs @@ -0,0 +1,83 @@ +namespace Gui2 +{ + partial class Form2 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.button1 = new System.Windows.Forms.Button(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(178, 114); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(116, 34); + this.button1.TabIndex = 0; + this.button1.Text = "OK"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(16, 77); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(446, 22); + this.textBox1.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(13, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(46, 17); + this.label1.TabIndex = 2; + this.label1.Text = "label1"; + // + // Form2 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(474, 162); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.button1); + this.Name = "Form2"; + this.Text = "Input"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/WcfClientGui/Form2.cs b/WcfClientGui/Form2.cs new file mode 100644 index 000000000..610016caf --- /dev/null +++ b/WcfClientGui/Form2.cs @@ -0,0 +1,48 @@ +/* + _ _ _ ____ _ _____ + / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___ + / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \ + / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | | +/_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_| + + Copyright 2015-2016 Florian "KlappPC" Lang + Contact: ichhoeremusik@gmx.net + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/ +using System; +using System.Windows.Forms; + +namespace Gui2 +{ + /** + * popup Message when Input is required + */ + public partial class Form2 : Form + { + ServerProcess proc; + public Form2(ServerProcess proc, string msg) + { + this.proc = proc; + InitializeComponent(); + label1.Text = msg; + button1.DialogResult = DialogResult.OK; + } + + private void button1_Click(object sender, EventArgs e) + { + proc.Write(textBox1.Text); + } + } +} diff --git a/WcfClientGui/Form2.resx b/WcfClientGui/Form2.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/WcfClientGui/Form2.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/WcfClientGui/Gui2.csproj b/WcfClientGui/Gui2.csproj new file mode 100644 index 000000000..8cdd31c2d --- /dev/null +++ b/WcfClientGui/Gui2.csproj @@ -0,0 +1,157 @@ + + + + + Debug + AnyCPU + {599121A9-5887-4522-A3D6-61470B90BAD4} + WinExe + Properties + Gui2 + Gui2 + v4.5 + 512 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + app.manifest + + + cirno.ico + + + Gui2.Program + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + Form1.cs + + + Form + + + Form2.cs + + + + + + Form1.cs + + + Form2.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + + + + + False + Microsoft .NET Framework 4.5 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + \ No newline at end of file diff --git a/WcfClientGui/Program.cs b/WcfClientGui/Program.cs new file mode 100644 index 000000000..d4dc4bd20 --- /dev/null +++ b/WcfClientGui/Program.cs @@ -0,0 +1,19 @@ +using System; +using System.Windows.Forms; + +namespace Gui2 +{ + static class Program + { + /// + /// Der Haupteinstiegspunkt für die Anwendung. + /// + [STAThread] + static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/WcfClientGui/Properties/AssemblyInfo.cs b/WcfClientGui/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..d301f90bb --- /dev/null +++ b/WcfClientGui/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die mit einer Assembly verknüpft sind. +[assembly: AssemblyTitle("Gui2")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Gui2")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("18b85645-1c80-4e25-9dcb-e01684a48fca")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern +// übernehmen, indem Sie "*" eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WcfClientGui/Properties/Resources.Designer.cs b/WcfClientGui/Properties/Resources.Designer.cs new file mode 100644 index 000000000..4f6b30a15 --- /dev/null +++ b/WcfClientGui/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn +// der Code neu generiert wird. +// +//------------------------------------------------------------------------------ + +namespace Gui2.Properties +{ + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// + // Diese Klasse wurde von der StronglyTypedResourceBuilder-Klasse + // über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der Option /str erneut aus, oder erstellen Sie Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Gui2.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/WcfClientGui/Properties/Resources.resx b/WcfClientGui/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/WcfClientGui/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/WcfClientGui/Properties/Settings.Designer.cs b/WcfClientGui/Properties/Settings.Designer.cs new file mode 100644 index 000000000..fa75444d9 --- /dev/null +++ b/WcfClientGui/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Gui2.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/WcfClientGui/Properties/Settings.settings b/WcfClientGui/Properties/Settings.settings new file mode 100644 index 000000000..39645652a --- /dev/null +++ b/WcfClientGui/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/WcfClientGui/ServerProcess.cs b/WcfClientGui/ServerProcess.cs new file mode 100644 index 000000000..aeb460aa2 --- /dev/null +++ b/WcfClientGui/ServerProcess.cs @@ -0,0 +1,193 @@ +/* + _ _ _ ____ _ _____ + / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___ + / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \ + / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | | +/_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_| + + Copyright 2015-2016 Florian "KlappPC" Lang + Contact: ichhoeremusik@gmx.net + This file is mostly done by a friend who explicitly does not want to get mentioned in any way. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/ + +using System.Threading; +using System.Diagnostics; +using System.Windows.Forms; + +namespace Gui2 +{ + /*basically a class to run executables as controlled prozess in the background*/ + public class ServerProcess + { + //ASF.exe in our case + protected Process process; + //handling the output. + protected Thread outputThread; + protected bool stopping; + + //the textbox from our Form, where we want to display output. + private TextBox output; + + private object lockObj = new object(); + + /** + * New SeverProcess for filename with arguments and output to textBox. + * Console is hidden and IO redirected. + */ + public ServerProcess(string fileName, string argumants,TextBox textBox){ + + + output = textBox; + process = new System.Diagnostics.Process(); + + process.StartInfo.FileName = fileName; + process.StartInfo.Arguments = argumants; + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true; + process.StartInfo.RedirectStandardError = true; + process.StartInfo.RedirectStandardOutput = true; + process.StartInfo.CreateNoWindow = true; + + } + //needed for realizing when input is needed. + private int dotcounter = 0; + + /** + * I'm not quite happy with this. I could not figure a way to notice when input is required + * besides reading char by char and searching for keywords. Will stop working, if the "Please enter" + * lines gets changed. + * Only tested for "Enter Password." + */ + private void NewOutput(object sender, char e) + { + MethodInvoker mi = delegate + { + output.AppendText(e.ToString()); + }; + + if (e == '.') + { + dotcounter++; + } + else if(e == ':') { + dotcounter = 3; + }else{ + dotcounter = 0; + } + if (dotcounter == 3) { + string[] arr = output.Lines; + string str = arr[arr.Length - 1]; + if (str.Contains("Hit enter")) + { + str = arr[arr.Length - 2] + " | " + str; + Form f = new Form2(this, str); + f.ShowDialog(); + mi = delegate{output.AppendText(e.ToString()+"\n");}; + } + if (str.Contains("Please enter")) + { + Form f = new Form2(this, str); + f.ShowDialog(); + mi = delegate { output.AppendText(e.ToString() + "\n"); }; + } + + dotcounter = 0; + } + output.Invoke(mi); + + } + + private void NewOutput(object sender, string e) + { + MethodInvoker mi = delegate + { + output.AppendText(e+"\n"); + }; + output.Invoke(mi); + + } + + + private void printOutPut() { + char str; + int i; + string s; + while (!stopping) + { + //thats ugly, but when using readline we can't catch input. + while (((i = process.StandardOutput.Read()) != 0)) + { + str=System.Convert.ToChar(i); + NewOutput(this, str); + if (stopping) + break; + } + + while (((s = process.StandardError.ReadLine()) != null)) + { + NewOutput(this, s); + if (stopping) + break; + } + } + } + + public void Write(string msg) { + process.StandardInput.WriteLine(msg); + process.StandardInput.Flush(); + } + + public void Stop() { + Thread stopThread = new Thread(StopProcess); + stopThread.Start(); + } + + private void StopProcess() { + + if (process == null) + return; + stopping = true; + + outputThread.Abort(); + + Thread.Sleep(1000); + + if (process == null) + return; + + if (process.HasExited) + process.Close(); + else + process.Kill(); + + process = null; + } + /** + * starts the process and a second thread to listen for output. + */ + public void Start() { + outputThread = new Thread(printOutPut); + process.Start(); + outputThread.Start(); + } + + public Process Process { + get { + return process; + } + } + } +} diff --git a/WcfClientGui/app.manifest b/WcfClientGui/app.manifest new file mode 100644 index 000000000..01dfed4d7 --- /dev/null +++ b/WcfClientGui/app.manifest @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WcfClientGui/cirno.ico b/WcfClientGui/cirno.ico new file mode 100644 index 000000000..1d8c2e1eb Binary files /dev/null and b/WcfClientGui/cirno.ico differ