From 80b54cad2533411187e496d058c41500713cd034 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sun, 5 May 2013 11:23:55 +0200 Subject: [PATCH] some optimizations --- ClientServerLib/ClientServerLib/CClient.cs | 2 +- .../ClientServerLib/CConnection.cs | 4 +-- .../ClientServerLib/Vocaluxe/CCommands.cs | 18 ++++------- ClientServerLib/ClientTest/ClientTest.cs | 16 +++------- Output/ClientServerLib.dll | Bin 39424 -> 39424 bytes Vocaluxe/Base/Server/CVocaluxeServer.cs | 30 +++++++++++------- Vocaluxe/Vocaluxe.csproj | 1 + 7 files changed, 33 insertions(+), 38 deletions(-) diff --git a/ClientServerLib/ClientServerLib/CClient.cs b/ClientServerLib/ClientServerLib/CClient.cs index fe8b4a58..36804951 100644 --- a/ClientServerLib/ClientServerLib/CClient.cs +++ b/ClientServerLib/ClientServerLib/CClient.cs @@ -115,7 +115,7 @@ namespace ClientServerLib connected = true; RaiseOnConnectionChanged(); } - catch (Exception e) + catch { connected = false; RaiseOnConnectionChanged(); diff --git a/ClientServerLib/ClientServerLib/CConnection.cs b/ClientServerLib/ClientServerLib/CConnection.cs index 900a4366..b1b7b1d3 100644 --- a/ClientServerLib/ClientServerLib/CConnection.cs +++ b/ClientServerLib/ClientServerLib/CConnection.cs @@ -71,7 +71,7 @@ namespace ClientServerLib if (Data == null || !keySet) return Data; - using (Aes aes = Aes.Create()) + using (Aes aes = new AesManaged()) { aes.Key = dh.Key; aes.GenerateIV(); @@ -117,7 +117,7 @@ namespace ClientServerLib Array.Copy(Data, 4, IV, 0, 16); int dataLength = BitConverter.ToInt32(Data, 20); - using (Aes aes = Aes.Create()) + using (Aes aes = new AesManaged()) { aes.Key = dh.Key; aes.IV = IV; diff --git a/ClientServerLib/ClientServerLib/Vocaluxe/CCommands.cs b/ClientServerLib/ClientServerLib/Vocaluxe/CCommands.cs index cec22606..274d49b0 100644 --- a/ClientServerLib/ClientServerLib/Vocaluxe/CCommands.cs +++ b/ClientServerLib/ClientServerLib/Vocaluxe/CCommands.cs @@ -6,7 +6,6 @@ using System.Runtime.Serialization.Formatters; using System.Runtime.Serialization.Formatters.Binary; using System.Text; using System.Security.Cryptography; -using System.Windows.Forms; namespace Vocaluxe.Base.Server @@ -24,8 +23,11 @@ namespace Vocaluxe.Base.Server public const int ResponseLoginOK = 23; - public const int CommandSendKeyEvent = 100; - public const int CommandSendKeyStroke = 101; + public const int CommandSendKeyStroke = 100; + public const int CommandSendKeyUp = 110; + public const int CommandSendKeyDown = 111; + public const int CommandSendKeyLeft = 112; + public const int CommandSendKeyRight = 113; public const int CommandSendMouseMoveEvent = 200; public const int CommandSendMouseLBDownEvent = 220; @@ -59,15 +61,7 @@ namespace Vocaluxe.Base.Server #endregion Login #region Keyboard - public static byte[] CreateCommandSendKeyEvent(Keys Key) - { - return Serialize(CommandSendKeyEvent, Key); - } - public static bool DecodeCommandSendKeyEvent(byte[] Message, out Keys Key) - { - return TryDeserialize(Message, out Key); - } #endregion Keyboard @@ -109,7 +103,7 @@ namespace Vocaluxe.Base.Server obj = (T)formatter.Deserialize(ms); return true; } - catch (Exception) + catch (Exception e) { return false; } diff --git a/ClientServerLib/ClientTest/ClientTest.cs b/ClientServerLib/ClientTest/ClientTest.cs index 50d9f4db..e05f9705 100644 --- a/ClientServerLib/ClientTest/ClientTest.cs +++ b/ClientServerLib/ClientTest/ClientTest.cs @@ -32,14 +32,6 @@ namespace ClientTest base.OnClosing(e); } - private void OnKeyDown(object sender, KeyEventArgs e) - { - if (!client.Connected || !loggedIn) - return; - - client.SendMessage(CCommands.CreateCommandSendKeyEvent(e.KeyCode), null); - } - private void btConnect_Click(object sender, EventArgs e) { if (!client.Connected) @@ -185,7 +177,7 @@ namespace ClientTest if (!client.Connected || !loggedIn) return; - client.SendMessage(CCommands.CreateCommandSendKeyEvent(Keys.Up), null); + client.SendMessage(CCommands.CreateCommandWithoutParams(CCommands.CommandSendKeyUp), null); } private void btLeft_Click(object sender, EventArgs e) @@ -193,7 +185,7 @@ namespace ClientTest if (!client.Connected || !loggedIn) return; - client.SendMessage(CCommands.CreateCommandSendKeyEvent(Keys.Left), null); + client.SendMessage(CCommands.CreateCommandWithoutParams(CCommands.CommandSendKeyLeft), null); } private void btDown_Click(object sender, EventArgs e) @@ -201,7 +193,7 @@ namespace ClientTest if (!client.Connected || !loggedIn) return; - client.SendMessage(CCommands.CreateCommandSendKeyEvent(Keys.Down), null); + client.SendMessage(CCommands.CreateCommandWithoutParams(CCommands.CommandSendKeyDown), null); } private void brRight_Click(object sender, EventArgs e) @@ -209,7 +201,7 @@ namespace ClientTest if (!client.Connected || !loggedIn) return; - client.SendMessage(CCommands.CreateCommandSendKeyEvent(Keys.Right), null); + client.SendMessage(CCommands.CreateCommandWithoutParams(CCommands.CommandSendKeyRight), null); } } } diff --git a/Output/ClientServerLib.dll b/Output/ClientServerLib.dll index 23dc72c2f5c079005223d1a8b773bf06f3154177..13f422d84c7503c7d980ced820ee6be8268f4291 100644 GIT binary patch delta 17800 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 diff --git a/Vocaluxe/Base/Server/CVocaluxeServer.cs b/Vocaluxe/Base/Server/CVocaluxeServer.cs index 7407e42a..17dff97c 100644 --- a/Vocaluxe/Base/Server/CVocaluxeServer.cs +++ b/Vocaluxe/Base/Server/CVocaluxeServer.cs @@ -58,7 +58,7 @@ namespace Vocaluxe.Base.Server } int command = BitConverter.ToInt32(Message, 0); - byte[] answer = null; + byte[] answer = CCommands.CreateCommandWithoutParams(CCommands.ResponseNOK); ; switch (command) { @@ -84,19 +84,27 @@ namespace Vocaluxe.Base.Server if (!loggedIn) return answer; - + switch (command) { - case CCommands.CommandSendKeyEvent: - Keys key; - if (!CCommands.DecodeCommandSendKeyEvent(Message, out key)) - answer = CCommands.CreateCommandWithoutParams(CCommands.ResponseNOK); - else - { - answer = CCommands.CreateCommandWithoutParams(CCommands.ResponseOK); - } + case CCommands.CommandSendKeyUp: + answer = CCommands.CreateCommandWithoutParams(CCommands.ResponseOK); + Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, Keys.Up)); + break; - Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, key)); + case CCommands.CommandSendKeyDown: + answer = CCommands.CreateCommandWithoutParams(CCommands.ResponseOK); + Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, Keys.Down)); + break; + + case CCommands.CommandSendKeyLeft: + answer = CCommands.CreateCommandWithoutParams(CCommands.ResponseOK); + Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, Keys.Left)); + break; + + case CCommands.CommandSendKeyRight: + answer = CCommands.CreateCommandWithoutParams(CCommands.ResponseOK); + Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, Keys.Right)); break; default: diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index 2ed45688..e7bb3d74 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -154,6 +154,7 @@ ..\ClientServerLib\ClientServerLib\bin\ClientServerLib.dll + True ..\Output\Community.CsharpSqlite.dll