Fixed WIX error: ICE Internal Error 100. API Returned: 1615.

Fixed the type of Deviation property in MqlTradeRequest (MT5)

MT5Connector/AssemblyInfo.cpp

@@ -35,6 +35,4 @@ using namespace System::Security::Permissions;
 
 [assembly:ComVisible(false)];
 
-[assembly:CLSCompliantAttribute(true)];
-
-[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];
+[assembly:CLSCompliantAttribute(true)];

MT5Connector/MT5Connector.cpp

@@ -6,14 +6,15 @@
 #include "MT5Handler.h"
 
 #include "Windows.h"
-#include < vcclr.h >
+#include <vcclr.h>
+#include <functional>
 
 using namespace System;
 using namespace MTApiService;
 using namespace System::Runtime::InteropServices;
 using namespace System::Reflection;
 using namespace System::Text;
-using namespace  System::Collections::Generic;
+using namespace System::Collections::Generic;
 using namespace System::Diagnostics;
 using namespace System::Security::Cryptography; 
 using namespace System::Security;
@@ -55,272 +56,143 @@ void convertSystemString(wchar_t* dest, String^ src)
     dest[wcslen(wch)] = '\0';
 }
 
-bool VerifySignature(System::String^ inputData, System::String^ signature, System::String^ publicKey)
-{
-    bool verifyResult = false;
+#define _DLLAPI extern "C" __declspec(dllexport)
 
+template <typename T> T Execute(std::function<T()> func, wchar_t* err, T default_value)
+{
+    T result = default_value;
     try
     {
-        DSACryptoServiceProvider^ dsa = gcnew DSACryptoServiceProvider();
-        dsa->FromXmlString(publicKey);
-        array<System::Byte>^ data = UTF8Encoding::ASCII->GetBytes(inputData);
-        array<System::Byte>^ signatureData = Convert::FromBase64String(signature);
-        verifyResult = dsa->VerifyData(data, signatureData);
-    }
-    catch(Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:VerifySignature(): failed. " + e->Message);
-        verifyResult = false;
-    }
-
-    return verifyResult;
-}
-
-bool g_IsVerified = true;
-
-void _stdcall verify(int isDemo, wchar_t* accountName, long accountNumber)
-{
-    if (isDemo != 0)
-    {
-        g_IsVerified = true;
-        return;
-    }
-
-    System::String^ signature = MtRegistryManager::ReadSignatureKey(gcnew String(accountName), accountNumber.ToString());
-    Resources::ResourceManager^ rm = gcnew Resources::ResourceManager(L"MT5Connector.cl", Assembly::GetExecutingAssembly());
-    System::String^ inputData = gcnew System::String(accountName);
-    inputData += accountNumber.ToString();
-    System::String^ publicKey = rm->GetString(L"cl");
-    g_IsVerified = VerifySignature(inputData, gcnew System::String(signature), publicKey);
-}
-
-int _stdcall initExpert(int expertHandle, int port, wchar_t* symbol, double bid, double ask, wchar_t* err)
-{
-    if (g_IsVerified == false)
-    {
-        System::String^ errorVerified = "Verification is failed!\nPlease contact with support.";
-        convertSystemString(err, errorVerified);
-        Debug::WriteLine("[ERROR] MT5Connector:initExpert(): not verified");
-        return 0;
-    }
-
-    try
-    {
-        MT5Handler^ mtHander = gcnew MT5Handler();
-        MtAdapter::GetInstance()->InitExpert(expertHandle, port, gcnew String(symbol), bid, ask, mtHander);
+        result = func();
     }
     catch (Exception^ e)
     {
         convertSystemString(err, e->Message);
-        Debug::WriteLine("[ERROR] MT5Connector:initExpert(): " + e->Message);
-
-        return 0;
     }
-    return 1;
+    return result;
 }
 
-int _stdcall deinitExpert(int expertHandle, wchar_t* err)
+_DLLAPI int _stdcall initExpert(int expertHandle, int port, wchar_t* symbol, double bid, double ask, int isTestMode, wchar_t* err)
 {
-    try
-    {
-        MtAdapter::GetInstance()->DeinitExpert(expertHandle);
-    }    
-    catch (Exception^ e)
-    {
-        convertSystemString(err, e->Message);
-        Debug::WriteLine("[ERROR] MT5Connector:deinitExpert(): " + e->Message);
-
-        return 0;
-    }
-    return 1;
+    return Execute<int>([&expertHandle, &port, symbol, &bid, &ask, &isTestMode]() {
+        bool isTesting = (isTestMode != 0) ? true : false;
+        auto expert = gcnew Mt5Expert(expertHandle, gcnew String(symbol), bid, ask, gcnew MT5Handler(), isTesting);
+        MtAdapter::GetInstance()->AddExpert(port, expert);
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall updateQuote(int expertHandle, wchar_t* symbol, double bid, double ask, wchar_t* err)
+_DLLAPI int _stdcall deinitExpert(int expertHandle, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle]() {
+        MtAdapter::GetInstance()->RemoveExpert(expertHandle);
+        return 1;
+    }, err, 0);
+}
+
+_DLLAPI int _stdcall updateQuote(int expertHandle, wchar_t* symbol, double bid, double ask, wchar_t* err)
+{
+    return Execute<int>([&expertHandle, symbol, &bid, &ask]() {
         MtAdapter::GetInstance()->SendQuote(expertHandle, gcnew String(symbol), bid, ask);
-    }
-    catch (Exception^ e)
-    {
-        convertSystemString(err, e->Message);
-        Debug::WriteLine("[ERROR] MT5Connector:updateQuote(): " + e->Message);
-
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendIntResponse(int expertHandle, int response)
+_DLLAPI int _stdcall sendIntResponse(int expertHandle, int response, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &response]() {
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseInt(response));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendIntResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendLongResponse(int expertHandle, __int64 response)
+_DLLAPI int _stdcall sendLongResponse(int expertHandle, __int64 response, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &response]() {
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseLong(response));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendLongResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendULongResponse(int expertHandle, unsigned __int64 response)
+_DLLAPI int _stdcall sendULongResponse(int expertHandle, unsigned __int64 response, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &response]() {
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseULong(response));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendLongResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendBooleanResponse(int expertHandle, int response)
+_DLLAPI int _stdcall sendBooleanResponse(int expertHandle, int response, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &response]() {
         bool value = (response != 0) ? true : false;
-
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseBool(value));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendBooleanResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendDoubleResponse(int expertHandle, double response)
+_DLLAPI int _stdcall sendDoubleResponse(int expertHandle, double response, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &response]() {
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDouble(response));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendDoubleResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendStringResponse(int expertHandle, wchar_t* response)
+_DLLAPI int _stdcall sendStringResponse(int expertHandle, wchar_t* response, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, response]() {
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseString(gcnew String(response)));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendStringResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendVoidResponse(int expertHandle)
+_DLLAPI int _stdcall sendVoidResponse(int expertHandle, wchar_t* err)
 {
-    try
-    {        
+    return Execute<int>([&expertHandle]() {
         MtAdapter::GetInstance()->SendResponse(expertHandle, nullptr);
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendVoidResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendDoubleArrayResponse(int expertHandle, double* values, int size)
+_DLLAPI int _stdcall sendDoubleArrayResponse(int expertHandle, double* values, int size, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, values, &size]() {
         array<double>^ list = gcnew array<double>(size);
-
-        for(int i = 0; i < size; i++)
-        {
+        for (int i = 0; i < size; i++)
             list[i] = values[i];
-        }
-
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDoubleArray(list));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendDoubleArrayResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendIntArrayResponse(int expertHandle, int* values, int size)
+_DLLAPI int _stdcall sendIntArrayResponse(int expertHandle, int* values, int size, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, values, &size]() {
         array<int>^ list = gcnew array<int>(size);
-
-        for(int i = 0; i < size; i++)
-        {
+        for (int i = 0; i < size; i++)
             list[i] = values[i];
-        }
-
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseIntArray(list));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendIntArrayResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendLongArrayResponse(int expertHandle, __int64* values, int size)
+_DLLAPI int _stdcall sendLongArrayResponse(int expertHandle, __int64* values, int size, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, values, &size]() {
         array<System::Int64>^ list = gcnew array<System::Int64>(size);
-
-        for(int i = 0; i < size; i++)
-        {
+        for (int i = 0; i < size; i++)
             list[i] = values[i];
-        }
-
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseLongArray(list));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendLongArrayResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendMqlRatesArrayResponse(int expertHandle, CMqlRates values[], int size)
+_DLLAPI int _stdcall sendMqlRatesArrayResponse(int expertHandle, CMqlRates values[], int size, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, values, &size]() {
         array<MtMqlRates^>^ list = gcnew array<MtMqlRates^>(size);
-
-        for(int i = 0; i < size; i++)
+        for (int i = 0; i < size; i++)
         {
             MtMqlRates^ rates = gcnew MtMqlRates();
             rates->time = values[i].time;
@@ -331,180 +203,107 @@ int _stdcall sendMqlRatesArrayResponse(int expertHandle, CMqlRates values[], int
             rates->tick_volume = values[i].tick_volume;
             rates->spread = values[i].spread;
             rates->real_volume = values[i].real_volume;
-
             list[i] = rates;
         }
-
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlRatesArray(list));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendMqlRatesArrayResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendMqlTickResponse(int expertHandle, CMqlTick* response, int size)
+_DLLAPI int _stdcall sendMqlTickResponse(int expertHandle, CMqlTick* response, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, response]() {
         MtMqlTick^ mtResponse = gcnew MtMqlTick();
-
         mtResponse->time = response->time;
         mtResponse->bid = response->bid;
         mtResponse->ask = response->ask;
         mtResponse->last = response->last;
         mtResponse->volume = response->volume;
-
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlTick(mtResponse));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendMqlTickResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall sendMqlBookInfoArrayResponse(int expertHandle, CMqlBookInfo values[], int size)
+_DLLAPI int _stdcall sendMqlBookInfoArrayResponse(int expertHandle, CMqlBookInfo values[], int size, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, values, &size]() {
         array<MtMqlBookInfo^>^ list = gcnew array<MtMqlBookInfo^>(size);
-
-        for(int i = 0; i < size; i++)
+        for (int i = 0; i < size; i++)
         {
             MtMqlBookInfo^ info = gcnew MtMqlBookInfo();
-
             info->type = values[i].type;
             info->price = values[i].price;
             info->volume = values[i].volume;
-
             list[i] = info;
         }
-
         MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlBookInfoArray(list));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:sendMqlRatesArrayResponse(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
 //----------- get values -------------------------------
 
-int _stdcall getCommandType(int expertHandle, int* res)
+_DLLAPI int _stdcall getCommandType(int expertHandle, int* res, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, res]() {
         *res = MtAdapter::GetInstance()->GetCommandType(expertHandle);
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:getCommandType(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall getIntValue(int expertHandle, int paramIndex, int* res)
+_DLLAPI int _stdcall getIntValue(int expertHandle, int paramIndex, int* res, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &paramIndex, res]() {
         *res = (int)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:getIntValue(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall getDoubleValue(int expertHandle, int paramIndex, double* res)
+_DLLAPI int _stdcall getDoubleValue(int expertHandle, int paramIndex, double* res, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &paramIndex, res]() {
         *res = (double)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:getDoubleValue(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall getStringValue(int expertHandle, int paramIndex, wchar_t* res)
+_DLLAPI int _stdcall getStringValue(int expertHandle, int paramIndex, wchar_t* res, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &paramIndex, res]() {
         convertSystemString(res, (String^)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex));
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:getStringValue(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall getULongValue(int expertHandle, int paramIndex, unsigned __int64* res)
+_DLLAPI int _stdcall getULongValue(int expertHandle, int paramIndex, unsigned __int64* res, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &paramIndex, res]() {
         *res = (unsigned long)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:getULongValue(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall getLongValue(int expertHandle, int paramIndex, __int64* res)
+_DLLAPI int _stdcall getLongValue(int expertHandle, int paramIndex, __int64* res, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &paramIndex, res]() {
         *res = (long)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:getLongValue(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall getBooleanValue(int expertHandle, int paramIndex, int* res)
+_DLLAPI int _stdcall getBooleanValue(int expertHandle, int paramIndex, int* res, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &paramIndex, res]() {
         bool val = (bool)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
         *res = val == true ? 1 : 0;
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:getBooleanValue(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }
 
-int _stdcall getUIntValue(int expertHandle, int paramIndex, unsigned int* res)
+_DLLAPI int _stdcall getUIntValue(int expertHandle, int paramIndex, unsigned int* res, wchar_t* err)
 {
-    try
-    {
+    return Execute<int>([&expertHandle, &paramIndex, res]() {
         *res = (unsigned int)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-    }
-    catch (Exception^ e)
-    {
-        Debug::WriteLine("[ERROR] MT5Connector:getUIntValue(): " + e->Message);
-        return 0;
-    }
-    return 1;
+        return 1;
+    }, err, 0);
 }

MT5Connector/MT5Connector.def

@@ -1,27 +0,0 @@
-LIBRARY MT5Connector
-
-EXPORTS initExpert
-        deinitExpert
-        updateQuote
-		sendIntResponse
-		sendBooleanResponse
-		sendDoubleResponse
-		sendStringResponse
-		sendVoidResponse
-		sendDoubleArrayResponse
-		sendIntArrayResponse
-		sendLongArrayResponse
-		sendMqlRatesArrayResponse
-		sendLongResponse
-		sendULongResponse
-		sendMqlTickResponse
-		sendMqlBookInfoArrayResponse
-		getCommandType
-		getIntValue
-		getUIntValue
-		getDoubleValue
-		getStringValue
-		getLongValue
-		getULongValue
-		getBooleanValue
-		verify

MT5Connector/MT5Connector.vcxproj

@@ -95,7 +95,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>.\MT5Connector.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -108,7 +107,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\MT5Connector.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -120,7 +118,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\MT5Connector.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -132,7 +129,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\MT5Connector.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -157,7 +153,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.ico" />
-    <None Include="MT5Connector.def" />
     <None Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>

MT5Connector/MT5Connector.vcxproj.filters

@@ -44,9 +44,6 @@
     <None Include="app.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="MT5Connector.def">
-      <Filter>Source Files</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="app.rc">

MTApiService/IMetaTraderHandler.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MTApiService
+namespace MTApiService
 {
     public interface IMetaTraderHandler
     {

MTApiService/MTApiService.csproj

@@ -64,6 +64,7 @@
     <Compile Include="IMetaTraderHandler.cs" />
     <Compile Include="ITaskExecutor.cs" />
     <Compile Include="LogConfigurator.cs" />
+    <Compile Include="Mt5Expert.cs" />
     <Compile Include="MtCommandEventArgs.cs" />
     <Compile Include="IDisposableChannel.cs" />
     <Compile Include="IMtApiServer.cs" />

MTApiService/Mt5Expert.cs

@@ -0,0 +1,48 @@
+using log4net;
+
+namespace MTApiService
+{
+    public class Mt5Expert : MtExpert
+    {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(MtExpert));
+        private const int StopExpertInterval = 2000; // 2 sec for testing mode
+        private readonly System.Timers.Timer _stopTimer = new System.Timers.Timer();
+
+
+        public Mt5Expert(int handle, string symbol, double bid, double ask, IMetaTraderHandler mtHandler, bool isTestMode) : 
+            base(handle, symbol, bid, ask, mtHandler)
+        {
+            IsTestMode = isTestMode;
+            _stopTimer.Interval = StopExpertInterval;
+            _stopTimer.Elapsed += _stopTimer_Elapsed;
+        }
+
+        public bool IsTestMode { get; }
+
+        public override void UpdateQuote(MtQuote quote)
+        {
+            Log.Debug("UpdateQuote: begin.");
+
+            base.UpdateQuote(quote);
+
+            if (IsTestMode)
+            {
+                //reset timer
+                _stopTimer.Stop();
+                _stopTimer.Start();
+            }
+
+            Log.Debug("UpdateQuote: end.");
+        }
+
+        private void _stopTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            Log.Debug("_stopTimer_Elapsed: begin.");
+
+            Log.Warn("Mt5Expert has received new tick during 2 sec in testing mode. The possible cause: user has stopped the tester manually in MetaTrader 5.");
+            Deinit();
+
+            Log.Debug("_stopTimer_Elapsed: end.");
+        }
+    }
+}

MTApiService/MtAdapter.cs

@@ -36,12 +36,12 @@ namespace MTApiService
 
 
         #region Public Methods
-        public void InitExpert(int expertHandle, int port, string symbol, double bid, double ask, IMetaTraderHandler mtHandler)
+        public void AddExpert(int port, MtExpert expert)
         {
-            if (mtHandler == null)
-                throw new ArgumentNullException(nameof(mtHandler));
+            if (expert == null)
+                throw new ArgumentNullException(nameof(expert));
 
-            Log.InfoFormat("InitExpert: begin. symbol = {0}, expertHandle = {1}, port = {2}", symbol, expertHandle, port);
+            Log.InfoFormat("AddExpert: begin. expert = {0}", expert);
 
             MtServer server;
             lock (_servers)
@@ -60,8 +60,6 @@ namespace MTApiService
                 }
             }
 
-            var expert = new MtExpert(expertHandle, new MtQuote { Instrument = symbol, Bid = bid, Ask = ask, ExpertHandle = expertHandle }, mtHandler);
-
             lock (_experts)
             {
                 _experts[expert.Handle] = expert;
@@ -69,12 +67,12 @@ namespace MTApiService
 
             server.AddExpert(expert);
 
-            Log.Info("InitExpert: end");
+            Log.Info("AddExpert: end");
         }
 
-        public void DeinitExpert(int expertHandle)
+        public void RemoveExpert(int expertHandle)
         {
-            Log.InfoFormat("DeinitExpert: begin. expertHandle = {0}", expertHandle);
+            Log.InfoFormat("RemoveExpert: begin. expertHandle = {0}", expertHandle);
 
             MtExpert expert = null;
 
@@ -93,15 +91,15 @@ namespace MTApiService
             }
             else
             {
-                Log.WarnFormat("DeinitExpert: expert with id {0} has not been found.", expertHandle);
+                Log.WarnFormat("RemoveExpert: expert with id {0} has not been found.", expertHandle);
             }
 
-            Log.Info("DeinitExpert: end");
+            Log.Info("RemoveExpert: end");
         }
 
         public void SendQuote(int expertHandle, string symbol, double bid, double ask)
         {
-            Log.DebugFormat("SendQuote: begin. symbol = {0}, bid = {1}, ask = {2}", symbol, bid, ask);
+            Log.DebugFormat("UpdateQuote: begin. symbol = {0}, bid = {1}, ask = {2}", symbol, bid, ask);
 
             MtExpert expert;
             lock (_experts)
@@ -111,14 +109,14 @@ namespace MTApiService
 
             if (expert != null)
             {
-                expert.Quote = new MtQuote { Instrument = symbol, Bid = bid, Ask = ask, ExpertHandle = expertHandle };
+                expert.UpdateQuote(new MtQuote { Instrument = symbol, Bid = bid, Ask = ask, ExpertHandle = expertHandle });
             }
             else
             {
-                Log.WarnFormat("SendQuote: expert with id {0} has not been found.", expertHandle);
+                Log.WarnFormat("UpdateQuote: expert with id {0} has not been found.", expertHandle);
             }
 
-            Log.Debug("SendQuote: end");
+            Log.Debug("UpdateQuote: end");
         }
 
         public void SendEvent(int expertHandle, int eventType, string payload)

MTApiService/MtCommandTask.cs

@@ -17,7 +17,7 @@ namespace MTApiService
             Command = command;
         }
 
-        public MtCommand Command { get; private set; }
+        public MtCommand Command { get; }
 
         public MtResponse WaitResult(int time)
         {

MTApiService/MtExpert.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace MTApiService
 {
-    internal class MtExpert: ITaskExecutor
+    public class MtExpert: ITaskExecutor
     {
         public delegate void MtQuoteHandler(MtExpert expert, MtQuote quote);
         public delegate void MtEventHandler(MtExpert expert, MtEvent e);
@@ -19,21 +19,20 @@ namespace MTApiService
         #endregion
 
         #region Public Methods
-        public MtExpert(int handle, MtQuote quote, IMetaTraderHandler mtHandler)
+        public MtExpert(int handle, string symbol, double bid, double ask, IMetaTraderHandler mtHandler)
         {
             if (mtHandler == null)
                 throw new ArgumentNullException(nameof(mtHandler));
 
-            Quote = quote;
+            _quote = new MtQuote { ExpertHandle = handle, Instrument = symbol, Bid = bid, Ask =  ask};
             Handle = handle;
             _mtHadler = mtHandler;
         }
 
-        public void Deinit()
+        public virtual void Deinit()
         {
             Log.Debug("Deinit: begin.");
 
-            IsEnable = false;
             FireOnDeinited();
 
             Log.Debug("Deinit: end.");
@@ -120,9 +119,18 @@ namespace MTApiService
             Log.Debug("SendEvent: end.");
         }
 
+        public virtual void UpdateQuote(MtQuote quote)
+        {
+            Log.DebugFormat("UpdateQuote: begin. quote = {0}", quote);
+
+            Quote = quote;
+
+            Log.Debug("UpdateQuote: end.");
+        }
+
         public override string ToString()
         {
-            return $"ExpertHandle = {Handle}";
+            return $"ExpertHandle = {Handle}, Quote = {Quote}";
         }
 
         #endregion
@@ -153,7 +161,7 @@ namespace MTApiService
                     return _quote;
                 }
             }
-            set
+            private set
             {
                 lock (_locker)
                 {
@@ -165,26 +173,6 @@ namespace MTApiService
         }
 
         public int Handle { get; }
-
-        private bool _isEnable = true;
-        public bool IsEnable
-        {
-            get
-            {
-                lock (_locker)
-                {
-                    return _isEnable;
-                }
-            }
-            private set
-            {
-                lock (_locker)
-                {
-                    _isEnable = value;
-                }
-            }
-        }
-
         #endregion
 
         #region Private Methods

MTApiService/MtServer.cs

@@ -80,11 +80,6 @@ namespace MTApiService
                 //init network hosts
                 var dnsHostName = Dns.GetHostName();
                 var ips = Dns.GetHostEntry(dnsHostName);
-                if (ips == null)
-                {
-                    Log.WarnFormat("InitHosts: end. Dns.GetHostEntry has returned null for DNS Host Name {0}", dnsHostName);
-                    return false;
-                }
 
                 foreach (var ipAddress in ips.AddressList)
                 {

MTApiService/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.27.0")]
-[assembly: AssemblyFileVersion("1.0.27.0")]
+[assembly: AssemblyVersion("1.0.28.0")]
+[assembly: AssemblyFileVersion("1.0.28.0")]

MTConnector/MTConnector.cpp

@@ -44,17 +44,16 @@ template <typename T> T Execute(std::function<T()> func, wchar_t* err, T default
 _DLLAPI bool _stdcall initExpert(int expertHandle, int port, wchar_t* symbol, double bid, double ask, wchar_t* err)
 {
     return Execute<bool>([&expertHandle, &port, symbol, &bid, &ask]() {
-        MT4Handler^ mtHandler = gcnew MT4Handler();
-        MtAdapter::GetInstance()->InitExpert(expertHandle, port, gcnew String(symbol), bid, ask, mtHandler);
+        auto expert = gcnew MtExpert(expertHandle, gcnew String(symbol), bid, ask, gcnew MT4Handler());
+        MtAdapter::GetInstance()->AddExpert(port, expert);
         return true;
     }, err, false);
-
 }
 
 _DLLAPI bool _stdcall deinitExpert(int expertHandle, wchar_t* err)
 {
     return Execute<bool>([&expertHandle]() {
-        MtAdapter::GetInstance()->DeinitExpert(expertHandle);
+        MtAdapter::GetInstance()->RemoveExpert(expertHandle);
         return true;
     }, err, false);
 }

MtApi5/MqlTradeRequest.cs

@@ -13,7 +13,7 @@ namespace MtApi5
         public double Stoplimit { get; set; }                            // StopLimit level of the order
         public double Sl { get; set; }                                   // Stop Loss level of the order
         public double Tp { get; set; }                                   // Take Profit level of the order
-        public uint Deviation { get; set; }                             // Maximal possible deviation from the requested price
+        public ulong Deviation { get; set; }                             // Maximal possible deviation from the requested price
         public ENUM_ORDER_TYPE Type { get; set; }                        // Order type
         public ENUM_ORDER_TYPE_FILLING Type_filling { get; set; }        // Order execution type
         public ENUM_ORDER_TYPE_TIME Type_time { get; set; }              // Order expiration type

MtApi5/MtApi5Client.cs

@@ -497,9 +497,10 @@ namespace MtApi5
         ///Closes a position with the specified ticket.
         ///</summary>
         ///<param name="ticket">Ticket of the closed position.</param>
-        public bool PositionClose(int ticket)
+        ///<param name="deviation">Maximal deviation from the current price (in points).</param>
+        public bool PositionClose(ulong ticket, ulong deviation = ulong.MaxValue)
         {
-            var commandParameters = new ArrayList { ticket};
+            var commandParameters = new ArrayList { ticket, deviation };
 
             return SendCommand<bool>(Mt5CommandType.PositionClose, commandParameters);
         }
@@ -1671,7 +1672,7 @@ namespace MtApi5
         private void OnConnected()
         {
             // INFO: disabled backtesting mode while solution of window handle in testing mode is not found
-            //_isBacktestingMode = IsTesting();
+            //_isBacktestingMode = IsTestMode();
 
             if (_isBacktestingMode)
             {

MtApi5Installer/MtApi5Installer.wixproj

@@ -10,6 +10,7 @@
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <RunWixToolsOutOfProc>true</RunWixToolsOutOfProc>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\build\installers\$(Configuration)\</OutputPath>

TestClients/MtApi5TestClient/MqlTradeRequestViewModel.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel;
 using MtApi5;
 
@@ -29,7 +26,7 @@ namespace MtApi5TestClient
             }
         }
 
-        public uint Magic
+        public ulong Magic
         {
             get { return TradeRequest.Magic; }
             set
@@ -109,7 +106,7 @@ namespace MtApi5TestClient
             }
         }
 
-        public uint Deviation
+        public ulong Deviation
         {
             get { return TradeRequest.Deviation; }
             set