Fixed small errors in MQL part of chart operations

MT5Connector/MT5Connector.cpp

@@ -21,57 +21,57 @@ using namespace System::Security;
 #pragma pack(push, 1)
 public struct CMqlRates
 {
-	__int64	time;         // Period start time
+    __int64    time;         // Period start time
-	double  open;         // Open price
+    double  open;         // Open price
-	double  high;         // The highest price of the period
+    double  high;         // The highest price of the period
-	double  low;          // The lowest price of the period
+    double  low;          // The lowest price of the period
-	double  close;        // Close price
+    double  close;        // Close price
-	__int64 tick_volume;  // Tick volume
+    __int64 tick_volume;  // Tick volume
-	int     spread;       // Spread
+    int     spread;       // Spread
-	__int64 real_volume;  // Trade volume
+    __int64 real_volume;  // Trade volume
 };
 
 public struct CMqlTick
 {
-	__int64				time;          // Time of the last prices update
+    __int64                time;          // Time of the last prices update
-	double				bid;           // Current Bid price
+    double                bid;           // Current Bid price
-	double				ask;           // Current Ask price
+    double                ask;           // Current Ask price
-	double				last;          // Price of the last deal (Last)
+    double                last;          // Price of the last deal (Last)
-	unsigned __int64	volume;        // Volume for the current Last price
+    unsigned __int64    volume;        // Volume for the current Last price
 };
 
 public struct CMqlBookInfo
 {
-	int		type;       // Order type from ENUM_BOOK_TYPE enumeration
+    int        type;       // Order type from ENUM_BOOK_TYPE enumeration
-	double	price;      // Price
+    double    price;      // Price
-	__int64	volume;     // Volume
+    __int64    volume;     // Volume
 };
 #pragma pack(pop)
 
 void convertSystemString(wchar_t* dest, String^ src)
 {
-	pin_ptr<const wchar_t> wch = PtrToStringChars(src);
+    pin_ptr<const wchar_t> wch = PtrToStringChars(src);
-	memcpy(dest, wch, wcslen(wch) * sizeof(wchar_t));
+    memcpy(dest, wch, wcslen(wch) * sizeof(wchar_t));
-	dest[wcslen(wch)] = '\0';
+    dest[wcslen(wch)] = '\0';
 }
 
 bool VerifySignature(System::String^ inputData, System::String^ signature, System::String^ publicKey)
 {
-	bool verifyResult = false;
+    bool verifyResult = false;
 
-	try
+    try
-	{
+    {
-		DSACryptoServiceProvider^ dsa = gcnew DSACryptoServiceProvider();
+        DSACryptoServiceProvider^ dsa = gcnew DSACryptoServiceProvider();
-		dsa->FromXmlString(publicKey);
+        dsa->FromXmlString(publicKey);
-		array<System::Byte>^ data = UTF8Encoding::ASCII->GetBytes(inputData);
+        array<System::Byte>^ data = UTF8Encoding::ASCII->GetBytes(inputData);
-		array<System::Byte>^ signatureData = Convert::FromBase64String(signature);
+        array<System::Byte>^ signatureData = Convert::FromBase64String(signature);
-		verifyResult = dsa->VerifyData(data, signatureData);
+        verifyResult = dsa->VerifyData(data, signatureData);
-	}
+    }
-	catch(Exception^ e)
+    catch(Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:VerifySignature(): failed. " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:VerifySignature(): failed. " + e->Message);
-		verifyResult = false;
+        verifyResult = false;
-	}
+    }
 
     return verifyResult;
 }
@@ -80,431 +80,431 @@ bool g_IsVerified = true;
 
 void _stdcall verify(int isDemo, wchar_t* accountName, long accountNumber)
 {
-	if (isDemo != 0)
+    if (isDemo != 0)
-	{
+    {
-		g_IsVerified = true;
+        g_IsVerified = true;
-		return;
+        return;
-	}
+    }
 
-	System::String^ signature = MtRegistryManager::ReadSignatureKey(gcnew String(accountName), accountNumber.ToString());
+    System::String^ signature = MtRegistryManager::ReadSignatureKey(gcnew String(accountName), accountNumber.ToString());
-	Resources::ResourceManager^ rm = gcnew Resources::ResourceManager(L"MT5Connector.cl", Assembly::GetExecutingAssembly());
+    Resources::ResourceManager^ rm = gcnew Resources::ResourceManager(L"MT5Connector.cl", Assembly::GetExecutingAssembly());
-	System::String^ inputData = gcnew System::String(accountName);
+    System::String^ inputData = gcnew System::String(accountName);
-	inputData += accountNumber.ToString();
+    inputData += accountNumber.ToString();
-	System::String^ publicKey = rm->GetString(L"cl");
+    System::String^ publicKey = rm->GetString(L"cl");
-	g_IsVerified = VerifySignature(inputData, gcnew System::String(signature), publicKey);
+    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)
+    if (g_IsVerified == false)
-	{
+    {
-		System::String^ errorVerified = "Verification is failed!\nPlease contact with support.";
+        System::String^ errorVerified = "Verification is failed!\nPlease contact with support.";
-		convertSystemString(err, errorVerified);
+        convertSystemString(err, errorVerified);
-		Debug::WriteLine("[ERROR] MT5Connector:initExpert(): not verified");
+        Debug::WriteLine("[ERROR] MT5Connector:initExpert(): not verified");
-		return 0;
+        return 0;
-	}
+    }
 
-	try
+    try
-	{
+    {
-		MT5Handler^ mtHander = gcnew MT5Handler();
+        MT5Handler^ mtHander = gcnew MT5Handler();
-		MtServerInstance::GetInstance()->InitExpert(expertHandle, port, gcnew String(symbol), bid, ask, mtHander);
+        MtAdapter::GetInstance()->InitExpert(expertHandle, port, gcnew String(symbol), bid, ask, mtHander);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		convertSystemString(err, e->Message);
+        convertSystemString(err, e->Message);
-		Debug::WriteLine("[ERROR] MT5Connector:initExpert(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:initExpert(): " + e->Message);
 
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall deinitExpert(int expertHandle, wchar_t* err)
 {
-	try
+    try
-	{
+    {
-		MtServerInstance::GetInstance()->DeinitExpert(expertHandle);
+        MtAdapter::GetInstance()->DeinitExpert(expertHandle);
-	}	
+    }    
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		convertSystemString(err, e->Message);
+        convertSystemString(err, e->Message);
-		Debug::WriteLine("[ERROR] MT5Connector:deinitExpert(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:deinitExpert(): " + e->Message);
 
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall updateQuote(int expertHandle, wchar_t* symbol, double bid, double ask, wchar_t* err)
 {
-	try
+    try
-	{
+    {
-		MtServerInstance::GetInstance()->SendQuote(expertHandle, gcnew String(symbol), bid, ask);
+        MtAdapter::GetInstance()->SendQuote(expertHandle, gcnew String(symbol), bid, ask);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		convertSystemString(err, e->Message);
+        convertSystemString(err, e->Message);
-		Debug::WriteLine("[ERROR] MT5Connector:updateQuote(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:updateQuote(): " + e->Message);
 
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendIntResponse(int expertHandle, int response)
 {
-	try
+    try
-	{
+    {
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseInt(response));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseInt(response));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendIntResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendIntResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendLongResponse(int expertHandle, __int64 response)
 {
-	try
+    try
-	{
+    {
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseLong(response));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseLong(response));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendLongResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendLongResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendULongResponse(int expertHandle, unsigned __int64 response)
 {
-	try
+    try
-	{
+    {
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseULong(response));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseULong(response));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendLongResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendLongResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendBooleanResponse(int expertHandle, int response)
 {
-	try
+    try
-	{
+    {
-		bool value = (response != 0) ? true : false;
+        bool value = (response != 0) ? true : false;
 
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseBool(value));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseBool(value));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendBooleanResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendBooleanResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendDoubleResponse(int expertHandle, double response)
 {
-	try
+    try
-	{
+    {
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDouble(response));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDouble(response));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendDoubleResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendDoubleResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendStringResponse(int expertHandle, wchar_t* response)
 {
-	try
+    try
-	{
+    {
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseString(gcnew String(response)));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseString(gcnew String(response)));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendStringResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendStringResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendVoidResponse(int expertHandle)
 {
-	try
+    try
-	{		
+    {        
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, nullptr);
+        MtAdapter::GetInstance()->SendResponse(expertHandle, nullptr);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendVoidResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendVoidResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendDoubleArrayResponse(int expertHandle, double* values, int size)
 {
-	try
+    try
-	{
+    {
-		array<double>^ list = gcnew array<double>(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];
+            list[i] = values[i];
-		}
+        }
 
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDoubleArray(list));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDoubleArray(list));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendDoubleArrayResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendDoubleArrayResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendIntArrayResponse(int expertHandle, int* values, int size)
 {
-	try
+    try
-	{
+    {
-		array<int>^ list = gcnew array<int>(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];
+            list[i] = values[i];
-		}
+        }
 
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseIntArray(list));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseIntArray(list));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendIntArrayResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendIntArrayResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendLongArrayResponse(int expertHandle, __int64* values, int size)
 {
-	try
+    try
-	{
+    {
-		array<System::Int64>^ list = gcnew array<System::Int64>(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];
+            list[i] = values[i];
-		}
+        }
 
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseLongArray(list));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseLongArray(list));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendLongArrayResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendLongArrayResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendMqlRatesArrayResponse(int expertHandle, CMqlRates values[], int size)
 {
-	try
+    try
-	{
+    {
-		array<MtMqlRates^>^ list = gcnew array<MtMqlRates^>(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();
+            MtMqlRates^ rates = gcnew MtMqlRates();
-			rates->time = values[i].time;
+            rates->time = values[i].time;
-			rates->open = values[i].open;
+            rates->open = values[i].open;
-			rates->high = values[i].high;
+            rates->high = values[i].high;
-			rates->low = values[i].low;
+            rates->low = values[i].low;
-			rates->close = values[i].close;
+            rates->close = values[i].close;
-			rates->tick_volume = values[i].tick_volume;
+            rates->tick_volume = values[i].tick_volume;
-			rates->spread = values[i].spread;
+            rates->spread = values[i].spread;
-			rates->real_volume = values[i].real_volume;
+            rates->real_volume = values[i].real_volume;
 
-			list[i] = rates;
+            list[i] = rates;
-		}
+        }
 
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlRatesArray(list));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlRatesArray(list));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendMqlRatesArrayResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendMqlRatesArrayResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendMqlTickResponse(int expertHandle, CMqlTick* response, int size)
 {
-	try
+    try
-	{
+    {
-		MtMqlTick^ mtResponse = gcnew MtMqlTick();
+        MtMqlTick^ mtResponse = gcnew MtMqlTick();
 
-		mtResponse->time = response->time;
+        mtResponse->time = response->time;
-		mtResponse->bid = response->bid;
+        mtResponse->bid = response->bid;
-		mtResponse->ask = response->ask;
+        mtResponse->ask = response->ask;
-		mtResponse->last = response->last;
+        mtResponse->last = response->last;
-		mtResponse->volume = response->volume;
+        mtResponse->volume = response->volume;
 
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlTick(mtResponse));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlTick(mtResponse));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendMqlTickResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendMqlTickResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall sendMqlBookInfoArrayResponse(int expertHandle, CMqlBookInfo values[], int size)
 {
-	try
+    try
-	{
+    {
-		array<MtMqlBookInfo^>^ list = gcnew array<MtMqlBookInfo^>(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();
+            MtMqlBookInfo^ info = gcnew MtMqlBookInfo();
 
-			info->type = values[i].type;
+            info->type = values[i].type;
-			info->price = values[i].price;
+            info->price = values[i].price;
-			info->volume = values[i].volume;
+            info->volume = values[i].volume;
 
-			list[i] = info;
+            list[i] = info;
-		}
+        }
 
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlBookInfoArray(list));
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseMqlBookInfoArray(list));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:sendMqlRatesArrayResponse(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:sendMqlRatesArrayResponse(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 //----------- get values -------------------------------
 
 int _stdcall getCommandType(int expertHandle, int* res)
 {
-	try
+    try
-	{
+    {
-		*res = MtServerInstance::GetInstance()->GetCommandType(expertHandle);
+        *res = MtAdapter::GetInstance()->GetCommandType(expertHandle);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:getCommandType(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:getCommandType(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall getIntValue(int expertHandle, int paramIndex, int* res)
 {
-	try
+    try
-	{
+    {
-		*res = (int)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        *res = (int)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:getIntValue(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:getIntValue(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall getDoubleValue(int expertHandle, int paramIndex, double* res)
 {
-	try
+    try
-	{
+    {
-		*res = (double)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        *res = (double)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:getDoubleValue(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:getDoubleValue(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall getStringValue(int expertHandle, int paramIndex, wchar_t* res)
 {
-	try
+    try
-	{
+    {
-		convertSystemString(res, (String^)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex));
+        convertSystemString(res, (String^)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex));
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:getStringValue(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:getStringValue(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall getULongValue(int expertHandle, int paramIndex, unsigned __int64* res)
 {
-	try
+    try
-	{
+    {
-		*res = (unsigned long)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        *res = (unsigned long)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:getULongValue(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:getULongValue(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall getLongValue(int expertHandle, int paramIndex, __int64* res)
 {
-	try
+    try
-	{
+    {
-		*res = (long)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        *res = (long)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:getLongValue(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:getLongValue(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall getBooleanValue(int expertHandle, int paramIndex, int* res)
 {
-	try
+    try
-	{
+    {
-		bool val = (bool)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        bool val = (bool)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-		*res = val == true ? 1 : 0;
+        *res = val == true ? 1 : 0;
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:getBooleanValue(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:getBooleanValue(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }
 
 int _stdcall getUIntValue(int expertHandle, int paramIndex, unsigned int* res)
 {
-	try
+    try
-	{
+    {
-		*res = (unsigned int)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        *res = (unsigned int)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
-	}
+    }
-	catch (Exception^ e)
+    catch (Exception^ e)
-	{
+    {
-		Debug::WriteLine("[ERROR] MT5Connector:getUIntValue(): " + e->Message);
+        Debug::WriteLine("[ERROR] MT5Connector:getUIntValue(): " + e->Message);
-		return 0;
+        return 0;
-	}
+    }
-	return 1;
+    return 1;
 }

MT5Connector/MT5Handler.h

@@ -9,16 +9,16 @@ using namespace MTApiService;
 ref class MT5Handler: IMetaTraderHandler
 {
 public:
-	MT5Handler()
+    MT5Handler()
-	{
+    {
-		msgId = WM_USER + 4096;
+        msgId = WM_TIMER;
-	}
+    }
 
-	virtual void SendTickToMetaTrader(int handle)
+    virtual void SendTickToMetaTrader(int handle)
-	{
+    {
-		PostMessage((HWND)handle, msgId, 0x00000011, 0);
+        PostMessage((HWND)handle, msgId, 0, 0);
-	}
+    }
 
 private:
-	unsigned int msgId;
+    unsigned int msgId;
 };

MTApiService/ICommandManager.cs

@@ -1,8 +1,7 @@
 namespace MTApiService
 {
-    public interface ICommandManager
+    internal interface ICommandManager
     {
-        void EnqueueCommandTask(MtCommandTask task);
+        MtCommandTask SendCommand(MtCommand task);
-        MtCommandTask DequeueCommandTask();
     }
 }

MTApiService/ILMerge.props

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!--                                                                                   -->
+    <!-- ILMerge project-specific settings. Almost never need to be set explicitly.       -->
+    <!-- for details, see http://research.microsoft.com/en-us/people/mbarnett/ilmerge.aspx -->
+    <!--                                                                                   -->
+    <!-- *** set this file to Type=None, CopyToOutput=Never ***                            -->
+
+    <!-- If True, all copy local dependencies will also be merged from referenced projects whether they are referenced in the current project explicitly or not -->
+    <ILMergeTransitive>true</ILMergeTransitive>
+
+    <!-- Extra ILMerge library paths (semicolon-separated). Dont put your package dependencies here, they will be added automagically -->
+    <ILMergeLibraryPath></ILMergeLibraryPath>
+
+    <!-- The solution NuGet package directory if not standard 'SOLUTION\packages' -->
+    <ILMergePackagesPath></ILMergePackagesPath>
+
+    <!-- The merge order file name if differs from standard 'ILMergeOrder.txt' -->
+    <ILMergeOrderFile></ILMergeOrderFile>
+
+    <!-- The strong key file name if not specified in the project -->
+    <ILMergeKeyFile>MtApiKey.snk</ILMergeKeyFile>
+
+    <!-- The assembly version if differs for the version of the main assembly -->
+    <ILMergeAssemblyVersion></ILMergeAssemblyVersion>
+
+    <!-- added in Version 1.0.4 -->
+    <ILMergeFileAlignment></ILMergeFileAlignment>
+
+    <!-- added in Version 1.0.4, default=none -->
+    <ILMergeAllowDuplicateType></ILMergeAllowDuplicateType>
+
+    <!-- If the <see cref="CopyAttributes"/> is also set, any assembly-level attributes names that have the same type are copied over into the target assembly -->
+    <ILMergeAllowMultipleAssemblyLevelAttributes></ILMergeAllowMultipleAssemblyLevelAttributes>
+
+    <!-- See ILMerge documentation -->
+    <ILMergeAllowZeroPeKind></ILMergeAllowZeroPeKind>
+
+    <!-- The assembly level attributes of each input assembly are copied over into the target assembly -->
+    <ILMergeCopyAttributes></ILMergeCopyAttributes>
+    
+    <!-- Creates a .pdb file for the output assembly and merges into it any .pdb files found for input assemblies, default=true -->
+    <ILMergeDebugInfo></ILMergeDebugInfo>
+
+    <!-- Target assembly will be delay signed -->
+    <ILMergeDelaySign></ILMergeDelaySign>
+
+    <!-- Types in assemblies other than the primary assembly have their visibility modified -->
+    <ILMergeInternalize></ILMergeInternalize>
+
+    <!-- The path name of the file that will be used to identify types that are not to have their visibility modified -->
+    <ILMergeInternalizeExcludeFile></ILMergeInternalizeExcludeFile>
+
+    <!-- XML documentation files are merged to produce an XML documentation file for the target assembly -->
+    <ILMergeXmlDocumentation></ILMergeXmlDocumentation>
+
+    <!-- External assembly references in the manifest of the target assembly will use full public keys (false) or public key tokens (true, default value) -->
+    <ILMergePublicKeyTokens></ILMergePublicKeyTokens>
+
+    <!-- Types with the same name are all merged into a single type in the target assembly -->
+    <ILMergeUnionMerge></ILMergeUnionMerge>
+
+    <!-- The version of the target framework, default 40 (works for 45 too) -->
+    <ILTargetPlatform></ILTargetPlatform>
+  </PropertyGroup>
+</Project>

MTApiService/ILMergeOrder.txt

@@ -0,0 +1,4 @@
+# this file contains the partial list of the merged assemblies in the merge order
+# you can fill it from the obj\CONFIG\PROJECT.ilmerge generated on every build
+# and finetune merge order to your satisfaction
+

MTApiService/IMtApiServer.cs

@@ -1,13 +1,10 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace MTApiService
 {
     public interface IMtApiServer
     {
         MtResponse SendCommand(MtCommand command);
-        IEnumerable<MtQuote> GetQuotes();
+        List<MtQuote> GetQuotes();
     }
 }

MTApiService/ITaskExecutor.cs

@@ -0,0 +1,9 @@
+namespace MTApiService
+{
+    internal interface ITaskExecutor
+    {
+        void Execute(MtCommandTask task);
+        
+        int Handle { get; }
+    }
+}

MTApiService/LogConfigurator.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Diagnostics;
+using log4net;
+using log4net.Appender;
+using log4net.Core;
+using log4net.Layout;
+using log4net.Repository.Hierarchy;
+
+namespace MTApiService
+{
+    public class LogConfigurator
+    {
+        private const string LogFileNameExtension = "txt";
+
+        public static void Setup(string profileName)
+        {
+            if (string.IsNullOrEmpty(profileName))
+                throw new ArgumentNullException();
+
+            var hierarchy = (Hierarchy) LogManager.GetRepository();
+
+            var patternLayout = new PatternLayout
+            {
+                ConversionPattern = "%date [%thread] %-5level %logger - %message%newline"
+            };
+            patternLayout.ActivateOptions();
+
+            string filename = $"{DateTime.Now.ToString("yyyy-dd-M--HH-mm-ss")}-{Process.GetCurrentProcess().Id}.{LogFileNameExtension}";
+
+            var roller = new RollingFileAppender
+            {
+                AppendToFile = true,
+                File = $@"{System.IO.Path.GetTempPath()}{profileName}\Logs\{filename}",
+                Layout = patternLayout,
+                PreserveLogFileNameExtension = true,
+                MaxSizeRollBackups = 5,
+                MaximumFileSize = "1GB",
+                RollingStyle = RollingFileAppender.RollingMode.Size,
+                StaticLogFileName = false
+            };
+            roller.ActivateOptions();
+            hierarchy.Root.AddAppender(roller);
+
+#if (DEBUG)
+            hierarchy.Root.Level = Level.Debug;
+#else
+            hierarchy.Root.Level = Level.Info;
+#endif
+            hierarchy.Configured = true;
+        }
+    }
+}

MTApiService/MTApiService.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSBuild.ILMerge.Task.1.0.5\build\MSBuild.ILMerge.Task.props" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.0.5\build\MSBuild.ILMerge.Task.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,6 +15,8 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,12 +38,17 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>MtApiKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
@@ -54,6 +62,8 @@
   <ItemGroup>
     <Compile Include="ICommandManager.cs" />
     <Compile Include="IMetaTraderHandler.cs" />
+    <Compile Include="ITaskExecutor.cs" />
+    <Compile Include="LogConfigurator.cs" />
     <Compile Include="MtCommandEventArgs.cs" />
     <Compile Include="IDisposableChannel.cs" />
     <Compile Include="IMtApiServer.cs" />
@@ -69,22 +79,37 @@
     <Compile Include="MtConnectionProfile.cs" />
     <Compile Include="MtExecutorManager.cs" />
     <Compile Include="MtExpert.cs" />
-    <Compile Include="MtInstrument.cs" />
+    <Compile Include="MtQuote.cs" />
     <Compile Include="MtResponse.cs" />
     <Compile Include="MtServer.cs" />
     <Compile Include="MtCommand.cs" />
-    <Compile Include="MtServerInstance.cs" />
+    <Compile Include="MtAdapter.cs" />
     <Compile Include="MtService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="MtApiKey.pfx" />
+    <None Include="ILMerge.props">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="MtApiKey.snk" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ILMergeOrder.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.0.5\build\MSBuild.ILMerge.Task.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.0.5\build\MSBuild.ILMerge.Task.props'))" />
+    <Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.0.5\build\MSBuild.ILMerge.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.0.5\build\MSBuild.ILMerge.Task.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSBuild.ILMerge.Task.1.0.5\build\MSBuild.ILMerge.Task.targets" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.0.5\build\MSBuild.ILMerge.Task.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

MTApiService/MtAdapter.cs

@@ -0,0 +1,277 @@
+using System;
+using System.Collections.Generic;
+using log4net;
+
+namespace MTApiService
+{
+    public class MtAdapter
+    {
+        #region Fields
+        private const string LogProfileName = "MtApiService";
+
+        private static readonly ILog Log = LogManager.GetLogger(typeof(MtAdapter));
+        private static readonly MtAdapter Instance = new MtAdapter();
+
+        private readonly Dictionary<int, MtServer> _servers = new Dictionary<int, MtServer>();
+        private readonly Dictionary<int, MtExpert> _experts = new Dictionary<int, MtExpert>();
+        #endregion
+
+        #region Init Instance
+
+        private MtAdapter()
+        {
+            LogConfigurator.Setup(LogProfileName);
+        }
+        
+        static MtAdapter() 
+        {
+        }
+
+        public static MtAdapter GetInstance()
+        {
+            return Instance;
+        }
+
+        #endregion
+
+
+        #region Public Methods
+        public void InitExpert(int expertHandle, int port, string symbol, double bid, double ask, IMetaTraderHandler mtHandler)
+        {
+            if (mtHandler == null)
+                throw new ArgumentNullException(nameof(mtHandler));
+
+            Log.InfoFormat("InitExpert: begin. symbol = {0}, expertHandle = {1}, port = {2}", symbol, expertHandle, port);
+
+            MtServer server;
+            lock (_servers)
+            {
+                if (_servers.ContainsKey(port))
+                {
+                    server = _servers[port];
+                }
+                else
+                {
+                    server = new MtServer(port);
+                    server.Stopped += server_Stopped;
+                    _servers[port] = server;
+
+                    server.Start();
+                }
+            }
+
+            var expert = new MtExpert(expertHandle, new MtQuote { Instrument = symbol, Bid = bid, Ask = ask, ExpertHandle = expertHandle }, mtHandler);
+
+            lock (_experts)
+            {
+                _experts[expert.Handle] = expert;
+            }
+
+            server.AddExpert(expert);
+
+            Log.Info("InitExpert: end");
+        }
+
+        public void DeinitExpert(int expertHandle)
+        {
+            Log.InfoFormat("DeinitExpert: begin. expertHandle = {0}", expertHandle);
+
+            MtExpert expert = null;
+
+            lock (_experts)
+            {
+                if (_experts.ContainsKey(expertHandle))
+                {
+                    expert = _experts[expertHandle];
+                    _experts.Remove(expertHandle);
+                }
+            }
+
+            if (expert != null)
+            {
+                expert.Deinit();
+            }
+            else
+            {
+                Log.WarnFormat("DeinitExpert: expert with id {0} has not been found.", expertHandle);
+            }
+
+            Log.Info("DeinitExpert: 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);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert != null)
+            {
+                expert.Quote = new MtQuote { Instrument = symbol, Bid = bid, Ask = ask, ExpertHandle = expertHandle };
+            }
+            else
+            {
+                Log.WarnFormat("SendQuote: expert with id {0} has not been found.", expertHandle);
+            }
+
+            Log.Debug("SendQuote: end");
+        }
+
+        public void SendEvent(int expertHandle, int eventType, string payload)
+        {
+            Log.DebugFormat("SendEvent: begin. eventType = {0}, payload = {1}", eventType, payload);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert != null)
+            {
+                expert.SendEvent(new MtEvent { EventType = eventType, Payload = payload, ExpertHandle = expertHandle });
+            }
+            else
+            {
+                Log.WarnFormat("SendEvent: expert with id {0} has not been found.", expertHandle);
+            }
+
+            Log.Debug("SendEvent: end");
+        }
+
+        public void SendResponse(int expertHandle, MtResponse response)
+        {
+            Log.DebugFormat("SendResponse: begin. id = {0}, response = {1}", expertHandle, response);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert != null)
+            {
+                expert.SendResponse(response);
+            }
+            else
+            {
+                Log.WarnFormat("SendResponse: expert with id {0} has not been found.", expertHandle);
+            }
+
+            Log.Debug("SendResponse: end");
+        }
+
+        public int GetCommandType(int expertHandle)
+        {
+            Log.DebugFormat("GetCommandType: begin. expertHandle = {0}", expertHandle);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert == null)
+            {
+                Log.WarnFormat("GetCommandType: expert with id {0} has not been found.", expertHandle);
+            }
+
+            var retval = expert?.GetCommandType() ?? 0;
+
+            Log.DebugFormat("GetCommandType: end. retval = {0}", retval);
+
+            return retval;
+        }
+
+        public object GetCommandParameter(int expertHandle, int index)
+        {
+            Log.DebugFormat("GetCommandParameter: begin. expertHandle = {0}, index = {1}", expertHandle, index);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert == null)
+            {
+                Log.WarnFormat("GetCommandParameter: expert with id {0} has not been found.", expertHandle);
+            }
+
+            var retval = expert?.GetCommandParameter(index);
+
+            Log.DebugFormat("GetCommandParameter: end. retval = {0}", retval);
+
+            return retval;
+        }
+
+        public object GetNamedParameter(int expertHandle, string name)
+        {
+            Log.DebugFormat("GetNamedParameter: begin. expertHandle = {0}, name = {1}", expertHandle, name);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert == null)
+            {
+                Log.WarnFormat("GetNamedParameter: expert with id {0} has not been found.", expertHandle);
+            }
+
+            var retval = expert?.GetNamedParameter(name);
+
+            Log.DebugFormat("GetNamedParameter: end. retval = {0}", retval);
+
+            return retval;
+        }
+
+        public bool ContainsNamedParameter(int expertHandle, string name)
+        {
+            Log.DebugFormat("ContainsNamedParameter: begin. expertHandle = {0}, name = {1}", expertHandle, name);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert == null)
+            {
+                Log.WarnFormat("ContainsNamedParameter: expert with id {0} has not been found.", expertHandle);
+            }
+
+            bool retval = expert != null ? expert.ContainsNamedParameter(name) : false;
+
+            Log.DebugFormat("ContainsNamedParameter: end. retval = {0}", retval);
+
+            return retval;
+        }
+        #endregion
+
+        #region Private Methods
+        private void server_Stopped(object sender, EventArgs e)
+        {
+            var server = (MtServer)sender;
+            server.Stopped -= server_Stopped;
+
+            var port = server.Port;
+
+            Log.InfoFormat("server_Stopped: port = {0}", port);
+
+            lock (_servers)
+            {
+                if (_servers.ContainsKey(port))
+                {
+                    _servers.Remove(port);
+                }
+            }
+        }
+        #endregion
+    }
+}

MTApiService/MtApiProxy.cs

@@ -1,26 +1,23 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 
 namespace MTApiService
 {
-    class MtApiProxy : DuplexClientBase<IMtApi>, IMtApi, IDisposable
+    internal class MtApiProxy : DuplexClientBase<IMtApi>, IMtApi, IDisposable
     {
-        public MtApiProxy(InstanceContext callbackContext, Binding binding,
+        public MtApiProxy(InstanceContext callbackContext, Binding binding, EndpointAddress remoteAddress)
-                                                   EndpointAddress remoteAddress)
             : base(callbackContext, binding, remoteAddress)
         {
-            base.InnerDuplexChannel.Faulted += new EventHandler(InnerDuplexChannel_Faulted);
+            InnerDuplexChannel.Faulted += InnerDuplexChannel_Faulted;
-            base.InnerDuplexChannel.Open();
         }
 
         #region IMtApi Members
 
         public bool Connect()
         {
+            InnerDuplexChannel.Open();
             return Channel.Connect();
         }
 
@@ -34,7 +31,7 @@ namespace MTApiService
             return Channel.SendCommand(command);
         }
 
-        public IEnumerable<MtQuote> GetQuotes()
+        public List<MtQuote> GetQuotes()
         {
             return Channel.GetQuotes();
         }
@@ -47,19 +44,19 @@ namespace MTApiService
         {
             try
             {
-                this.Close();
+                Close();
             }
             catch (CommunicationException)
             {
-                this.Abort();
+                Abort();
             }
             catch (TimeoutException)
             {
-                this.Abort();
+                Abort();
             }
             catch (Exception)
             {
-                this.Abort();
+                Abort();
             }
         }
 
@@ -68,9 +65,9 @@ namespace MTApiService
         #region Private Methods
         private void InnerDuplexChannel_Faulted(object sender, EventArgs e)
         {
-            if (Faulted != null)
+            Faulted?.Invoke(this, e);
-                Faulted(this, e);
         }
+
         #endregion
 
         #region Events

MTApiService/MtClient.cs

@@ -1,206 +1,203 @@
 using System;
-using System.Diagnostics;
 using System.Collections;
 using System.ServiceModel;
 using System.Collections.Generic;
+using log4net;
 
 namespace MTApiService
 {
-    [CallbackBehavior(UseSynchronizationContext = false)]
+    [CallbackBehavior(ConcurrencyMode = ConcurrencyMode.Multiple, UseSynchronizationContext = false)]
-    public class MtClient: IMtApiCallback, IDisposable
+    public class MtClient : IMtApiCallback, IDisposable
     {
-        private static string SERVICE_NAME = "MtApiService";
+        private const string ServiceName = "MtApiService";
 
         public delegate void MtQuoteHandler(MtQuote quote);
+        public delegate void MtEventHandler(MtEvent e);
+
+        #region Fields
+        private static readonly ILog Log = LogManager.GetLogger(typeof(MtClient));
+
+        private readonly MtApiProxy _proxy;
+        #endregion
+
+        #region ctor
+        public MtClient(string host, int port)
+        {
+            if (string.IsNullOrEmpty(host))
+                throw new ArgumentNullException(nameof(host), "host is null or empty");
+
+            if (port < 0 || port > 65536)
+                throw new ArgumentOutOfRangeException(nameof(port), "port value is invalid");
+
+            Host = host;
+            Port = port;
+
+            var urlService = $"net.tcp://{host}:{port}/{ServiceName}";
+
+            var bind = new NetTcpBinding(SecurityMode.None)
+            {
+                MaxReceivedMessageSize = 2147483647,
+                MaxBufferSize = 2147483647,
+                MaxBufferPoolSize = 2147483647,
+                SendTimeout = new TimeSpan(12, 0, 0),
+                ReceiveTimeout = new TimeSpan(12, 0, 0),
+                ReaderQuotas =
+                {
+                    MaxArrayLength = 2147483647,
+                    MaxBytesPerRead = 2147483647,
+                    MaxDepth = 2147483647,
+                    MaxStringContentLength = 2147483647,
+                    MaxNameTableCharCount = 2147483647
+                }
+            };
+
+            _proxy = new MtApiProxy(new InstanceContext(this), bind, new EndpointAddress(urlService));
+            _proxy.Faulted += ProxyFaulted;
+        }
+
+        public MtClient(int port)
+        {
+            if (port < 0 || port > 65536)
+                throw new ArgumentOutOfRangeException(nameof(port), "port value is invalid");
+
+            Port = port;
+
+            var urlService = $"net.pipe://localhost/{ServiceName}_{port}";
+
+            var bind = new NetNamedPipeBinding(NetNamedPipeSecurityMode.None)
+            {
+                MaxReceivedMessageSize = 2147483647,
+                MaxBufferSize = 2147483647,
+                MaxBufferPoolSize = 2147483647,
+                SendTimeout = new TimeSpan(12, 0, 0),
+                ReceiveTimeout = new TimeSpan(12, 0, 0),
+                ReaderQuotas =
+                {
+                    MaxArrayLength = 2147483647,
+                    MaxBytesPerRead = 2147483647,
+                    MaxDepth = 2147483647,
+                    MaxStringContentLength = 2147483647,
+                    MaxNameTableCharCount = 2147483647
+                }
+            };
+
+            _proxy = new MtApiProxy(new InstanceContext(this), bind, new EndpointAddress(urlService));
+            _proxy.Faulted += ProxyFaulted;
+        }
+
+
+        #endregion
 
         #region Public Methods
-        public void Open(string host, int port)
+        /// <exception cref="CommunicationException">Thrown when connection failed</exception>
-        {
-            Debug.WriteLine("[INFO] MtClient::Open");
-
-            if (string.IsNullOrEmpty(host))
-                throw new ArgumentNullException("host", "host is null or empty");
-
-            if (port < 0 || port > 65536)
-                throw new ArgumentOutOfRangeException("port", "port value is invalid");
-
-            var urlService = string.Format("net.tcp://{0}:{1}/{2}", host, port, SERVICE_NAME);
-
-            lock (mClientLocker)
-            {
-                if (mProxy != null)
-                    return;
-
-                var bind = new NetTcpBinding(SecurityMode.None)
-                {
-                    MaxReceivedMessageSize = 2147483647,
-                    MaxBufferSize = 2147483647,
-                    MaxBufferPoolSize = 2147483647,
-                    ReaderQuotas =
-                    {
-                        MaxArrayLength = 2147483647,
-                        MaxBytesPerRead = 2147483647,
-                        MaxDepth = 2147483647,
-                        MaxStringContentLength = 2147483647,
-                        MaxNameTableCharCount = 2147483647
-                    }
-                };
-                // Commented next statement since it is not required
-
-                mProxy = new MtApiProxy(new InstanceContext(this), bind, new EndpointAddress(urlService));
-                mProxy.Faulted += mProxy_Faulted;
-            }
-        }
-
-        public void Open(int port)
-        {
-            if (port < 0 || port > 65536)
-                throw new ArgumentOutOfRangeException("port", "port value is invalid");
-
-            var urlService = string.Format("net.pipe://localhost/{0}_{1}", SERVICE_NAME, port);
-
-            lock (mClientLocker)
-            {
-                if (mProxy != null)
-                    return;
-
-                var bind = new NetNamedPipeBinding(NetNamedPipeSecurityMode.None)
-                {
-                    MaxReceivedMessageSize = 2147483647,
-                    MaxBufferSize = 2147483647,
-                    MaxBufferPoolSize = 2147483647,
-                    ReaderQuotas =
-                    {
-                        MaxArrayLength = 2147483647,
-                        MaxBytesPerRead = 2147483647,
-                        MaxDepth = 2147483647,
-                        MaxStringContentLength = 2147483647,
-                        MaxNameTableCharCount = 2147483647
-                    }
-                };
-                // Commented next statement since it is not required
-
-                mProxy = new MtApiProxy(new InstanceContext(this), bind, new EndpointAddress(urlService));
-                mProxy.Faulted += mProxy_Faulted;
-            }
-        }
-
-        public void Close()
-        {
-            Debug.WriteLine("[INFO] MtClient::Close");
-
-            lock (mClientLocker)
-            {
-                if (mProxy != null)
-                {
-                    mProxy.Faulted -= mProxy_Faulted;
-                    mProxy.Dispose();
-                    mProxy = null;
-                }
-
-                mIsConnected = false;
-            }
-        }
-
         public void Connect()
         {
-            Debug.WriteLine("[INFO] MtClient::Connect");
+            Log.Debug("Connect: begin.");
+
+            if (_proxy.State != CommunicationState.Created)
+            {
+                Log.ErrorFormat("Connected: end. Client has invalid state {0}", _proxy.State);
+                return;
+            }
+
+            bool coonected;
 
             try
             {
-                lock (mClientLocker)
+                coonected = _proxy.Connect();
-                {
-                    if (mProxy != null && mIsConnected == true)
-                        return;
-
-                    mIsConnected = mProxy.Connect();
-
-                    if (mIsConnected == false)
-                        throw new Exception("Connected failed");
-                }
             }
             catch (Exception ex)
             {
-                Debug.WriteLine("[ERROR] MtClient::Connect: {0}", ex.Message);
+                Log.ErrorFormat("Connect: Exception - {0}", ex.Message);
 
-                Close();
+                throw new CommunicationException($"Connection failed to service. {ex.Message}");
-
-                throw new CommunicationException(string.Format("Connection failed to service"));
             }
+
+            if (coonected == false)
+            {
+                Log.Error("Connect: end. Connection failed.");
+                throw new CommunicationException("Connection failed");
+            }
+
+            Log.Debug("Connect: end.");
         }
 
         public void Disconnect()
         {
-            Debug.WriteLine("[INFO] MtClient::Disconnect");
+            Log.Debug("Disconnect: begin.");
 
             try
             {
-                lock (mClientLocker)
+                _proxy.Disconnect();
-                {
-                    mIsConnected = false;
-
-                    if (mProxy != null)
-                        mProxy.Disconnect();
-                }
             }
             catch (Exception ex)
             {
-                Debug.WriteLine("[ERROR] MtClient::Disconnect: {0}", ex.Message);
+                Log.ErrorFormat("Disconnect: Exception - {0}", ex.Message);
-
-                Close();
             }
+
+            Log.Debug("Disconnect: end.");
         }
 
-        public MtResponse SendCommand(int commandType, ArrayList commandParameters)
+        /// <exception cref="CommunicationException">Thrown when connection failed</exception>
+        public MtResponse SendCommand(int commandType, ArrayList parameters, Dictionary<string, object> namedParams, int expertHandle)
         {
-            Debug.WriteLine("[INFO] MtClient::SendCommand: commandType = {0}", commandType);
+            Log.DebugFormat("SendCommand: begin. commandType = {0}, parameters count = {1}", commandType, parameters?.Count);
 
-            MtResponse result = null;
+            if (IsConnected == false)
+            {
+                Log.Error("SendCommand: Client is not connected.");
+                throw new CommunicationException("Client is not connected.");
+            }
+
+            MtResponse result;
 
             try
             {
-                lock (mClientLocker)
+                result = _proxy.SendCommand(new MtCommand {
-                {
+                    CommandType = commandType,
-                    if (mProxy != null && mIsConnected == true)
+                    Parameters = parameters,
-                        result = mProxy.SendCommand(new MtCommand(commandType, commandParameters));
+                    NamedParams = namedParams,
-                }
+                    ExpertHandle = expertHandle});
             }
             catch (Exception ex)
             {
-                Debug.WriteLine("[ERROR] MtClient::SendCommand: {0}", ex.Message);
+                Log.ErrorFormat("SendCommand: Exception - {0}", ex.Message);
-
-                Close();
 
                 throw new CommunicationException("Service connection failed! " + ex.Message);
             }
 
+            Log.DebugFormat("SendCommand: end. result = {0}", result);
+
             return result;
         }
 
-        public IEnumerable<MtQuote> GetQuotes()
+        /// <exception cref="CommunicationException">Thrown when connection failed</exception>
+        public List<MtQuote> GetQuotes()
         {
-            Debug.WriteLine("[INFO] MtClient::GetQuotes");
+            Log.Debug("GetQuotes: begin.");
 
-            IEnumerable<MtQuote> result = null;
+            if (IsConnected == false)
+            {
+                Log.Warn("GetQuotes: end. Client is not connected.");
+                return null;
+            }
+
+            List<MtQuote> result;
 
             try
             {
-                lock (mClientLocker)
+                result = _proxy.GetQuotes();
-                {
-                    if (mProxy != null && mIsConnected == true)
-                        result = mProxy.GetQuotes();
-                }
             }
             catch (Exception ex)
             {
-                Debug.WriteLine("[ERROR] MtClient::GetQuotes: {0}", ex.Message);
+                Log.ErrorFormat("GetQuotes: Exception - {0}", ex.Message);
 
-                Close();
+                throw new CommunicationException($"Service connection failed! {ex.Message}");
-
-                throw new CommunicationException("Service connection failed");
             }
 
-            return result;;
+            Log.DebugFormat("GetQuotes: end. quotes count = {0}", result?.Count);
+
+            return result;
         }
 
         #endregion
@@ -209,74 +206,71 @@ namespace MTApiService
 
         public void OnQuoteUpdate(MtQuote quote)
         {
-            if (quote != null)
+            Log.DebugFormat("OnQuoteUpdate: begin. quote = {0}", quote);
-            {                
-                if (QuoteUpdated != null)
-                {
-                    QuoteUpdated(quote);
-                }
 
-                Debug.WriteLine("[INFO] MtClient::OnQuoteUpdate: " + quote);
+            if (quote == null) return;
-            }
+
+            QuoteUpdated?.Invoke(quote);
+
+            Log.Debug("OnQuoteUpdate: end.");
         }
 
         public void OnQuoteAdded(MtQuote quote)
         {
-            Debug.WriteLine("[INFO] MtClient::OnQuoteAdded");
+            Log.DebugFormat("OnQuoteAdded: begin. quote = {0}", quote);
 
             QuoteAdded?.Invoke(quote);
+
+            Log.Debug("OnQuoteAdded: end.");
         }
 
         public void OnQuoteRemoved(MtQuote quote)
         {
-            Debug.WriteLine("[INFO] MtClient::OnQuoteRemoved");
+            Log.DebugFormat("OnQuoteRemoved: begin. quote = {0}", quote);
 
             QuoteRemoved?.Invoke(quote);
+
+            Log.Debug("OnQuoteRemoved: end.");
         }
 
         public void OnServerStopped()
         {
-            Debug.WriteLine("[INFO] MtClient::OnServerStopped");
+            Log.Debug("OnServerStopped: begin.");
-
-            Close();
 
             ServerDisconnected?.Invoke(this, EventArgs.Empty);
+
+            Log.Debug("OnServerStopped: end.");
         }
 
 
-        public void OnMtEvent(MtEvent mtEvent)
+        public void OnMtEvent(MtEvent e)
         {
-            MtEventReceived?.Invoke(this, new MtEventArgs(mtEvent));
+            Log.DebugFormat("OnMtEvent: begin. event = {0}", e);
+
+            MtEventReceived?.Invoke(e);
+
+            Log.Debug("OnMtEvent: end.");
         }
 
         #endregion
 
         #region Properties
-        public bool IsConnected 
+        public string Host { get; private set; }
-        {
+        public int Port { get; private set; }
-            get
+
-            {
+        private bool IsConnected => _proxy.State == CommunicationState.Opened;
-                lock (mClientLocker)
-                {
-                    return mProxy.State == CommunicationState.Opened && mIsConnected == true;
-                }
-            }
-        }
 
         #endregion
 
         #region Private Methods
 
-        void mProxy_Faulted(object sender, EventArgs e)
+        private void ProxyFaulted(object sender, EventArgs e)
         {
-            Debug.WriteLine("[INFO] MtClient::mProxy_Faulted");
+            Log.Debug("ProxyFaulted: begin.");
 
-            Close();
+            ServerFailed?.Invoke(this, EventArgs.Empty);
 
-            if (ServerFailed != null)
+            Log.Debug("ProxyFaulted: end.");
-            {
-                ServerFailed(this, EventArgs.Empty);
-            }
         }
 
         #endregion
@@ -285,9 +279,11 @@ namespace MTApiService
 
         public void Dispose()
         {
-            Debug.WriteLine("[INFO] MtClient::Dispose");
+            Log.Debug("Dispose: begin.");
 
-            Close();
+            _proxy.Dispose();
+
+            Log.Debug("Dispose: end.");
         }
 
         #endregion
@@ -298,13 +294,7 @@ namespace MTApiService
         public event MtQuoteHandler QuoteUpdated;
         public event EventHandler ServerDisconnected;
         public event EventHandler ServerFailed;
-        public event EventHandler<MtEventArgs> MtEventReceived;
+        public event MtEventHandler MtEventReceived;
-        #endregion
-
-        #region Fields
-        private readonly object mClientLocker = new object();
-        private MtApiProxy mProxy = null;
-        private bool mIsConnected = false;
         #endregion
     }
 }

MTApiService/MtCommand.cs

@@ -1,26 +1,27 @@
-using System;
+using System.Runtime.Serialization;
-using System.Linq;
-using System.Text;
-using System.ServiceModel;
-using System.Runtime.Serialization;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace MTApiService
 {
     [DataContract]
     public class MtCommand
     {
-        public MtCommand(int commandType, ArrayList parameters)
+        [DataMember]
+        public int CommandType { get; set; }
+
+        [DataMember]
+        public ArrayList Parameters { get; set; }
+
+        [DataMember]
+        public Dictionary<string, object> NamedParams { get; set; }
+
+        [DataMember]
+        public int ExpertHandle { get; set; }
+
+        public override string ToString()
         {
-            CommandType = commandType;
+            return $"CommandType = {CommandType}; ExpertHandle = {ExpertHandle}";
-            Parameters = parameters;
         }
-
-        [DataMember]
-        public int CommandType { get; private set; }
-
-        [DataMember]
-        public ArrayList Parameters { get; private set; }
-
     }
 }

MTApiService/MtCommandTask.cs

@@ -1,4 +1,5 @@
-using System.Threading;
+using System;
+using System.Threading;
 
 namespace MTApiService
 {
@@ -10,6 +11,9 @@ namespace MTApiService
 
         public MtCommandTask(MtCommand command)
         {
+            if (command == null)
+                throw new ArgumentNullException(nameof(command));
+
             Command = command;
         }
 
@@ -33,5 +37,9 @@ namespace MTApiService
             _responseWaiter.Set();
         }
 
+        public override string ToString()
+        {
+            return $"Command = {Command}";
+        }
     }
 }

MTApiService/MtConnectionProfile.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace MTApiService
 {
     public class MtConnectionProfile

MTApiService/MtEvent.cs

@@ -7,30 +7,17 @@ namespace MTApiService
     public class MtEvent
     {
         [DataMember]
-        public int EventType { get; private set; }
+        public int EventType { get; internal set; }
 
         [DataMember]
-        public string Payload { get; private set; }
+        public string Payload { get; internal set; }
 
-        public MtEvent(int eventType, string payload)
+        [DataMember]
-        {
+        public int ExpertHandle { get; internal set; }
-            EventType = eventType;
-            Payload = payload;
-        }
 
         public override string ToString()
         {
-            return "MtEvent = " + EventType + ", Payload = " + Payload;
+            return $"EventType = {EventType}; Payload = {Payload}; ExpertHandle = {ExpertHandle}";
         }
     }
-
-    public class MtEventArgs: EventArgs
-    {
-        public MtEventArgs(MtEvent e)
-        {
-            Event = e;
-        }
-
-        public MtEvent Event { get; private set; }
-    }
 }

MTApiService/MtExecutorManager.cs

@@ -1,137 +1,115 @@
 using System;
 using System.Collections.Generic;
+using log4net;
 
 namespace MTApiService
 {
-    internal class MtCommandExecutorManager : ICommandManager
+    internal class MtExecutorManager : ICommandManager
     {
+        #region Private Fields
+        private static readonly ILog Log = LogManager.GetLogger(typeof(MtExecutorManager));
+
+        private readonly List<ITaskExecutor> _executorList = new List<ITaskExecutor>();
+        private readonly Dictionary<int, ITaskExecutor> _executorMap = new Dictionary<int, ITaskExecutor>();
+        private readonly object _locker = new object();
+        #endregion
+
         #region Public Methods
 
         public void Stop()
         {
+            Log.Debug("Stop: begin.");
+
             lock (_locker)
             {
-                _commandExecutors.Clear();
+                _executorList.Clear();
-                _commandTasks.Clear();
+                _executorMap.Clear();
             }
+
+            Log.Debug("Stop: end.");
         }
 
-        public void AddCommandExecutor(MtExpert commandExecutor)
+        public void AddExecutor(ITaskExecutor executor)
         {
-            if (commandExecutor == null)
+            if (executor == null)
-                return;
+                throw new ArgumentNullException(nameof(executor));
+
+            Log.DebugFormat("AddExecutor: begin. executor = {0}", executor);
 
-            var notify = false;
             lock (_locker)
             {
-                if (_commandExecutors.Contains(commandExecutor))
+                if (_executorList.Contains(executor))
+                {
+                    Log.Warn("AddExecutor: end. Executor already exist.");
                     return;
-
-                _commandExecutors.Add(commandExecutor);
-                if (_commandTasks.Count > 0)
-                {
-                    notify = true;
                 }
+
+                _executorList.Add(executor);
+                _executorMap[executor.Handle] = executor;
             }
 
-            commandExecutor.CommandExecuted += CommandExecutor_CommandExecuted;
+            Log.Debug("AddCommandExecutor: end.");
-            commandExecutor.CommandManager = this;
-
-            if (notify)
-            {
-                NotifyCommandReady();
-            }
         }
 
-        public void RemoveCommandExecutor(MtExpert commandExecutor)
+        public void RemoveExecutor(ITaskExecutor executor)
         {
-            if (commandExecutor == null)
+            if (executor == null)
-                return;
+                throw new ArgumentNullException(nameof(executor));
+
+            Log.DebugFormat("RemoveExecutor: begin. executor = {0}", executor);
 
-            var notify = false;
             lock (_locker)
             {
-                if (_commandExecutors.Contains(commandExecutor) == false)
+                if (_executorList.Contains(executor) == false)
+                {
+                    Log.Warn("RemoveExecutor: end. Executor is not exist in collection.");
                     return;
+                }
 
-                _commandExecutors.Remove(commandExecutor);
+                _executorList.Remove(executor);
-                if (_commandTasks.Count > 0)
+                _executorMap.Remove(executor.Handle);
+            }
+
+            Log.Debug("RemoveExecutor: end.");
+        }
+
+        public MtCommandTask SendCommand(MtCommand command)
+        {
+            if (command == null)
+                throw new ArgumentNullException(nameof(command));
+
+            var task = new MtCommandTask(command);
+
+            Log.DebugFormat("SendTask: begin. command = {0}", command);
+
+            ITaskExecutor executor;
+
+            lock (_locker)
+            {
+                if (_executorMap.ContainsKey(command.ExpertHandle))
                 {
-                    notify = true;
+                    executor = _executorMap[command.ExpertHandle];
+                }
+                else
+                {
+                    executor = _executorList.Count > 0 ? _executorList[0] : null;
                 }
             }
 
-            commandExecutor.CommandExecuted -= CommandExecutor_CommandExecuted;
+            if (executor == null)
-            commandExecutor.CommandManager = null;
-
-            if (notify)
             {
-                NotifyCommandReady();
+                Log.Error("SendTask: Executor is null!");
             }
+            else
+            {
+                executor.Execute(task);
+            }
+
+            Log.Debug("SendTask: end.");
+
+            return task;
         }
 
-        public void EnqueueCommandTask(MtCommandTask task)
-        {
-            if (task == null)
-                return;
-
-            lock (_locker)
-            {
-                _commandTasks.Enqueue(task);                
-            }
-
-            NotifyCommandReady();
-        }
-
-        public MtCommandTask DequeueCommandTask()
-        {
-            lock (_locker)
-            {
-                return _commandTasks.Count > 0 ? _commandTasks.Dequeue() : null;
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-        private void NotifyCommandReady()
-        {
-            var commandExecutors = new List<MtExpert>();
-            lock (_locker)
-            {
-                commandExecutors.AddRange(_commandExecutors);
-            }
-
-            foreach (var executor in commandExecutors)
-            {
-                executor.NotifyCommandReady();
-            }
-        }
-
-        private void CommandExecutor_CommandExecuted(object sender, EventArgs e)
-        {
-            var notify = false;
-            lock (_locker)
-            {
-                if (_commandTasks.Count > 0)
-                {
-                    notify = true;
-                }
-            }
-
-            if (notify)
-            {
-                NotifyCommandReady();
-            }
-
-        }
-        #endregion
-
-        #region Private Fields
-        private readonly List<MtExpert> _commandExecutors = new List<MtExpert>();
-        private readonly Queue<MtCommandTask> _commandTasks = new Queue<MtCommandTask>();
-
-        private readonly object _locker = new object();
         #endregion
     }
 }

MTApiService/MtExpert.cs

@@ -1,12 +1,148 @@
 using System;
+using log4net;
+using System.Collections.Generic;
 
 namespace MTApiService
 {
-    public class MtExpert
+    internal class MtExpert: ITaskExecutor
     {
         public delegate void MtQuoteHandler(MtExpert expert, MtQuote quote);
+        public delegate void MtEventHandler(MtExpert expert, MtEvent e);
+
+        #region Private Fields
+        private static readonly ILog Log = LogManager.GetLogger(typeof(MtExpert));
+
+        private readonly IMetaTraderHandler _mtHadler;
+        private MtCommandTask _currentTask;
+        private readonly Queue<MtCommandTask> _taskQueue = new Queue<MtCommandTask>();
+        private readonly object _locker = new object();
+        #endregion
+
+        #region Public Methods
+        public MtExpert(int handle, MtQuote quote, IMetaTraderHandler mtHandler)
+        {
+            if (mtHandler == null)
+                throw new ArgumentNullException(nameof(mtHandler));
+
+            Quote = quote;
+            Handle = handle;
+            _mtHadler = mtHandler;
+        }
+
+        public void Deinit()
+        {
+            Log.Debug("Deinit: begin.");
+
+            IsEnable = false;
+            FireOnDeinited();
+
+            Log.Debug("Deinit: end.");
+        }
+
+        public void SendResponse(MtResponse response)
+        {
+            Log.DebugFormat("SendResponse: begin. response = {0}", response);
+
+            _currentTask.SetResult(response);
+            _currentTask = null;
+
+            Log.Debug("SendResponse: end.");
+        }
+
+        public int GetCommandType()
+        {
+            Log.Debug("GetCommandType: called.");
+
+            _currentTask = DequeueTask();
+
+            return _currentTask?.Command?.CommandType ?? 0;
+        }
+
+        public object GetCommandParameter(int index)
+        {
+            Log.DebugFormat("GetCommandParameter: called. index = {0}", index);
+
+            var command = _currentTask?.Command;
+            if (command?.Parameters != null && index >= 0 && index < command.Parameters.Count)
+            {
+                return command.Parameters[index];
+            }
+
+            return null;
+        }
+
+        public object GetNamedParameter(string name)
+        {
+            Log.DebugFormat("GetNamedParameter: called. name = {0}", name);
+
+            var command = _currentTask?.Command;
+            if (command == null)
+            {
+                Log.Warn("GetNamedParameter: command is not defined in task.");
+                return null;
+            }
+
+            if (command.NamedParams == null)
+            {
+                Log.Warn("GetNamedParameter: NamedParams is not defined in command.");
+                return null;
+            }
+
+            return command.NamedParams[name];
+        }
+
+        public bool ContainsNamedParameter(string name)
+        {
+            Log.DebugFormat("ContainsNamedParameter: called. name = {0}", name);
+
+            var command = _currentTask?.Command;
+            if (command == null)
+            {
+                Log.Warn("ContainsNamedParameter: command is not defined in task.");
+                return false;
+            }
+
+            if (command.NamedParams == null)
+            {
+                Log.Warn("ContainsNamedParameter: NamedParams is not defined in command.");
+                return false;
+            }
+
+            return command.NamedParams.ContainsKey(name);
+        }
+
+        public void SendEvent(MtEvent mtEvent)
+        {
+            Log.DebugFormat("SendEvent: begin. event = {0}", mtEvent);
+
+            FireOnMtEvent(mtEvent);
+
+            Log.Debug("SendEvent: end.");
+        }
+
+        public override string ToString()
+        {
+            return $"ExpertHandle = {Handle}";
+        }
+
+        #endregion
+
+        #region ITaskExecutor
+
+        public void Execute(MtCommandTask task)
+        {
+            lock (_taskQueue)
+            {
+                _taskQueue.Enqueue(task);
+            }
+
+            NotifyCommandReady();
+        }
+
+        #endregion
 
         #region Properties
+
         private MtQuote _quote;
         public MtQuote Quote
         {
@@ -19,7 +155,7 @@ namespace MTApiService
             }
             set
             {
-                lock(_locker)
+                lock (_locker)
                 {
                     _quote = value;
                 }
@@ -28,7 +164,7 @@ namespace MTApiService
             }
         }
 
-        public int Handle { get; private set; }
+        public int Handle { get; }
 
         private bool _isEnable = true;
         public bool IsEnable
@@ -49,93 +185,34 @@ namespace MTApiService
             }
         }
 
-        public ICommandManager CommandManager
-        {
-            private get
-            {
-                lock (_locker)
-                {
-                    return _commandManager;
-                }
-            }
-            set
-            {
-                lock (_locker)
-                {
-                    _commandManager = value;
-                }
-            }
-        }
-
-        #endregion
-
-        #region Public Methods
-        public MtExpert(int handle, MtQuote quote, IMetaTraderHandler mtHandler)
-        {
-            Quote = quote;
-            Handle = handle;
-            _mtHadler = mtHandler;
-        }
-
-        public void Deinit()
-        {
-            IsEnable = false;
-            FireOnDeinited();
-        }
-
-        public void SendResponse(MtResponse response)
-        {
-            _commandTask.SetResult(response);
-            _commandTask = null;
-            FireOnCommandExecuted();
-        }
-
-        public int GetCommandType()
-        {
-            var commandManager = CommandManager;
-            if (commandManager != null)
-            {
-                _commandTask = commandManager.DequeueCommandTask();
-            }
-
-            return _commandTask != null && _commandTask.Command != null ? _commandTask.Command.CommandType : 0;
-        }
-
-        public object GetCommandParameter(int index)
-        {
-            if (_commandTask != null)
-            {
-                var command = _commandTask.Command;
-                if (command != null && command.Parameters != null
-                    && index >= 0 && index < command.Parameters.Count)
-                {
-                    return command.Parameters[index];
-                }
-            }
-
-            return null;
-        }
-
-        public void SendEvent(MtEvent mtEvent)
-        {
-            FireOnMtEvent(mtEvent);
-        }
-        #endregion
-
-        #region IMtCommandExecutor
-        public void NotifyCommandReady()
-        {
-            SendTickToMetaTrader();
-        }
         #endregion
 
         #region Private Methods
-        private void SendTickToMetaTrader()
+        private MtCommandTask DequeueTask()
         {
-            if (_mtHadler != null)
+            Log.Debug("DequeueTask: called.");
+
+            MtCommandTask task;
+            int count;
+
+            lock (_locker)
             {
-                _mtHadler.SendTickToMetaTrader(Handle);
+                count = _taskQueue.Count;
+                task = _taskQueue.Count > 0 ? _taskQueue.Dequeue() : null;
             }
+
+            Log.DebugFormat("DequeueTask: end. left task count = {0}.", count);
+
+            return task;
+        }
+
+        private void NotifyCommandReady()
+        {
+            Log.Debug("NotifyCommandReady: begin.");
+
+            _mtHadler.SendTickToMetaTrader(Handle);
+
+            Log.Debug("NotifyCommandReady: end.");
         }
 
         private void FireOnQuoteChanged(MtQuote quote)
@@ -148,29 +225,16 @@ namespace MTApiService
             Deinited?.Invoke(this, EventArgs.Empty);
         }
 
-        private void FireOnCommandExecuted()
-        {
-            CommandExecuted?.Invoke(this, EventArgs.Empty);
-        }
-
         private void FireOnMtEvent(MtEvent mtEvent)
         {
-            OnMtEvent?.Invoke(this, new MtEventArgs(mtEvent));
+            OnMtEvent?.Invoke(this, mtEvent);
         }
         #endregion
 
         #region Events
         public event EventHandler Deinited;
         public event MtQuoteHandler QuoteChanged;
-        public event EventHandler CommandExecuted;
+        public event MtEventHandler OnMtEvent;
-        public event EventHandler<MtEventArgs> OnMtEvent;
-        #endregion
-
-        #region Private Fields
-        private readonly IMetaTraderHandler _mtHadler;
-        private MtCommandTask _commandTask;
-        private ICommandManager _commandManager;
-        private readonly object _locker = new object();
         #endregion
     }
 }

MTApiService/MtInstrument.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Runtime.Serialization;
-
-namespace MTApiService
-{
-    [DataContract]
-    public class MtQuote
-    {
-        [DataMember]
-        public string Instrument { get; private set; }
-        
-        [DataMember]
-        public double Bid { get; private set; }
-
-        [DataMember]
-        public double Ask { get; private set; }
-
-        public MtQuote(string instrument, double bid, double ask)
-        {
-            Instrument = instrument;
-            Bid = bid;
-            Ask = ask;
-        }
-
-        public override string ToString()
-        {
-            return "Instrument = " + Instrument + ", Bid = " + Bid + ", Ask = " + Ask;
-        }
-    }
-}

MTApiService/MtMqlBookInfo.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Runtime.Serialization;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Runtime.Serialization;
 
 namespace MTApiService
 {

MTApiService/MtMqlRates.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Runtime.Serialization;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.Runtime.Serialization;
 
 namespace MTApiService
 {

MTApiService/MtMqlTick.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Runtime.Serialization;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Runtime.Serialization;
 
 namespace MTApiService
 {

MTApiService/MtMqlTradeRequest.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Runtime.Serialization;
 
 namespace MTApiService

MTApiService/MtQuote.cs

@@ -0,0 +1,25 @@
+using System.Runtime.Serialization;
+
+namespace MTApiService
+{
+    [DataContract]
+    public class MtQuote
+    {
+        [DataMember]
+        public string Instrument { get; internal set; }
+        
+        [DataMember]
+        public double Bid { get; internal set; }
+
+        [DataMember]
+        public double Ask { get; internal set; }
+
+        [DataMember]
+        public int ExpertHandle { get; internal set; }
+
+        public override string ToString()
+        {
+            return $"Instrument = {Instrument}; Bid = {Bid}; Ask = {Ask}; ExpertHandle = {ExpertHandle}";
+        }
+    }
+}

MTApiService/MtRegistryManager.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Microsoft.Win32;
 using System.Diagnostics;
 
@@ -9,12 +7,12 @@ namespace MTApiService
 {
     public class MtRegistryManager
     {
-        private const string SOFTWARE = "Software";
+        private const string Software = "Software";
-        private const string APP_NAME = "MtApi";
+        private const string AppName = "MtApi";
-        private const string PROFILES_REGKEY = "ConnectionProfiles";
+        private const string ProfilesRegkey = "ConnectionProfiles";
-        private const string HOST_REGVALUE_NAME = "Host";
+        private const string HostRegvalueName = "Host";
-        private const string PORT_REGVALUE_NAME = "Port";
+        private const string PortRegvalueName = "Port";
-        private const string SIGNATURE_REGVALUE_NAME = "MtSignature";
+        private const string SignatureRegvalueName = "MtSignature";
 
         #region Public Methods
         public static IEnumerable<MtConnectionProfile> LoadConnectionProfiles()
@@ -53,12 +51,12 @@ namespace MTApiService
 
             string signature = null;
 
-            var softwareRegKey = Registry.CurrentUser.OpenSubKey(SOFTWARE, true);
+            var softwareRegKey = Registry.CurrentUser.OpenSubKey(Software, true);
             if (softwareRegKey != null)
             {
                 using (softwareRegKey)
                 {
-                    var appRegKey = softwareRegKey.OpenSubKey(APP_NAME, true);
+                    var appRegKey = softwareRegKey.OpenSubKey(AppName, true);
                     if (appRegKey != null)
                     {
                         using (appRegKey)
@@ -73,7 +71,7 @@ namespace MTApiService
                                     {
                                         using (numberKey)
                                         {
-                                            signature = numberKey.GetValue(SIGNATURE_REGVALUE_NAME).ToString();
+                                            signature = numberKey.GetValue(SignatureRegvalueName).ToString();
                                         }
                                     }
                                 }
@@ -94,7 +92,7 @@ namespace MTApiService
                 return null;
             }
 
-            RegistryKey softwareRgKey = Registry.CurrentUser.OpenSubKey(SOFTWARE, true);
+            var softwareRgKey = Registry.CurrentUser.OpenSubKey(Software, true);
 
             if (softwareRgKey == null)
                 return null;
@@ -105,35 +103,33 @@ namespace MTApiService
             {
 
                 //app name
-                var appRegKey = softwareRgKey.OpenSubKey(APP_NAME, true);
+                var appRegKey = softwareRgKey.OpenSubKey(AppName, true) ?? softwareRgKey.CreateSubKey(AppName);
-                if (appRegKey == null)
+
+                if (appRegKey != null)
                 {
-                    appRegKey = softwareRgKey.CreateSubKey(APP_NAME);
+                    using (appRegKey)
-                }
-
-                using (appRegKey)
-                {
-                    //account name
-                    var accountKey = appRegKey.OpenSubKey(accountName, true);
-                    if (accountKey == null)
                     {
-                        accountKey = appRegKey.CreateSubKey(accountName);
+                        //account name
-                    }
+                        var accountKey = appRegKey.OpenSubKey(accountName, true) ?? appRegKey.CreateSubKey(accountName);
 
-                    using (accountKey)
+                        if (accountKey != null)
-                    {
-                        //account number
-                        var numberKey = accountKey.OpenSubKey(accountNumber, true);
-                        if (numberKey == null)
                         {
-                            numberKey = accountKey.CreateSubKey(accountNumber);
+                            using (accountKey)
-                        }
+                            {
+                                //account number
+                                var numberKey = accountKey.OpenSubKey(accountNumber, true) ??
+                                                accountKey.CreateSubKey(accountNumber);
 
-                        using (numberKey)
+                                if (numberKey != null)
-                        {
+                                {
-                            numberKey.SetValue(SIGNATURE_REGVALUE_NAME, signature);
+                                    using (numberKey)
+                                    {
+                                        numberKey.SetValue(SignatureRegvalueName, signature);
 
-                            retVal = numberKey.ToString();
+                                        retVal = numberKey.ToString();
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -142,20 +138,19 @@ namespace MTApiService
             return retVal;
         }
 
-        public static bool ExportKey(string RegKey, string SavePath)
+        public static bool ExportKey(string regKey, string savePath)
         {
-            string path = "\"" + SavePath + "\"";
+            var path = $"\"{savePath}\"";
-            string key = "\"" + RegKey + "\"";
+            var key = $"\"{regKey}\"";
 
-            Process proc = new Process();
+            var proc = new Process();
             try
             {
                 proc.StartInfo.FileName = "regedit.exe";
                 proc.StartInfo.UseShellExecute = false;
                 proc = Process.Start("regedit.exe", "/e " + path + " " + key + "");
 
-                if (proc != null) 
+                proc?.WaitForExit();
-                    proc.WaitForExit();
             }
             catch(Exception)
             {
@@ -163,8 +158,7 @@ namespace MTApiService
             }
             finally
             {
-                if (proc != null) 
+                proc?.Dispose();
-                    proc.Dispose();
             }
 
             return true;
@@ -177,33 +171,38 @@ namespace MTApiService
         {
             List<MtConnectionProfile> profiles = null;
 
-            var softwareRegKey = Registry.CurrentUser.OpenSubKey(SOFTWARE, true);
+            var softwareRegKey = Registry.CurrentUser.OpenSubKey(Software, true);
             if (softwareRegKey != null)
             {
                 using (softwareRegKey)
                 {
-                    var appRegKey = softwareRegKey.OpenSubKey(APP_NAME, true);
+                    var appRegKey = softwareRegKey.OpenSubKey(AppName, true);
                     if (appRegKey != null)
                     {
                         using (appRegKey)
                         {
-                            var profilesRegKey = appRegKey.OpenSubKey(PROFILES_REGKEY, true);
+                            var profilesRegKey = appRegKey.OpenSubKey(ProfilesRegkey, true);
                             if (profilesRegKey != null)
                             {
                                 using (profilesRegKey)
                                 {
                                     profiles = new List<MtConnectionProfile>();
 
-                                    foreach (string profileNameKey in profilesRegKey.GetSubKeyNames())
+                                    foreach (var profileNameKey in profilesRegKey.GetSubKeyNames())
                                     {
-                                        using (RegistryKey tempKey = profilesRegKey.OpenSubKey(profileNameKey))
+                                        var tempKey = profilesRegKey.OpenSubKey(profileNameKey);
+                                        if (tempKey != null)
                                         {
-                                            var profile = new MtConnectionProfile(profileNameKey);
+                                            using (tempKey)
+                                            {
+                                                var profile = new MtConnectionProfile(profileNameKey)
+                                                {
+                                                    Host = tempKey.GetValue(HostRegvalueName).ToString(),
+                                                    Port = (int) tempKey.GetValue(PortRegvalueName)
+                                                };
 
-                                            profile.Host = tempKey.GetValue(HOST_REGVALUE_NAME).ToString();
+                                                profiles.Add(profile);
-                                            profile.Port = (int)tempKey.GetValue(PORT_REGVALUE_NAME);
+                                            }
-
-                                            profiles.Add(profile);
                                         }
                                     }
                                 }
@@ -220,27 +219,33 @@ namespace MTApiService
         {
             MtConnectionProfile profile = null;
 
-            var softwareRegKey = Registry.CurrentUser.OpenSubKey(SOFTWARE, true);
+            var softwareRegKey = Registry.CurrentUser.OpenSubKey(Software, true);
             if (softwareRegKey != null)
             {
                 using (softwareRegKey)
                 {
-                    var appRegKey = softwareRegKey.OpenSubKey(APP_NAME, true);
+                    var appRegKey = softwareRegKey.OpenSubKey(AppName, true);
                     if (appRegKey != null)
                     {
                         using (appRegKey)
                         {
-                            var profilesRegKey = appRegKey.OpenSubKey(PROFILES_REGKEY, true);
+                            var profilesRegKey = appRegKey.OpenSubKey(ProfilesRegkey, true);
                             if (profilesRegKey != null)
                             {
                                 using (profilesRegKey)
                                 {
-                                    using (RegistryKey tempKey = profilesRegKey.OpenSubKey(profileName))
+                                    var tempKey = profilesRegKey.OpenSubKey(profileName);
+                                    if (tempKey != null)
                                     {
-                                        profile = new MtConnectionProfile(profileName);
+                                        using (tempKey)
+                                        {
+                                            profile = new MtConnectionProfile(profileName)
+                                            {
+                                                Host = tempKey.GetValue(HostRegvalueName).ToString(),
+                                                Port = (int) tempKey.GetValue(PortRegvalueName)
+                                            };
 
-                                        profile.Host = tempKey.GetValue(HOST_REGVALUE_NAME).ToString();
+                                        }
-                                        profile.Port = (int)tempKey.GetValue(PORT_REGVALUE_NAME);
                                     }
                                 }
                             }
@@ -254,7 +259,7 @@ namespace MTApiService
 
         private static void SaveConnectionProfileToRegistry(MtConnectionProfile profile)
         {
-            RegistryKey softwareRgKey = Registry.CurrentUser.OpenSubKey(SOFTWARE, true);
+            var softwareRgKey = Registry.CurrentUser.OpenSubKey(Software, true);
 
             if (softwareRgKey == null)
                 return;
@@ -262,29 +267,30 @@ namespace MTApiService
             using (softwareRgKey)
             {
                 //app name
-                var appRegKey = softwareRgKey.OpenSubKey(APP_NAME, true);
+                var appRegKey = softwareRgKey.OpenSubKey(AppName, true) ?? softwareRgKey.CreateSubKey(AppName);
-                if (appRegKey == null)
+
+                if (appRegKey != null)
                 {
-                    appRegKey = softwareRgKey.CreateSubKey(APP_NAME);
+                    using (appRegKey)
-                }
-
-                using (appRegKey)
-                {
-                    //ConnectionProfiles key
-                    var profilesRegKey = appRegKey.OpenSubKey(PROFILES_REGKEY, true);
-                    if (profilesRegKey == null)
                     {
-                        profilesRegKey = appRegKey.CreateSubKey(PROFILES_REGKEY);
+                        //ConnectionProfiles key
-                    }
+                        var profilesRegKey = appRegKey.OpenSubKey(ProfilesRegkey, true) ??
+                                             appRegKey.CreateSubKey(ProfilesRegkey);
 
-                    using (profilesRegKey)
+                        if (profilesRegKey != null)
-                    {
-                        var profileKey = profilesRegKey.CreateSubKey(profile.Name);
-
-                        using (profileKey)
                         {
-                            profileKey.SetValue(HOST_REGVALUE_NAME, profile.Host);
+                            using (profilesRegKey)
-                            profileKey.SetValue(PORT_REGVALUE_NAME, profile.Port);
+                            {
+                                var profileKey = profilesRegKey.CreateSubKey(profile.Name);
+                                if (profileKey != null)
+                                {
+                                    using (profileKey)
+                                    {
+                                        profileKey.SetValue(HostRegvalueName, profile.Host);
+                                        profileKey.SetValue(PortRegvalueName, profile.Port);
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -293,19 +299,19 @@ namespace MTApiService
 
         private static void DeleteConnectionProfileFromRegistry(string profileName)
         {
-            var softwareRegKey = Registry.CurrentUser.OpenSubKey(SOFTWARE, true);
+            var softwareRegKey = Registry.CurrentUser.OpenSubKey(Software, true);
             if (softwareRegKey == null)
                 return;
 
             using (softwareRegKey)
             {
-                var appRegKey = softwareRegKey.OpenSubKey(APP_NAME, true);
+                var appRegKey = softwareRegKey.OpenSubKey(AppName, true);
                 if (appRegKey == null)
                     return;
 
                 using (appRegKey)
                 {
-                    var profilesRegKey = appRegKey.OpenSubKey(PROFILES_REGKEY, true);
+                    var profilesRegKey = appRegKey.OpenSubKey(ProfilesRegkey, true);
                     if (profilesRegKey == null)
                         return;
 

MTApiService/MtResponse.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Runtime.Serialization;
 using System.Collections;
+using System.Globalization;
 
 namespace MTApiService
 {
@@ -13,7 +12,8 @@ namespace MTApiService
     {
         static IEnumerable<Type> GetKnownTypes()
         {
-            return new Type[] { typeof(MtResponseInt), typeof(MtResponseDouble),
+            return new Type[] { typeof(MtResponseObject),
+                                typeof(MtResponseInt), typeof(MtResponseDouble),
                                 typeof(MtResponseString), typeof(MtResponseBool),
                                 typeof(MtResponseLong), typeof(MtResponseULong),
                                 typeof(MtResponseDoubleArray), typeof(MtResponseIntArray),
@@ -21,6 +21,30 @@ namespace MTApiService
                                 typeof(MtResponseArrayList), typeof(MtResponseMqlRatesArray),
                                 typeof(MtResponseMqlBookInfoArray)};
         }
+
+        public abstract object GetValue();
+
+        [DataMember]
+        public int ErrorCode { get; set; }
+    }
+
+    [DataContract]
+    public class MtResponseObject : MtResponse
+    {
+        public MtResponseObject(object value)
+        {
+            Value = value;
+        }
+
+        [DataMember]
+        public object Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value?.ToString() ?? string.Empty;
+        }
     }
 
     [DataContract]
@@ -33,6 +57,13 @@ namespace MTApiService
 
         [DataMember]
         public int Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -45,6 +76,13 @@ namespace MTApiService
 
         [DataMember]
         public long Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -57,6 +95,13 @@ namespace MTApiService
 
         [DataMember]
         public ulong Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -69,6 +114,13 @@ namespace MTApiService
 
         [DataMember]
         public double Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString(CultureInfo.CurrentCulture);
+        }
     }
 
     [DataContract]
@@ -81,6 +133,13 @@ namespace MTApiService
 
         [DataMember]
         public string Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value;
+        }
     }
 
     [DataContract]
@@ -93,6 +152,13 @@ namespace MTApiService
 
         [DataMember]
         public bool Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -105,6 +171,13 @@ namespace MTApiService
 
         [DataMember]
         public double[] Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -117,6 +190,13 @@ namespace MTApiService
 
         [DataMember]
         public int[] Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -129,6 +209,13 @@ namespace MTApiService
 
         [DataMember]
         public long[] Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -141,6 +228,13 @@ namespace MTApiService
 
         [DataMember]
         public ArrayList Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -153,6 +247,13 @@ namespace MTApiService
 
         [DataMember]
         public MtMqlRates[] Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -165,6 +266,13 @@ namespace MTApiService
 
         [DataMember]
         public MtMqlTick Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
 
     [DataContract]
@@ -177,6 +285,13 @@ namespace MTApiService
 
         [DataMember]
         public MtMqlBookInfo[] Value { get; private set; }
+
+        public override object GetValue() { return Value; }
+
+        public override string ToString()
+        {
+            return Value.ToString();
+        }
     }
     
 }

MTApiService/MtServer.cs

@@ -3,17 +3,26 @@ using System.Collections.Generic;
 using System.Linq;
 using System.ServiceModel;
 using System.Net;
-using System.Diagnostics;
 using System.ServiceModel.Channels;
 using System.Net.Sockets;
+using log4net;
 
 namespace MTApiService
 {
     internal class MtServer : IDisposable, IMtApiServer
     {
         #region Constants
-        private const int WAIT_RESPONSE_TIME = 40000; // 40 sec
+        private const int WaitResponseTime = 40000; // 40 sec
-        private const int STOP_EXPERT_INTERVAL = 1000; // 1 sec 
+        private const int StopExpertInterval = 1000; // 1 sec 
+        #endregion
+
+        #region Fields
+        private static readonly ILog Log = LogManager.GetLogger(typeof(MtServer));
+
+        private readonly MtService _service;
+        private readonly List<ServiceHost> _hosts = new List<ServiceHost>();
+        private readonly MtExecutorManager _executorManager = new MtExecutorManager();
+        private readonly List<MtExpert> _experts = new List<MtExpert>();
         #endregion
 
         #region ctor
@@ -25,99 +34,134 @@ namespace MTApiService
         #endregion
 
         #region Properties
-        public int Port { get; private set; }
+        public int Port { get; }
         #endregion
 
         #region Public Methods
         public void Start()
         {
+            Log.Debug("Start: begin");
+
             var hostsInitialized = InitHosts(Port);
-            if (hostsInitialized == false)
+
-            {
+            Log.DebugFormat("Start: end. hostsInitialized = {0}", hostsInitialized);
-                Debug.WriteLine("Start: InitHosts failed. ");
-            }
         }
 
         private bool InitHosts(int port)
         {
+            Log.DebugFormat("InitHosts: begin. port = {0}", port);
+
+            int count;
+
             lock (_hosts)
             {
                 if (_hosts.Count > 0)
+                {
+                    Log.Info("InitHosts: end. Host's has been initialized");
                     return false;
+                }
 
                 //init local pipe host
-                string localUrl = CreateConnectionAddress(null, port, true);
+                var localPipeUrl = CreateConnectionAddress(null, port, true);
-                ServiceHost localServiceHost = CreateServiceHost(localUrl, true);
+                var localPipeServiceHost = CreateServiceHost(localPipeUrl, true);
+                if (localPipeServiceHost != null)
+                {
+                    _hosts.Add(localPipeServiceHost);
+                }
+
+                //init localhost
+                var localUrl = CreateConnectionAddress("localhost", port, false);
+                var localServiceHost = CreateServiceHost(localUrl, false);
                 if (localServiceHost != null)
                 {
                     _hosts.Add(localServiceHost);
                 }
 
                 //init network hosts
-                IPHostEntry ips = Dns.GetHostEntry(Dns.GetHostName());
+                var dnsHostName = Dns.GetHostName();
-                if (ips != null)
+                var ips = Dns.GetHostEntry(dnsHostName);
+                if (ips == null)
                 {
-                    foreach (IPAddress ipAddress in ips.AddressList)
+                    Log.WarnFormat("InitHosts: end. Dns.GetHostEntry has returned null for DNS Host Name {0}", dnsHostName);
+                    return false;
+                }
+
+                foreach (var ipAddress in ips.AddressList)
+                {
+                    if (ipAddress?.AddressFamily == AddressFamily.InterNetwork)
                     {
-                        if (ipAddress != null)
+                        var ip = ipAddress.ToString();
+                        var networkUrl = CreateConnectionAddress(ip, port, false);
+                        var serviceHost = CreateServiceHost(networkUrl, false);
+                        if (serviceHost != null)
                         {
-                            if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
+                            _hosts.Add(serviceHost);
-                            {
-                                string ip = ipAddress.ToString();
-                                string networkUrl = CreateConnectionAddress(ip, port, false);
-                                ServiceHost serviceHost = CreateServiceHost(networkUrl, false);
-                                if (serviceHost != null)
-                                {
-                                    _hosts.Add(serviceHost);
-                                }
-                            }
                         }
                     }
                 }
+
+                count = _hosts.Count;
             }
 
+            Log.DebugFormat("InitHosts: end. Host's count = {0}", count);
+
             return true;
         }
 
         private ServiceHost CreateServiceHost(string serverUrlAdress, bool local)
         {
-            ServiceHost serviceHost = null;            
+            Log.DebugFormat("CreateServiceHost: begin. serverUrlAdress = {0}; local = {1}", serverUrlAdress, local);
-            if (serverUrlAdress != null)
-            {
-                try
-                {
-                    serviceHost = new ServiceHost(_service);
-                    var binding = CreateConnectionBinding(local);
 
-                    serviceHost.AddServiceEndpoint(typeof(IMtApi), binding, serverUrlAdress);
+            if (serverUrlAdress == null)
-                    serviceHost.Open();
+            {
-                }
+                Log.Warn("CreateServiceHost: end. serverUrlAdress is not defined");
-                catch(Exception e) 
+                return null;
-                {
-                    Debug.WriteLine("CreateServiceHost: Create ServiceHost failed. " + e.Message);
-                }
             }
 
+            ServiceHost serviceHost;
+            try
+            {
+                serviceHost = new ServiceHost(_service);
+                var binding = CreateConnectionBinding(local);
+
+                serviceHost.AddServiceEndpoint(typeof(IMtApi), binding, serverUrlAdress);
+                serviceHost.Open();
+            }
+            catch(Exception e) 
+            {
+                Log.ErrorFormat("CreateServiceHost: Error! {0}", e.Message);
+                serviceHost = null;
+            }
+
+            Log.Debug("CreateServiceHost: end.");
+
             return serviceHost;
         }
 
         public void AddExpert(MtExpert expert)
         {
-            if (expert != null)
+            Log.DebugFormat("AddExpert: begin. expert {0}", expert);
+
+            if (expert == null)
             {
-                expert.Deinited += expert_Deinited;
+                Log.Warn("AddExpert: end. expert is not defined");
-                expert.QuoteChanged += expert_QuoteChanged;
+                return;
-                expert.OnMtEvent += Expert_OnMtEvent;
-
-                lock (_experts)
-                {
-                    _experts.Add(expert);
-                }
-
-                _executorManager.AddCommandExecutor(expert);
-
-                _service.OnQuoteAdded(expert.Quote);
             }
+
+            expert.Deinited += expert_Deinited;
+            expert.QuoteChanged += expert_QuoteChanged;
+            expert.OnMtEvent += Expert_OnMtEvent;
+
+            lock (_experts)
+            {
+                _experts.Add(expert);
+            }
+
+            _executorManager.AddExecutor(expert);
+
+            _service.OnQuoteAdded(expert.Quote);
+
+            Log.Debug("AddExpert: end.");
         }
 
         #endregion
@@ -126,25 +170,39 @@ namespace MTApiService
 
         public MtResponse SendCommand(MtCommand command)
         {
-            MtResponse response = null;
+            Log.DebugFormat("SendCommand: begin. command {0}", command);
 
-            if (command != null)
+            if (command == null)
             {
-                var task = new MtCommandTask(command);
+                Log.Warn("SendCommand: end. command is not defined");
-                _executorManager.EnqueueCommandTask(task);
+                return null;
-
-                //wait for execute command in MetaTrader
-                response = task.WaitResult(WAIT_RESPONSE_TIME);
             }
 
+            var task = _executorManager.SendCommand(command);
+
+            //wait for execute command in MetaTrader
+            MtResponse response = null;
+            try
+            {
+                response = task.WaitResult(WaitResponseTime);
+            }
+            catch (Exception ex)
+            {
+                Log.WarnFormat("SendCommand: Exception - {0}", ex.Message);
+            }
+
+            Log.DebugFormat("SendCommand: end. response = {0}", response);
+
             return response;
         }
 
-        public IEnumerable<MtQuote> GetQuotes()
+        public List<MtQuote> GetQuotes()
         {
+            Log.Debug("GetQuotes: called");
+
             lock (_experts)
             {
-                return (from s in _experts select s.Quote);
+                return _experts.Select(s => s.Quote).ToList();
             }
         }
 
@@ -153,99 +211,131 @@ namespace MTApiService
         #region Private Methods
         private void stopTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            var expertsCount = 0;
+            Log.DebugFormat("stopTimer_Elapsed: begin");
+
+            int expertsCount;
 
             lock (_experts)
             {
-                expertsCount = _experts.Count();
+                expertsCount = _experts.Count;
             }
 
             if (expertsCount == 0)
             {
                 _service.OnStopServer();
 
+                Log.DebugFormat("stopTimer_Elapsed: experts count is 0. Call Stop().");
+
                 Stop();
             }
 
             var stopTimer = sender as System.Timers.Timer;
-            if (stopTimer != null)
+            if (stopTimer == null) return;
-            {
+
-                stopTimer.Stop();
+            stopTimer.Stop();
-                stopTimer.Elapsed -= stopTimer_Elapsed;                
+            stopTimer.Elapsed -= stopTimer_Elapsed;
-            }
+
+            Log.DebugFormat("stopTimer_Elapsed: end");
         }
 
-        private string CreateConnectionAddress(string host, int port, bool local)
+        private static string CreateConnectionAddress(string host, int port, bool local)
         {
+            Log.DebugFormat("CreateConnectionAddress: begin. host = {0}, port = {1}, local = {2}", host, port, local);
+
             string connectionAddress = null;
 
-            if (local == true)
+            if (local)
             {
                 //by Pipe
-                connectionAddress = "net.pipe://localhost/MtApiService_" + port.ToString();
+                connectionAddress = "net.pipe://localhost/MtApiService_" + port;
             }
             else
             {
                 //by Socket
                 if (host != null)
                 {
-                    connectionAddress = "net.tcp://" + host.ToString() + ":" + port.ToString() + "/MtApiService";
+                    connectionAddress = "net.tcp://" + host + ":" + port + "/MtApiService";
                 }
             }
 
+            Log.DebugFormat("CreateConnectionAddress: end. connectionAddress = {0}", connectionAddress);
+
             return connectionAddress;
         }
 
         private static Binding CreateConnectionBinding(bool local)
         {
-            Binding connectionBinding = null;
+            Log.DebugFormat("CreateConnectionBinding: begin. local = {0}", local);
 
-            if (local == true)
+            Binding connectionBinding;
+
+            if (local)
             {
                 //by Pipe
-                var bind = new NetNamedPipeBinding(NetNamedPipeSecurityMode.None);
+                var bind = new NetNamedPipeBinding(NetNamedPipeSecurityMode.None)
-                bind.MaxReceivedMessageSize = 2147483647;
+                {
-                bind.MaxBufferSize = 2147483647;
+                    MaxReceivedMessageSize = 2147483647,
+                    MaxBufferSize = 2147483647,
+                    MaxBufferPoolSize = 2147483647,
+                    SendTimeout = new TimeSpan(12, 0, 0),
+                    ReceiveTimeout = new TimeSpan(12, 0, 0),
+                    ReaderQuotas =
+                    {
+                        MaxArrayLength = 2147483647,
+                        MaxBytesPerRead = 2147483647,
+                        MaxDepth = 2147483647,
+                        MaxStringContentLength = 2147483647,
+                        MaxNameTableCharCount = 2147483647
+                    }
+                };
 
                 // Commented next statement since it is not required
-                bind.MaxBufferPoolSize = 2147483647;
-                bind.ReaderQuotas.MaxArrayLength = 2147483647;
-                bind.ReaderQuotas.MaxBytesPerRead = 2147483647;
-                bind.ReaderQuotas.MaxDepth = 2147483647;
-                bind.ReaderQuotas.MaxStringContentLength = 2147483647;
-                bind.ReaderQuotas.MaxNameTableCharCount = 2147483647;
 
                 connectionBinding = bind;
             }
             else
             {
                 //by Socket
-                var bind = new NetTcpBinding(SecurityMode.None);
+                var bind = new NetTcpBinding(SecurityMode.None)
-                bind.MaxReceivedMessageSize = 2147483647;
+                {
-                bind.MaxBufferSize = 2147483647;
+                    MaxReceivedMessageSize = 2147483647,
+                    MaxBufferSize = 2147483647,
+                    MaxBufferPoolSize = 2147483647,
+                    SendTimeout = new TimeSpan(12, 0, 0),
+                    ReceiveTimeout = new TimeSpan(12, 0, 0),
+                    ReaderQuotas =
+                    {
+                        MaxArrayLength = 2147483647,
+                        MaxBytesPerRead = 2147483647,
+                        MaxDepth = 2147483647,
+                        MaxStringContentLength = 2147483647,
+                        MaxNameTableCharCount = 2147483647
+                    }
+                };
 
                 // Commented next statement since it is not required
-                bind.MaxBufferPoolSize = 2147483647;
-                bind.ReaderQuotas.MaxArrayLength = 2147483647;
-                bind.ReaderQuotas.MaxBytesPerRead = 2147483647;
-                bind.ReaderQuotas.MaxDepth = 2147483647;
-                bind.ReaderQuotas.MaxStringContentLength = 2147483647;
-                bind.ReaderQuotas.MaxNameTableCharCount = 2147483647;
 
                 connectionBinding = bind;
             }
 
+            Log.Debug("CreateConnectionBinding: end.");
+
             return connectionBinding;
         }
 
         private void Stop()
         {
+            Log.Debug("Stop: begin.");
+
             _executorManager.Stop();
 
             lock (_hosts)
             {
                 if (_hosts.Count == 0)
+                {
+                    Log.Debug("Stop: end. Host count is 0.");
                     return;
+                }
 
                 try
                 {
@@ -254,15 +344,18 @@ namespace MTApiService
                         host.Close();
                     }
                 }
-                catch (TimeoutException)
+                catch (TimeoutException ex)
                 {
+                    Log.ErrorFormat("Stop: TimeoutException - {0}", ex.Message);
+
                     foreach (var host in _hosts)
                     {
                         host.Abort();
                     }
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    Log.ErrorFormat("Stop: Exception - {0}", ex.Message);
                     // ignored
                 }
                 finally
@@ -272,23 +365,30 @@ namespace MTApiService
             }
 
             FireOnStopped();
+
+            Log.Debug("Stop: end.");
         }
 
         private void expert_Deinited(object sender, EventArgs e)
         {
-            if (sender == null)
+            Log.Debug("expert_Deinited: begin.");
-                return;
 
-            var expert = (MtExpert)sender;
+            var expert = sender as MtExpert;
-            var expertsCount = 0;
+            if (expert == null)
+            {
+                Log.Warn("expert_Deinited: end. Expert is not defined.");
+                return;
+            }
+
+            int expertsCount;
 
             lock (_experts)
             {
                 _experts.Remove(expert);
-                expertsCount = _experts.Count();
+                expertsCount = _experts.Count;
             }
 
-            _executorManager.RemoveCommandExecutor(expert);
+            _executorManager.RemoveExecutor(expert);
 
             expert.Deinited -= expert_Deinited;
             expert.QuoteChanged -= expert_QuoteChanged;
@@ -299,19 +399,29 @@ namespace MTApiService
             {
                 var stopTimer = new System.Timers.Timer();
                 stopTimer.Elapsed += stopTimer_Elapsed;
-                stopTimer.Interval = STOP_EXPERT_INTERVAL;
+                stopTimer.Interval = StopExpertInterval;
                 stopTimer.Start();
             }
+
+            Log.Debug("expert_Deinited: end.");
         }
 
         private void expert_QuoteChanged(MtExpert expert, MtQuote quote)
         {
+            Log.DebugFormat("expert_QuoteChanged: begin. expert = {0}, quote = {1}", expert, quote);
+
             _service.QuoteUpdate(quote);
+
+            Log.Debug("expert_QuoteChanged: end.");
         }
 
-        private void Expert_OnMtEvent(object sender, MtEventArgs e)
+        private void Expert_OnMtEvent(MtExpert expert, MtEvent e)
         {
-            _service.OnMtEvent(e.Event);
+            Log.DebugFormat("Expert_OnMtEvent: begin. expert = {0}, event = {1}", expert, e);
+
+            _service.OnMtEvent(e);
+
+            Log.Debug("Expert_OnMtEvent: end.");
         }
 
         private void FireOnStopped()
@@ -328,16 +438,13 @@ namespace MTApiService
         #region IDispose
         public void Dispose()
         {
+            Log.Debug("Dispose: begin");
+
             Stop();
+
+            Log.Debug("Dispose: end.");
         }
 
         #endregion
-
-        #region Fields              
-        private readonly MtService _service;
-        private readonly List<ServiceHost> _hosts = new List<ServiceHost>();
-        private readonly MtCommandExecutorManager _executorManager = new MtCommandExecutorManager();
-        private readonly List<MtExpert> _experts = new List<MtExpert>();
-        #endregion
     }
 }

MTApiService/MtServerInstance.cs

@@ -1,190 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ServiceModel;
-using System.Net;
-using System.Diagnostics;
-
-namespace MTApiService
-{
-    public class MtServerInstance
-    {
-        #region Init_Instance
-
-        static readonly MtServerInstance mInstance = new MtServerInstance();
-
-        private MtServerInstance()
-        {            
-        }
-        
-        static MtServerInstance() 
-        { 
-        }  
-
-        public static MtServerInstance GetInstance()
-        {
-            return mInstance;
-        }
-
-        #endregion
-
-
-        #region Public Methods
-        public void InitExpert(int expertHandle, int port, string symbol, double bid, double ask, IMetaTraderHandler mtHandler)
-        {
-            Debug.WriteLine("MtApiServerInstance::InitExpert: symbol = {0}, expertHandle = {1}, port = {2}", symbol, expertHandle, port);
-
-            MtServer server = null;
-            lock (mServersDictionary)
-            {
-                if (mServersDictionary.ContainsKey(port))
-                {
-                    server = mServersDictionary[port];
-                }
-                else
-                {
-                    server = new MtServer(port);
-                    server.Stopped += new EventHandler(server_Stopped);
-                    mServersDictionary[port] = server;
-
-                    server.Start();
-                }
-            }
-
-            var expert = new MtExpert(expertHandle, new MtQuote(symbol, bid, ask), mtHandler);
-
-            lock (mExpertsDictionary)
-            {
-                mExpertsDictionary[expert.Handle] = expert;
-            }
-
-            server.AddExpert(expert);
-        }
-
-        public void DeinitExpert(int expertHandle)
-        {
-            Debug.WriteLine("MtApiServerInstance::DeinitExpert: expertHandle = {0}", expertHandle);
-
-            MtExpert expert = null;
-
-            lock (mExpertsDictionary)
-            {
-                if (mExpertsDictionary.ContainsKey(expertHandle) == true)
-                {
-                    expert = mExpertsDictionary[expertHandle];
-                    mExpertsDictionary.Remove(expertHandle);
-                }
-            }
-
-            if (expert != null)
-            {
-                expert.Deinit();
-            }            
-        }
-
-        public void SendQuote(int expertHandle, string symbol, double bid, double ask)
-        {
-            Debug.WriteLine("MtApiServerInstance::SendQuote: enter. symbol = {0}, bid = {1}, ask = {2}", symbol, bid, ask);
-
-            MtExpert expert = null;
-            lock (mExpertsDictionary)
-            {
-                expert = mExpertsDictionary[expertHandle];
-            }
-
-            if (expert != null)
-            {
-                expert.Quote = new MtQuote(symbol, bid, ask);
-            }
-
-            Debug.WriteLine("MtApiServerInstance::SendQuote: finish.");
-        }
-
-        public void SendEvent(int expertHandle, int eventType, string payload)
-        {
-            Debug.WriteLine("MtApiServerInstance::SendEvent called. eventType = {0}, payload = {1}", eventType, payload);
-
-            MtExpert expert = null;
-            lock (mExpertsDictionary)
-            {
-                expert = mExpertsDictionary[expertHandle];
-            }
-
-            if (expert != null)
-            {
-                expert.SendEvent(new MtEvent(eventType, payload));
-            }
-
-            Debug.WriteLine("MtApiServerInstance::SendEvent: finished");
-        }
-
-        public void SendResponse(int expertHandle, MtResponse response)
-        {
-            Debug.WriteLine("MtApiServerInstance::SendResponse: id = {0}, response = {1}", expertHandle, response);
-
-            MtExpert expert = null;
-            lock (mExpertsDictionary)
-            {
-                expert = mExpertsDictionary[expertHandle];
-            }
-
-            if (expert != null)
-            {
-                expert.SendResponse(response);
-            }
-
-            Debug.WriteLine("MtApiServerInstance::SendResponse: finish");
-        }
-
-        public int GetCommandType(int expertHandle)
-        {
-            Debug.WriteLine("MtApiServerInstance::GetCommandType: expertHandle = {0}", expertHandle);
-
-            MtExpert expert = null;
-            lock (mExpertsDictionary)
-            {
-                expert = mExpertsDictionary[expertHandle];
-            }
-
-            return (expert != null) ? expert.GetCommandType() : 0;
-        }
-
-        public object GetCommandParameter(int expertHandle, int index)
-        {
-            Debug.WriteLine("MtApiServerInstance::GetCommandParameter: expertHandle = {0}, index = {1}", expertHandle, index);
-
-            MtExpert expert = null;
-            lock (mExpertsDictionary)
-            {
-                expert = mExpertsDictionary[expertHandle];
-            }
-
-            return (expert != null) ? expert.GetCommandParameter(index) : null;
-        }
-        #endregion
-
-        #region Private Methods
-        private void server_Stopped(object sender, EventArgs e)
-        {
-            MtServer server = (MtServer)sender;
-            server.Stopped -= server_Stopped;
-
-            var port = server.Port;
-            lock (mServersDictionary)
-            {
-                if (mServersDictionary.ContainsKey(port))
-                {
-                    mServersDictionary.Remove(port);
-                }
-            }
-        }
-        #endregion
-
-        #region Fields
-        private readonly MtRegistryManager mConnectionManager = new MtRegistryManager();
-        private readonly Dictionary<int, MtServer> mServersDictionary = new Dictionary<int, MtServer>();
-        private readonly Dictionary<int, MtExpert> mExpertsDictionary = new Dictionary<int, MtExpert>();
-        #endregion
-    }
-}

MTApiService/MtService.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.Threading;
+using log4net;
 
 namespace MTApiService
 {
@@ -18,7 +19,7 @@ namespace MTApiService
         MtResponse SendCommand(MtCommand command);
 
         [OperationContract]
-        IEnumerable<MtQuote> GetQuotes();
+        List<MtQuote> GetQuotes();
     }
 
     [ServiceContract]
@@ -46,107 +47,149 @@ namespace MTApiService
                     InstanceContextMode = InstanceContextMode.Single)]
     public sealed class MtService : IMtApi
     {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(MtService));
+
         public MtService(IMtApiServer serverCallback)
         {
             if (serverCallback == null)
-                throw new ArgumentNullException("serverCallback");
+                throw new ArgumentNullException(nameof(serverCallback));
 
-            mServer = serverCallback;
+            _server = serverCallback;
         }
 
         #region IMtApi
         public bool Connect()
         {
-            bool connected = false;
+            Log.Debug("Connect: begin");
 
-            IMtApiCallback callback = OperationContext.Current.GetCallbackChannel<IMtApiCallback>();
+            var callback = OperationContext.Current.GetCallbackChannel<IMtApiCallback>();
 
-            if (callback != null)
+            if (callback == null)
             {
+                Log.Warn("Connect: end. Callback is not defined.");
+                return false;
+            }
+
+            var connected = false;
+
+            try
+            {
+                _clientsLocker.AcquireWriterLock(10000);
+
                 try
                 {
-                    mClientsLocker.AcquireWriterLock(10000);
+                    if (_clientCallbacks.Contains(callback) == false)
+                        _clientCallbacks.Add(callback);
 
-                    try
+                    connected = true;
-                    {
-                        if (mClientCallbacks.Contains(callback) == false)
-                            mClientCallbacks.Add(callback);
-
-                        connected = true;
-                    }
-                    finally
-                    {
-                        mClientsLocker.ReleaseWriterLock();
-                    }
                 }
-                catch (ApplicationException)
+                finally
                 {
+                    _clientsLocker.ReleaseWriterLock();
                 }
             }
+            catch (ApplicationException ex)
+            {
+                Log.ErrorFormat("Connect: ApplicationException - {0}", ex.Message);
+            }
+
+            Log.DebugFormat("Connect: end. connected = {0}", connected);
 
             return connected;
         }
 
         public void Disconnect()
         {
-            IMtApiCallback callback = OperationContext.Current.GetCallbackChannel<IMtApiCallback>();
+            Log.Debug("Disconnect: begin");
 
-            if (callback != null)
+            var callback = OperationContext.Current.GetCallbackChannel<IMtApiCallback>();
+
+            if (callback == null)
             {
+                Log.Warn("Disconnect: end. Callback is not definded.");
+                return;
+            }
+
+            try
+            {
+                _clientsLocker.AcquireWriterLock(10000);
+
                 try
                 {
-                    mClientsLocker.AcquireWriterLock(10000);
+                    _clientCallbacks.Remove(callback);
-
-                    try
-                    {
-                        mClientCallbacks.Remove(callback);
-                    }
-                    finally
-                    {
-                        mClientsLocker.ReleaseWriterLock();
-                    }
                 }
-                catch (ApplicationException)
+                finally
                 {
+                    _clientsLocker.ReleaseWriterLock();
                 }
             }
+            catch (ApplicationException ex)
+            {
+                Log.ErrorFormat("Disconnect: ApplicationException - {0}", ex.Message);
+            }
+
+            Log.Debug("Disconnect: end.");
         }
 
         public MtResponse SendCommand(MtCommand command)
         {
-            return mServer.SendCommand(command);
+            Log.DebugFormat("SendCommand: called. command = {0}", command);
+
+            return _server.SendCommand(command);
         }
 
-        public IEnumerable<MtQuote> GetQuotes()
+        public List<MtQuote> GetQuotes()
         {
-            return mServer.GetQuotes();
+            Log.Debug("GetQuotes: called.");
+
+            return _server.GetQuotes();
         }
         #endregion
 
         #region Public Methods
         public void OnStopServer()
         {
+            Log.Debug("OnStopServer: begin.");
+
             ExecuteCallbackAction(a => a.OnServerStopped());
+
+            Log.Debug("OnStopServer: end.");
         }
 
         public void QuoteUpdate(MtQuote quote)
         {
+            Log.DebugFormat("QuoteUpdate: begin. quote = {0}", quote);
+
             ExecuteCallbackAction(a => a.OnQuoteUpdate(quote));
+
+            Log.Debug("QuoteUpdate: end.");
         }
 
         public void OnQuoteAdded(MtQuote quote)
         {
+            Log.DebugFormat("OnQuoteAdded: begin. quote = {0}", quote);
+
             ExecuteCallbackAction(a => a.OnQuoteAdded(quote));
+
+            Log.Debug("OnQuoteAdded: end.");
         }
 
         public void OnQuoteRemoved(MtQuote quote)
         {
+            Log.DebugFormat("OnQuoteRemoved: begin. quote = {0}", quote);
+
             ExecuteCallbackAction(a => a.OnQuoteRemoved(quote));
+
+            Log.Debug("OnQuoteRemoved: end.");
         }
 
-        public void OnMtEvent(MtEvent mtEvent)
+        public void OnMtEvent(MtEvent e)
         {
-            ExecuteCallbackAction(a => a.OnMtEvent(mtEvent));
+            Log.DebugFormat("OnMtEvent: begin.quote = {0}", e);
+
+            ExecuteCallbackAction(a => a.OnMtEvent(e));
+
+            Log.Debug("OnMtEvent: end.");
         }
         #endregion
 
@@ -154,22 +197,26 @@ namespace MTApiService
 
         private void ExecuteCallbackAction(Action<IMtApiCallback> action)
         {
+            Log.Debug("ExecuteCallbackAction: begin.");
+
             try
             {
-                mClientsLocker.AcquireReaderLock(2000);
+                _clientsLocker.AcquireReaderLock(2000);
 
                 List<IMtApiCallback> crashedClientCallbacks = null;
 
                 try
                 {
-                    foreach (var callback in mClientCallbacks)
+                    foreach (var callback in _clientCallbacks)
                     {
                         try
                         {
                             action(callback);
                         }
-                        catch (Exception)
+                        catch (Exception ex)
                         {
+                            Log.ErrorFormat("ExecuteCallbackAction: Exception - {0}", ex.Message);
+
                             if (crashedClientCallbacks == null)
                                 crashedClientCallbacks = new List<IMtApiCallback>();
 
@@ -179,29 +226,33 @@ namespace MTApiService
 
                     if (crashedClientCallbacks != null)
                     {
+                        Log.WarnFormat("ExecuteCallbackAction: crashed callback count = {0}", crashedClientCallbacks.Count);
+
                         foreach (var crashedCallback in crashedClientCallbacks)
                         {
-                            mClientCallbacks.Remove(crashedCallback);
+                            _clientCallbacks.Remove(crashedCallback);
                         }
                     }
                 }
                 finally
                 {
-                    mClientsLocker.ReleaseReaderLock();
+                    _clientsLocker.ReleaseReaderLock();
                 }
             }
-            catch (ApplicationException)
+            catch (ApplicationException ex)
             {
-                //TODO: add logging
+                Log.ErrorFormat("ExecuteCallbackAction: ApplicationException - {0}", ex.Message);
             }
+
+            Log.Debug("ExecuteCallbackAction: end.");
         }
 
         #endregion
 
         #region Fields
-        private readonly IMtApiServer mServer;
+        private readonly IMtApiServer _server;
-        private readonly List<IMtApiCallback> mClientCallbacks = new List<IMtApiCallback>();
+        private readonly List<IMtApiCallback> _clientCallbacks = new List<IMtApiCallback>();
-        private readonly ReaderWriterLock mClientsLocker = new ReaderWriterLock();
+        private readonly ReaderWriterLock _clientsLocker = new ReaderWriterLock();
         #endregion
     }
 }

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.21.0")]
+[assembly: AssemblyVersion("1.0.27.0")]
-[assembly: AssemblyFileVersion("1.0.21.0")]
+[assembly: AssemblyFileVersion("1.0.27.0")]

MTApiService/packages.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ILMerge" version="2.13.0307" targetFramework="net40" />
+  <package id="log4net" version="2.0.5" targetFramework="net40" />
+  <package id="MSBuild.ILMerge.Task" version="1.0.5" targetFramework="net40" />
+</packages>

MTConnector/MT4Handler.h

@@ -11,13 +11,11 @@ ref class MT4Handler: IMetaTraderHandler
 public:
     MT4Handler()
     {
-        //msgId = RegisterWindowMessage("MetaTrader4_Internal_Message");
         msgId = WM_TIMER;
     }
 
     virtual void SendTickToMetaTrader(int handle)
     {
-        //PostMessage((HWND)handle, msgId, 2, 1);
         PostMessage((HWND)handle, msgId, 0, 0);
     }
 

MTConnector/MTConnector.cpp

@@ -4,7 +4,8 @@
 
 #include "MT4Handler.h"
 #include "Windows.h"
-#include < vcclr.h >
+#include <vcclr.h>
+#include <functional>
 
 using namespace System;
 using namespace MTApiService;
@@ -17,242 +18,250 @@ using namespace System::IO;
 using namespace  System::Collections::Generic;
 using namespace System::Diagnostics;
 
+#define _DLLAPI extern "C" __declspec(dllexport)
+
 void convertSystemString(wchar_t* dest, String^ src)
 {
-	pin_ptr<const wchar_t> wch = PtrToStringChars(src);
+    pin_ptr<const wchar_t> wch = PtrToStringChars(src);
-	memcpy(dest, wch, wcslen(wch) * sizeof(wchar_t));
+    memcpy(dest, wch, wcslen(wch) * sizeof(wchar_t));
-	dest[wcslen(wch)] = '\0';
+    dest[wcslen(wch)] = '\0';
 }
 
-int _stdcall initExpert(int expertHandle, int port, wchar_t* symbol, double bid, double ask, wchar_t* err)
+template <typename T> T Execute(std::function<T()> func, wchar_t* err, T default_value)
-{
-	try
-	{
-		MT4Handler^ mtHandler = gcnew MT4Handler();
-
-		MtServerInstance::GetInstance()->InitExpert(expertHandle, port, gcnew String(symbol), bid, ask, mtHandler);
-	}
-	catch (Exception^ e)
-	{
-		convertSystemString(err, e->Message);
-		Debug::WriteLine("[ERROR] MTConnector:initExpert(): " + e->Message);
-		return 0;
-	}
-	return 1;
-}
-
-int _stdcall deinitExpert(int expertHandle, wchar_t* err)
-{
-	try
-	{
-		MtServerInstance::GetInstance()->DeinitExpert(expertHandle);
-	}	
-	catch (Exception^ e)
-	{
-		convertSystemString(err, e->Message);
-		Debug::WriteLine("[ERROR] MTConnector:deinitExpert(): " + e->Message);
-		return 0;
-	}
-	return 1;
-}
-
-int _stdcall updateQuote(int expertHandle, wchar_t* symbol, double bid, double ask, wchar_t* err)
-{
-	try
-	{
-		MtServerInstance::GetInstance()->SendQuote(expertHandle, gcnew String(symbol), bid, ask);
-	}
-	catch (Exception^ e)
-	{
-		convertSystemString(err, e->Message);
-		Debug::WriteLine("[ERROR] MTConnector:updateQuote(): " + e->Message);
-		return 0;
-	}
-	return 1;
-}
-
-
-int _stdcall sendEvent(int expertHandle, int eventType, wchar_t* payload, wchar_t* err)
 {
+    T result = default_value;
     try
     {
-        MtServerInstance::GetInstance()->SendEvent(expertHandle, eventType, gcnew String(payload));
+        result = func();
     }
     catch (Exception^ e)
     {
         convertSystemString(err, e->Message);
-        Debug::WriteLine("[ERROR] MTConnector:updateTimeBar(): " + e->Message);
-        return 0;
     }
-    return 1;
+    return result;
 }
 
-int _stdcall sendIntResponse(int expertHandle, int response)
+_DLLAPI bool _stdcall initExpert(int expertHandle, int port, wchar_t* symbol, double bid, double ask, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, &port, symbol, &bid, &ask]() {
-	{
+        MT4Handler^ mtHandler = gcnew MT4Handler();
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseInt(response));
+        MtAdapter::GetInstance()->InitExpert(expertHandle, port, gcnew String(symbol), bid, ask, mtHandler);
-	}
+        return true;
-	catch (Exception^ e)
+    }, err, false);
-	{
+
-		Debug::WriteLine("[ERROR] MTConnector:sendIntResponse(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall sendBooleanResponse(int expertHandle, int response)
+_DLLAPI bool _stdcall deinitExpert(int expertHandle, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle]() {
-	{
+        MtAdapter::GetInstance()->DeinitExpert(expertHandle);
-		bool value = (response != 0) ? true : false;
+        return true;
-
+    }, err, false);
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseBool(value));
-	}
-	catch (Exception^ e)
-	{
-		Debug::WriteLine("[ERROR] MTConnector:sendBooleanResponse(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall sendDoubleResponse(int expertHandle, double response)
+_DLLAPI bool _stdcall updateQuote(int expertHandle, wchar_t* symbol, double bid, double ask, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, symbol, &bid, &ask]() {
-	{
+        MtAdapter::GetInstance()->SendQuote(expertHandle, gcnew String(symbol), bid, ask);
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDouble(response));
+        return true;
-	}
+    }, err, false);
-	catch (Exception^ e)
-	{
-		Debug::WriteLine("[ERROR] MTConnector:sendDoubleResponse(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall sendStringResponse(int expertHandle, wchar_t* response)
+
+_DLLAPI bool _stdcall sendEvent(int expertHandle, int eventType, wchar_t* payload, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, &eventType, payload]() {
-	{
+        MtAdapter::GetInstance()->SendEvent(expertHandle, eventType, gcnew String(payload));
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseString(gcnew String(response)));
+        return true;
-	}
+    }, err, false);
-	catch (Exception^ e)
-	{
-		Debug::WriteLine("[ERROR] MTConnector:sendStringResponse(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall sendVoidResponse(int expertHandle)
+_DLLAPI bool _stdcall sendIntResponse(int expertHandle, int response, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, &response]() {
-	{		
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseInt(response));
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, nullptr);
+        return true;
-	}
+    }, err, false);
-	catch (Exception^ e)
-	{
-		Debug::WriteLine("[ERROR] MTConnector:sendVoidResponse(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall sendDoubleArrayResponse(int expertHandle, double* values, int size)
+_DLLAPI bool _stdcall sendBooleanResponse(int expertHandle, bool response, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, &response]() {
-	{
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseBool(response));
-		array<double>^ list = gcnew array<double>(size);
+        return true;
-
+    }, err, false);
-		for(int i = 0; i < size; i++)
-		{
-			list[i] = values[i];
-		}
-
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDoubleArray(list));
-	}
-	catch (Exception^ e)
-	{
-		Debug::WriteLine("[ERROR] MTConnector:sendDoubleArrayResponse(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall sendIntArrayResponse(int expertHandle, int* values, int size)
+_DLLAPI bool _stdcall sendDoubleResponse(int expertHandle, double response, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, &response]() {
-	{
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDouble(response));
-		array<int>^ list = gcnew array<int>(size);
+        return true;
-
+    }, err, false);
-		for(int i = 0; i < size; i++)
-		{
-			list[i] = values[i];
-		}
-
-		MtServerInstance::GetInstance()->SendResponse(expertHandle, gcnew MtResponseIntArray(list));
-	}
-	catch (Exception^ e)
-	{
-		Debug::WriteLine("[ERROR] MTConnector:sendIntArrayResponse(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall getCommandType(int expertHandle, int* res)
+_DLLAPI bool _stdcall sendStringResponse(int expertHandle, wchar_t* response, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, response]() {
-	{
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseString(gcnew String(response)));
-		*res = MtServerInstance::GetInstance()->GetCommandType(expertHandle);
+        return true;
-	}
+    }, err, false);
-	catch (Exception^ e)
-	{
-		Debug::WriteLine("[ERROR] MTConnector:getCommandType(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall getIntValue(int expertHandle, int paramIndex, int* res)
+_DLLAPI bool _stdcall sendErrorResponse(int expertHandle, int code, wchar_t* message, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, &code, message]() {
-	{
+        MtResponseString^ res = gcnew MtResponseString(gcnew String(message));
-		*res = (int)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        res->ErrorCode = code;
-	}
+        MtAdapter::GetInstance()->SendResponse(expertHandle, res);
-	catch (Exception^ e)
+        return true;
-	{
+    }, err, false);
-		Debug::WriteLine("[ERROR] MTConnector:getIntValue(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall getDoubleValue(int expertHandle, int paramIndex, double* res)
+_DLLAPI bool _stdcall sendVoidResponse(int expertHandle, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle]() {
-	{
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseObject(nullptr));
-		*res = (double)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        return true;
-	}
+    }, err, false);
-	catch (Exception^ e)
-	{
-		Debug::WriteLine("[ERROR] MTConnector:getDoubleValue(): " + e->Message);
-		return 0;
-	}
-	return 1;
 }
 
-int _stdcall getStringValue(int expertHandle, int paramIndex, wchar_t* res)
+_DLLAPI bool _stdcall sendDoubleArrayResponse(int expertHandle, double* values, int size, wchar_t* err)
 {
-	try
+    return Execute<bool>([&expertHandle, values, &size]() {
-	{
+        array<double>^ list = gcnew array<double>(size);
-		convertSystemString(res, (String^)MtServerInstance::GetInstance()->GetCommandParameter(expertHandle, paramIndex));
+        for (int i = 0; i < size; i++)
-	}
+        {
-	catch (Exception^ e)
+            list[i] = values[i];
-	{
+        }
-		Debug::WriteLine("[ERROR] MTConnector:getStringValue(): " + e->Message);
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseDoubleArray(list));
-		return 0;
+        return true;
-	}
+    }, err, false);
-	return 1;
+}
+
+_DLLAPI bool _stdcall sendIntArrayResponse(int expertHandle, int* values, int size, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, values, &size]() {
+        array<int>^ list = gcnew array<int>(size);
+        for (int i = 0; i < size; i++)
+        {
+            list[i] = values[i];
+        }
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseIntArray(list));
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall sendLongResponse(int expertHandle, __int64 response, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, &response]() {
+        MtAdapter::GetInstance()->SendResponse(expertHandle, gcnew MtResponseLong(response));
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getCommandType(int expertHandle, int* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, res]() {
+        *res = MtAdapter::GetInstance()->GetCommandType(expertHandle);
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getIntValue(int expertHandle, int paramIndex, int* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, &paramIndex, res]() {
+        *res = (int)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        return true;
+    }, err, false);
+}
+
+// --- index parameters
+
+_DLLAPI bool _stdcall getDoubleValue(int expertHandle, int paramIndex, double* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, &paramIndex, res]() {
+        *res = (double)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getStringValue(int expertHandle, int paramIndex, wchar_t* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, &paramIndex, res]() {
+        convertSystemString(res, (String^)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex));
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getBooleanValue(int expertHandle, int paramIndex, int* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, &paramIndex, res]() {
+        *res = (bool)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getLongValue(int expertHandle, int paramIndex, __int64* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, &paramIndex, res]() {
+        *res = (__int64)MtAdapter::GetInstance()->GetCommandParameter(expertHandle, paramIndex);
+        return true;
+    }, err, false);
+}
+
+// --- named parameters
+
+_DLLAPI bool _stdcall containsNamedValue(int expertHandle, wchar_t* paramName)
+{
+    wchar_t err[1000];
+    return Execute<bool>([&expertHandle, paramName]() {
+        return MtAdapter::GetInstance()->ContainsNamedParameter(expertHandle, gcnew String(paramName));
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getNamedIntValue(int expertHandle, wchar_t* paramName, int* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, paramName, res]() {
+        System::Object^ obj = MtAdapter::GetInstance()->GetNamedParameter(expertHandle, gcnew String(paramName));
+        *res = (int)obj;
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getNamedDoubleValue(int expertHandle, wchar_t* paramName, double* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, paramName, res]() {
+        System::Object^ obj = MtAdapter::GetInstance()->GetNamedParameter(expertHandle, gcnew String(paramName));
+        *res = (double)obj;
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getNamedStringValue(int expertHandle, wchar_t* paramName, wchar_t* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, paramName, res]() {
+        System::Object^ obj = MtAdapter::GetInstance()->GetNamedParameter(expertHandle, gcnew String(paramName));
+        convertSystemString(res, (String^)obj);
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getNamedBooleanValue(int expertHandle, wchar_t* paramName, int* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, paramName, res]() {
+        System::Object^ obj = MtAdapter::GetInstance()->GetNamedParameter(expertHandle, gcnew String(paramName));
+        *res = (bool)obj;
+        return true;
+    }, err, false);
+}
+
+_DLLAPI bool _stdcall getNamedLongValue(int expertHandle, wchar_t* paramName, __int64* res, wchar_t* err)
+{
+    return Execute<bool>([&expertHandle, paramName, res]() {
+        System::Object^ obj = MtAdapter::GetInstance()->GetNamedParameter(expertHandle, gcnew String(paramName));
+        if (obj != nullptr)
+            *res = (__int64)obj;
+        return true;
+    }, err, false);
 }

MTConnector/MTConnector.def

@@ -1,17 +0,0 @@
-LIBRARY MTConnector
-
-EXPORTS initExpert
-        deinitExpert
-        updateQuote
-		sendEvent
-		sendIntResponse
-		sendBooleanResponse
-		sendDoubleResponse
-		sendStringResponse
-		sendVoidResponse
-		sendDoubleArrayResponse
-		sendIntArrayResponse
-		getCommandType
-		getIntValue
-		getDoubleValue
-		getStringValue

MTConnector/MTConnector.vcxproj

@@ -96,7 +96,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\MTConnector.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -109,7 +108,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\MTConnector.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -121,7 +119,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\MTConnector.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -133,7 +130,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\MTConnector.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -154,7 +150,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.ico" />
-    <None Include="MTConnector.def" />
     <None Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>

MTConnector/MTConnector.vcxproj.filters

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

MetaTraderApi_2015.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApiClientUI", "TestClients\TestApiClientUI\TestApiClientUI.csproj", "{663CC515-EAAE-47D4-8933-5008C2DA1160}"
 EndProject
@@ -37,6 +37,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MtApiSetupActions", "MtApiS
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestClients", "TestClients", "{B91FF338-E05D-4EF1-948B-A2376DB37ECA}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MtApi5Bootstrapper", "MtApi5Bootstrapper\MtApi5Bootstrapper.wixproj", "{1497E285-C228-490B-9638-565E118548FB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A9ED070F-AB4D-4380-9DDE-5D931AC71333} = {A9ED070F-AB4D-4380-9DDE-5D931AC71333}
+	EndProjectSection
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MtApiBootstrapper", "MtApiBootstrapper\MtApiBootstrapper.wixproj", "{8E63046B-56E5-4623-8808-558AD72A8F2B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{78B94552-DB17-40EC-B7C6-23D32DB85DC1} = {78B94552-DB17-40EC-B7C6-23D32DB85DC1}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -196,6 +206,32 @@ Global
 		{10800F37-F71B-4818-8351-8CF744295F80}.Release|x64.ActiveCfg = Release|x86
 		{10800F37-F71B-4818-8351-8CF744295F80}.Release|x86.ActiveCfg = Release|x86
 		{10800F37-F71B-4818-8351-8CF744295F80}.Release|x86.Build.0 = Release|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Debug|Win32.ActiveCfg = Debug|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Debug|Win32.Build.0 = Debug|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Debug|x64.ActiveCfg = Debug|x64
+		{1497E285-C228-490B-9638-565E118548FB}.Debug|x64.Build.0 = Debug|x64
+		{1497E285-C228-490B-9638-565E118548FB}.Debug|x64.Deploy.0 = Debug|x64
+		{1497E285-C228-490B-9638-565E118548FB}.Debug|x86.ActiveCfg = Debug|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Debug|x86.Build.0 = Debug|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Release|Any CPU.ActiveCfg = Release|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Release|Win32.ActiveCfg = Release|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Release|Win32.Build.0 = Release|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Release|x64.ActiveCfg = Release|x64
+		{1497E285-C228-490B-9638-565E118548FB}.Release|x86.ActiveCfg = Release|x86
+		{1497E285-C228-490B-9638-565E118548FB}.Release|x86.Build.0 = Release|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Debug|Win32.ActiveCfg = Debug|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Debug|Win32.Build.0 = Debug|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Debug|x64.ActiveCfg = Debug|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Debug|x86.ActiveCfg = Debug|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Debug|x86.Build.0 = Debug|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|Any CPU.ActiveCfg = Release|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|Win32.ActiveCfg = Release|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|Win32.Build.0 = Release|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|x64.ActiveCfg = Release|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|x86.ActiveCfg = Release|x86
+		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MtApi/EnumAlignMode.cs

@@ -0,0 +1,9 @@
+namespace MtApi
+{
+    public enum EnumAlignMode
+    {
+        ALIGN_LEFT      = 1,
+        ALIGN_CENTER    = 2,
+        ALIGN_RIGHT     = 0
+    }
+}

MtApi/EnumChartPropertyDouble.cs

@@ -0,0 +1,13 @@
+namespace MtApi
+{
+    public enum EnumChartPropertyDouble
+    {
+        CHART_SHIFT_SIZE        = 3,
+        CHART_FIXED_POSITION    = 41,
+        CHART_FIXED_MAX         = 8,
+        CHART_FIXED_MIN         = 9,
+        CHART_POINTS_PER_BAR    = 11,
+        CHART_PRICE_MIN         = 108,
+        CHART_PRICE_MAX         = 109
+    }
+}

MtApi/EnumChartPropertyInteger.cs

@@ -0,0 +1,55 @@
+namespace MtApi
+{
+    public enum EnumChartPropertyInteger
+    {
+        CHART_BRING_TO_TOP          = 35,
+        CHART_MOUSE_SCROLL          = 42,
+        CHART_EVENT_MOUSE_MOVE      = 40,
+        CHART_EVENT_OBJECT_CREATE   = 38,
+        CHART_EVENT_OBJECT_DELETE   = 39,
+        CHART_MODE                  = 0,
+        CHART_FOREGROUND            = 1,
+        CHART_SHIFT                 = 2,
+        CHART_AUTOSCROLL            = 4,
+        CHART_QUICK_NAVIGATION      = 45,
+        CHART_SCALE                 = 5,
+        CHART_SCALEFIX              = 6,
+        CHART_SCALEFIX_11           = 7,
+        CHART_SCALE_PT_PER_BAR      = 10,
+        CHART_SHOW_OHLC             = 12,
+        CHART_SHOW_BID_LINE         = 13,
+        CHART_SHOW_ASK_LINE         = 14,
+        CHART_SHOW_LAST_LINE        = 15,
+        CHART_SHOW_PERIOD_SEP       = 16,
+        CHART_SHOW_GRID             = 17,
+        CHART_SHOW_VOLUMES          = 18,
+        CHART_SHOW_OBJECT_DESCR     = 19,
+        CHART_VISIBLE_BARS          = 100,
+        CHART_WINDOWS_TOTAL         = 101,
+        CHART_WINDOW_IS_VISIBLE     = 102,
+        CHART_WINDOW_HANDLE         = 103,
+        CHART_WINDOW_YDISTANCE      = 110,
+        CHART_FIRST_VISIBLE_BAR     = 104,
+        CHART_WIDTH_IN_BARS         = 105,
+        CHART_WIDTH_IN_PIXELS       = 106,
+        CHART_HEIGHT_IN_PIXELS      = 107,
+        CHART_COLOR_BACKGROUND      = 21,
+        CHART_COLOR_FOREGROUND      = 22,
+        CHART_COLOR_GRID            = 23,
+        CHART_COLOR_VOLUME          = 24,
+        CHART_COLOR_CHART_UP        = 25,
+        CHART_COLOR_CHART_DOWN      = 26,
+        CHART_COLOR_CHART_LINE      = 27,
+        CHART_COLOR_CANDLE_BULL     = 28,
+        CHART_COLOR_CANDLE_BEAR     = 29,
+        CHART_COLOR_BID             = 30,
+        CHART_COLOR_ASK             = 31,
+        CHART_COLOR_LAST            = 32,
+        CHART_COLOR_STOP_LEVEL      = 33,
+        CHART_SHOW_TRADE_LEVELS     = 34,
+        CHART_DRAG_TRADE_LEVELS     = 43,
+        CHART_SHOW_DATE_SCALE       = 36,
+        CHART_SHOW_PRICE_SCALE      = 37,
+        CHART_IS_OFFLINE            = 112
+    }
+}

MtApi/EnumChartPropertyString.cs

@@ -0,0 +1,7 @@
+namespace MtApi
+{
+    public enum EnumChartPropertyString
+    {
+        CHART_COMMENT = 20
+    }
+}

MtApi/EnumColorFormat.cs

@@ -0,0 +1,9 @@
+namespace MtApi
+{
+    enum EnumColorFormat
+    {
+        COLOR_FORMAT_XRGB_NOALPHA       = 0, //The component of the alpha channel is ignored
+        COLOR_FORMAT_ARGB_RAW           = 1, //Color components are not handled by the terminal (must be correctly set by the user)
+        COLOR_FORMAT_ARGB_NORMALIZE     = 2  //Color components are handled by the terminal
+    }
+}

MtApi/EnumObject.cs

@@ -0,0 +1,46 @@
+namespace MtApi
+{
+    public enum EnumObject
+    {
+        OBJ_VLINE               = 0, //Vertical Line
+        OBJ_HLINE               = 1, //Horizontal Line
+        OBJ_TREND               = 2, //Trend Line
+        BJ_TRENDBYANGLE         = 3, //Trend Line By Angle
+        OBJ_CYCLES              = 20, //Cycle Lines
+        OBJ_CHANNEL             = 5, //Equidistant Channel
+        OBJ_STDDEVCHANNEL       = 6, //Standard Deviation Channel
+        OBJ_REGRESSION          = 4, //Linear Regression Channel
+        OBJ_PITCHFORK           = 19, //Andrews’ Pitchfork
+        OBJ_GANNLINE            = 7, //Gann Line
+        OBJ_GANNFAN             = 8, //Gann Fan
+        OBJ_GANNGRID            = 9, //Gann Grid
+        OBJ_FIBO                = 10, //Fibonacci Retracement
+        OBJ_FIBOTIMES           = 11, //Fibonacci Time Zones
+        OBJ_FIBOFAN             = 12, //Fibonacci Fan
+        OBJ_FIBOARC             = 13, //Fibonacci Arcs
+        OBJ_FIBOCHANNEL         = 15, //Fibonacci Channel
+        OBJ_EXPANSION           = 14, //Fibonacci Expansion
+        OBJ_RECTANGLE           = 16, //Rectangle
+        OBJ_TRIANGLE            = 17, //Triangle
+        OBJ_ELLIPSE             = 18, //Ellipse
+        OBJ_ARROW_THUMB_UP      = 29, //Thumbs Up
+        OBJ_ARROW_THUMB_DOWN    = 30, //Thumbs Down
+        OBJ_ARROW_UP            = 31, //Arrow Up
+        OBJ_ARROW_DOWN          = 32, //Arrow Down
+        OBJ_ARROW_STOP          = 33, //Stop Sign
+        OBJ_ARROW_CHECK         = 34, //Check Sign
+        OBJ_ARROW_LEFT_PRICE    = 35, //Left Price Label
+        OBJ_ARROW_RIGHT_PRICE   = 36, //Right Price Label
+        OBJ_ARROW_BUY           = 37, //Buy Sign
+        OBJ_ARROW_SELL          = 38, //Sell Sign
+        OBJ_ARROW               = 22, //Arrow
+        OBJ_TEXT                = 21, //Text
+        OBJ_LABEL               = 23, //Label
+        OBJ_BUTTON              = 25, //Button
+        OBJ_BITMAP              = 26, //Bitmap
+        OBJ_BITMAP_LABEL        = 24, //Bitmap Label
+        OBJ_EDIT                = 27, //Edit
+        OBJ_EVENT               = 42, //The "Event" object corresponding to an event in the economic calendar
+        OBJ_RECTANGLE_LABEL     = 28 //The "Rectangle label" object for creating and designing the custom graphical interface.
+    }
+}

MtApi/EnumObjectPropertyDouble.cs

@@ -0,0 +1,11 @@
+namespace MtApi
+{
+    public enum EnumObjectPropertyDouble
+    {
+        OBJPROP_PRICE       = 20, // Price coordinate
+        OBJPROP_LEVELVALUE  = 204, // Level value
+        OBJPROP_SCALE       = 12, // Scale (properties of Gann objects, Fibonacci Arcs and Ellipse)
+        OBJPROP_ANGLE       = 13, // Angle.  For the objects with no angle specified, created from a program, the value is equal to EMPTY_VALUE
+        OBJPROP_DEVIATION   = 16, // Deviation for the Standard Deviation Channel
+    }
+}

MtApi/EnumObjectPropertyInteger.cs

@@ -0,0 +1,40 @@
+namespace MtApi
+{
+    public enum EnumObjectPropertyInteger
+    {
+        OBJPROP_COLOR           = 6,
+        OBJPROP_STYLE           = 7,
+        OBJPROP_WIDTH           = 8,
+        OBJPROP_BACK            = 9,
+        OBJPROP_ZORDER          = 207,
+        OBJPROP_HIDDEN          = 208,
+        OBJPROP_SELECTED        = 17,
+        OBJPROP_READONLY        = 1028,
+        OBJPROP_TYPE            = 18,
+        OBJPROP_TIME            = 19,
+        OBJPROP_SELECTABLE      = 1000,
+        OBJPROP_CREATETIME      = 998,
+        OBJPROP_LEVELS          = 200,
+        OBJPROP_LEVELCOLOR      = 201,
+        OBJPROP_LEVELSTYLE      = 202,
+        OBJPROP_LEVELWIDTH      = 203,
+        OBJPROP_ALIGN           = 1036,
+        OBJPROP_FONTSIZE        = 100,
+        OBJPROP_RAY_RIGHT       = 1004,
+        OBJPROP_ELLIPSE         = 11,
+        OBJPROP_ARROWCODE       = 14,
+        OBJPROP_TIMEFRAMES      = 15,
+        OBJPROP_ANCHOR          = 1011,
+        OBJPROP_XDISTANCE       = 102,
+        OBJPROP_YDISTANCE       = 103,
+        OBJPROP_STATE           = 1018,
+        OBJPROP_XSIZE           = 1019,
+        OBJPROP_YSIZE           = 1020,
+        OBJPROP_XOFFSET         = 1033,
+        OBJPROP_YOFFSET         = 1034,
+        OBJPROP_BGCOLOR         = 1025,
+        OBJPROP_CORNER          = 101,
+        OBJPROP_BORDER_TYPE     = 1029,
+        OBJPROP_BORDER_COLOR    = 1035
+    }
+}

MtApi/EnumObjectPropertyString.cs

@@ -0,0 +1,13 @@
+namespace MtApi
+{
+    public enum EnumObjectPropertyString
+    {
+        OBJPROP_NAME        = 1037,
+        OBJPROP_TEXT        = 999,
+        OBJPROP_TOOLTIP     = 206,
+        OBJPROP_LEVELTEXT   = 205,
+        OBJPROP_FONT        = 1001,
+        OBJPROP_BMPFILE     = 1017,
+        OBJPROP_SYMBOL      = 1021
+    }
+}

MtApi/EnumSeriesInfoInteger.cs

@@ -0,0 +1,10 @@
+namespace MtApi
+{
+    public enum EnumSeriesInfoInteger
+    {
+        SERIES_BARS_COUNT           = 0,
+        SERIES_FIRSTDATE            = 1,
+        SERIES_LASTBAR_DATE         = 5,
+        SERIES_SERVER_FIRSTDATE     = 2
+    }
+}

MtApi/EnumSymbolInfoDouble.cs

@@ -0,0 +1,46 @@
+namespace MtApi
+{
+    // https://docs.mql4.com/constants/environment_state/marketinfoconstants#enum_symbol_info_double
+    public enum EnumSymbolInfoDouble
+    {
+        SYMBOL_BID                          = 1, // Bid - best sell offer
+        SYMBOL_BIDHIGH                      = 2, // Not supported
+        SYMBOL_BIDLOW                       = 3, // Not supported
+        SYMBOL_ASK                          = 4, // Ask - best buy offer
+        SYMBOL_ASKHIGH                      = 5, // Not supported
+        SYMBOL_ASKLOW                       = 6, // Not supported
+        SYMBOL_LAST                         = 7, // Not supported
+        SYMBOL_LASTHIGH                     = 8, // Not supported
+        SYMBOL_LASTLOW                      = 9, // Not supported
+        SYMBOL_POINT                        = 16, // Symbol point value
+        SYMBOL_TRADE_TICK_VALUE             = 26, // Value of SYMBOL_TRADE_TICK_VALUE_PROFIT
+        SYMBOL_TRADE_TICK_VALUE_PROFIT      = 53, // Not supported
+        SYMBOL_TRADE_TICK_VALUE_LOSS        = 54, // Not supported
+        SYMBOL_TRADE_TICK_SIZE              = 27, // Minimal price change
+        SYMBOL_TRADE_CONTRACT_SIZE          = 28, // Trade contract size
+        SYMBOL_VOLUME_MIN                   = 34, // Minimal volume for a deal
+        SYMBOL_VOLUME_MAX                   = 35, // Maximal volume for a deal
+        SYMBOL_VOLUME_STEP                  = 36, // Minimal volume change step for deal execution
+        SYMBOL_VOLUME_LIMIT                 = 55, // Not supported
+        SYMBOL_SWAP_LONG                    = 38, // Buy order swap value
+        SYMBOL_SWAP_SHORT                   = 39, // Sell order swap value
+        SYMBOL_MARGIN_INITIAL               = 42, // Initial margin means the amount in the margin currency required for opening an order with the volume of one lot. It is used for checking a client's assets when he or she enters the market.
+        SYMBOL_MARGIN_MAINTENANCE           = 43, // The maintenance margin. If it is set, it sets the margin amount in the margin currency of the symbol, charged from one lot. It is used for checking a client's assets when his/her account state changes. If the maintenance margin is equal to 0, the initial margin is used.
+        SYMBOL_MARGIN_LONG                  = 44, // Not supported
+        SYMBOL_MARGIN_SHORT                 = 45, // Not supported
+        SYMBOL_MARGIN_LIMIT                 = 46, // Not supported
+        SYMBOL_MARGIN_STOP                  = 47, // Not supported
+        SYMBOL_MARGIN_STOPLIMIT             = 48, // Not supported
+        SYMBOL_SESSION_VOLUME               = 57, // Not supported
+        SYMBOL_SESSION_TURNOVER             = 58, // Not supported
+        SYMBOL_SESSION_INTEREST             = 59, // Not supported
+        SYMBOL_SESSION_BUY_ORDERS_VOLUME    = 61, // Not supported
+        SYMBOL_SESSION_SELL_ORDERS_VOLUME   = 63, // Not supported
+        SYMBOL_SESSION_OPEN                 = 64, // Not supported
+        SYMBOL_SESSION_CLOSE                = 65, // Not supported
+        SYMBOL_SESSION_AW                   = 66, // Not supported
+        SYMBOL_SESSION_PRICE_SETTLEMENT     = 67, // Not supported
+        SYMBOL_SESSION_PRICE_LIMIT_MIN      = 68, // Not supported
+        SYMBOL_SESSION_PRICE_LIMIT_MAX      = 69, // Not supported
+    }
+}

MtApi/EnumSymbolInfoInteger.cs

@@ -0,0 +1,31 @@
+namespace MtApi
+{
+    //MQL4: ENUM_SYMBOL_INFO_INTEGER
+    public enum EnumSymbolInfoInteger
+    {
+        SYMBOL_SELECT                   = 0,
+        SYMBOL_VISIBLE                  = 76,
+        SYMBOL_SESSION_DEALS            = 56,
+        SYMBOL_SESSION_BUY_ORDERS       = 60,
+        SYMBOL_SESSION_SELL_ORDERS      = 62,
+        SYMBOL_VOLUME                   = 10,
+        SYMBOL_VOLUMEHIGH               = 11,
+        SYMBOL_VOLUMELOW                = 12,
+        SYMBOL_TIME                     = 15,
+        SYMBOL_DIGITS                   = 17,
+        SYMBOL_SPREAD                   = 18,
+        SYMBOL_SPREAD_FLOAT             = 41,
+        SYMBOL_TRADE_CALC_MODE          = 29,
+        SYMBOL_TRADE_MODE               = 30,
+        SYMBOL_START_TIME               = 51,
+        SYMBOL_EXPIRATION_TIME          = 52,
+        SYMBOL_TRADE_STOPS_LEVEL        = 31,
+        SYMBOL_TRADE_FREEZE_LEVEL       = 32,
+        SYMBOL_TRADE_EXEMODE            = 33,
+        SYMBOL_SWAP_MODE                = 37,
+        SYMBOL_SWAP_ROLLOVER3DAYS       = 40,
+        SYMBOL_EXPIRATION_MODE          = 49,
+        SYMBOL_FILLING_MODE             = 50,
+        SYMBOL_ORDER_MODE               = 71
+    }
+}

MtApi/EnumTerminalInfoDouble.cs

@@ -0,0 +1,8 @@
+namespace MtApi
+{
+    // https://docs.mql4.com/constants/environment_state/terminalstatus#enum_terminal_info_double
+    public enum EnumTerminalInfoDouble
+    {
+        TERMINAL_COMMUNITY_BALANCE  = 25 // Balance in MQL5.community
+    }
+}

MtApi/EnumTerminalInfoInteger.cs

@@ -0,0 +1,27 @@
+namespace MtApi
+{
+    // https://docs.mql4.com/constants/environment_state/terminalstatus#enum_terminal_info_integer
+    public enum EnumTerminalInfoInteger
+    {
+        TERMINAL_BUILD                  = 5, // The client terminal build number
+        TERMINAL_COMMUNITY_ACCOUNT      = 23, // The flag indicates the presence of MQL5.community authorization data in the terminal
+        TERMINAL_COMMUNITY_CONNECTION   = 24, // Connection to MQL5.community
+        TERMINAL_CONNECTED              = 6, // Connection to a trade server
+        TERMINAL_DLLS_ALLOWED           = 7, // Permission to use DLL
+        TERMINAL_TRADE_ALLOWED          = 8, // Permission to trade
+        TERMINAL_EMAIL_ENABLED          = 9, // Permission to send e-mails using SMTP-server and login, specified in the terminal settings
+        TERMINAL_FTP_ENABLED            = 10, // Permission to send reports using FTP-server and login, specified in the terminal settings
+        TERMINAL_NOTIFICATIONS_ENABLED  = 26, // Permission to send notifications to smartphone
+        TERMINAL_MAXBARS                = 11, // The maximal bars count on the chart
+        TERMINAL_MQID                   = 22, // The flag indicates the presence of MetaQuotes ID data to send Push notifications
+        TERMINAL_CODEPAGE               = 12, // Number of the code page of the language installed in the client terminal
+        TERMINAL_CPU_CORES              = 21, // The number of CPU cores in the system
+        TERMINAL_DISK_SPACE             = 20, // Free disk space for the MQL4\Files folder of the terminal, Mb
+        TERMINAL_MEMORY_PHYSICAL        = 14, // Physical memory in the system, Mb
+        TERMINAL_MEMORY_TOTAL           = 15, // Memory available to the process of the terminal , Mb
+        TERMINAL_MEMORY_AVAILABLE       = 16, // Free memory of the terminal process, Mb
+        TERMINAL_MEMORY_USED            = 17, // Memory used by the terminal , Mb
+        TERMINAL_SCREEN_DPI             = 27, // The resolution of information display on the screen is measured as number of Dots in a line per Inch (DPI). Knowing the parameter value, you can set the size of graphical objects so that they look the same on monitors with different resolution characteristics.
+        TERMINAL_PING_LAST              = 28  // The last known value of a ping to a trade server in microseconds. One second comprises of one million microseconds
+    }
+}

MtApi/ExtensionMethods.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace MtApi
-{
-    static class ExtensionMethods
-    {
-        #region Event Methods
-
-        public static Task FireEventAsync(this MtApiQuoteHandler evenHandler, object sender, string symbol, double bid, double ask)
-        {
-            return Task.Factory.StartNew(() =>
-            {
-                evenHandler?.Invoke(sender, symbol, bid, ask);
-            });
-        }
-
-        public static Task FireEventAsync(this EventHandler eventHandler, object sender)
-        {
-            return Task.Factory.StartNew(() =>
-            {
-                eventHandler?.Invoke(sender, EventArgs.Empty);
-            });
-        }
-
-        public static Task FireEventAsync<T>(this EventHandler<T> eventHandler, object sender, T e)
-            where T : EventArgs
-        {
-            return Task.Factory.StartNew(() =>
-            {
-                eventHandler?.Invoke(sender, e);
-            });
-        }
-
-        #endregion
-
-        public static MtQuote Convert(this MTApiService.MtQuote quote)
-        {
-            return (quote != null) ? new MtQuote(quote.Instrument, quote.Bid, quote.Ask) : null;
-        }
-    }
-}

MtApi/FlagFontStyle.cs

@@ -0,0 +1,30 @@
+using System;
+
+namespace MtApi
+{
+    [Flags]
+    public enum FlagFontStyle
+    {
+        //Flags for specifying font style
+        FONT_ITALIC     = -2147483648,
+        FONT_UNDERLINE  = 1073741824,
+        FONT_STRIKEOUT  = 536870912,
+
+        //Flags for specifying font width
+        FW_DONTCARE     = 0,
+        FW_THIN         = 1,
+        FW_EXTRALIGHT   = 2,
+        FW_ULTRALIGHT   = 3,
+        FW_LIGHT        = 4,
+        FW_NORMAL       = 5,
+        FW_REGULAR      = 6,
+        FW_MEDIUM       = 7,
+        FW_SEMIBOLD     = 8,
+        FW_DEMIBOLD     = 9,
+        FW_BOLD         = 10,
+        FW_EXTRABOLD    = 11,
+        FW_ULTRABOLD    = 12,
+        FW_HEAVY        = 13,
+        FW_BLACK        = 14
+    }
+}

MtApi/MarketInfoModeType.cs

@@ -1,9 +1,4 @@
-using System;
+namespace MtApi
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MtApi
 {
     public enum MarketInfoModeType
     {

MtApi/Monitors/TimeframeTradeMonitor.cs

@@ -4,7 +4,7 @@ namespace MtApi.Monitors
     public class TimeframeTradeMonitor : TradeMonitor
     {
         #region Fields
-        private volatile bool _isStarted = false;
+        private volatile bool _isStarted;
         #endregion
 
         #region ctor
@@ -23,13 +23,8 @@ namespace MtApi.Monitors
         // Returns:
         //     true if PositionMonitor should check orders
         //     otherwise, false.
-        public override bool IsStarted
+        public override bool IsStarted => _isStarted;
-        {
+
-            get
-            {
-                return _isStarted;
-            }
-        }
         #endregion
 
         #region Protected Methods

MtApi/Monitors/TradeMonitor.cs

@@ -13,7 +13,7 @@ namespace MtApi.Monitors
         #endregion
 
         #region ctor
-        public TradeMonitor(MtApiClient apiClient)
+        protected TradeMonitor(MtApiClient apiClient)
         {
             if (apiClient == null)
                 throw new ArgumentNullException(nameof(apiClient));
@@ -73,13 +73,7 @@ namespace MtApi.Monitors
         protected abstract void OnMtConnected();
         protected abstract void OnMtDisconnected();
 
-        public bool IsMtConnected
+        public bool IsMtConnected => _apiClient.ConnectionState == MtConnectionState.Connected;
-        {
-            get
-            {
-                return _apiClient.ConnectionState == MtConnectionState.Connected;
-            }
-        }
 
         protected void Check()
         {
@@ -113,12 +107,12 @@ namespace MtApi.Monitors
                 prevOrders = _prevOrders;
             }
 
-            if (_prevOrders != null) //skip checking on first load orders
+            if (prevOrders != null) //skip checking on first load orders
             {
                 //check open orders
                 foreach (var order in tradesOrders)
                 {
-                    if (_prevOrders.Find(a => a.Ticket == order.Ticket) == null)
+                    if (prevOrders.Find(a => a.Ticket == order.Ticket) == null)
                     {
                         openedOrders.Add(order);
                     }
@@ -126,7 +120,7 @@ namespace MtApi.Monitors
 
                 //check closed orders
                 var closeOrdersTemp = new List<MtOrder>();
-                foreach (var order in _prevOrders)
+                foreach (var order in prevOrders)
                 {
                     if (tradesOrders.Find(a => a.Ticket == order.Ticket) == null)
                     {
@@ -180,10 +174,7 @@ namespace MtApi.Monitors
                 _prevOrders = null;
             }
 
-            Task.Factory.StartNew(() =>
+            Task.Factory.StartNew(Check);
-            {
-                Check();
-            });
         }
         #endregion
     }

MtApi/MqlRates.cs

@@ -5,12 +5,7 @@ namespace MtApi
     public class MqlRates
     {
         public int MtTime { get; set; }
-
+        public DateTime Time => MtApiTimeConverter.ConvertFromMtTime(MtTime);
-        public DateTime Time
-        {
-            get { return MtApiTimeConverter.ConvertFromMtTime(MtTime); }
-        }
-
         public double Open { get; set; }
         public double High { get; set; }
         public double Low { get; set; }

MtApi/MqlTick.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace MtApi
+{
+    public class MqlTick
+    {
+        public int MtTime { get; set; }
+        public DateTime Time => MtApiTimeConverter.ConvertFromMtTime(MtTime);
+        public double Bid { get; set; }
+        public double Ask { get; set; }
+        public double Last { get; set; }
+        public ulong Volume { get; set; }
+    }
+}

MtApi/MtApi.csproj

@@ -59,9 +59,21 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ChartPeriod.cs" />
-    <Compile Include="ExtensionMethods.cs" />
+    <Compile Include="EnumAlignMode.cs" />
+    <Compile Include="EnumColorFormat.cs" />
+    <Compile Include="EnumObject.cs" />
+    <Compile Include="EnumObjectPropertyDouble.cs" />
+    <Compile Include="EnumObjectPropertyInteger.cs" />
+    <Compile Include="EnumObjectPropertyString.cs" />
+    <Compile Include="EnumSeriesInfoInteger.cs" />
+    <Compile Include="EnumSymbolInfoDouble.cs" />
+    <Compile Include="EnumSymbolInfoInteger.cs" />
+    <Compile Include="EnumTerminalInfoDouble.cs" />
+    <Compile Include="EnumTerminalInfoInteger.cs" />
+    <Compile Include="FlagFontStyle.cs" />
     <Compile Include="Monitors\AvailabilityOrdersEventArgs.cs" />
     <Compile Include="MqlRates.cs" />
+    <Compile Include="MqlTick.cs" />
     <Compile Include="MtConnectionEventArgs.cs" />
     <Compile Include="MtConnectionException.cs" />
     <Compile Include="MtConnectionState.cs" />
@@ -72,6 +84,7 @@
     <Compile Include="MtOrder.cs" />
     <Compile Include="MtQuote.cs" />
     <Compile Include="MtQuoteEventArgs.cs" />
+    <Compile Include="MtSession.cs" />
     <Compile Include="MtTimeBar.cs" />
     <Compile Include="MtTypes.cs" />
     <Compile Include="Monitors\TradeMonitor.cs" />
@@ -90,14 +103,22 @@
     <Compile Include="Requests\OrderDeleteRequest.cs" />
     <Compile Include="Requests\OrderModifyRequest.cs" />
     <Compile Include="Requests\OrderSendRequest.cs" />
+    <Compile Include="Requests\SeriesInfoIntegerRequest.cs" />
+    <Compile Include="Requests\SessionRequest.cs" />
     <Compile Include="Requests\RequestBase.cs" />
     <Compile Include="Requests\RequestType.cs" />
+    <Compile Include="Requests\SymbolInfoDoubleRequest.cs" />
+    <Compile Include="Requests\SymbolInfoTickRequest.cs" />
     <Compile Include="Responses\CopyRatesResponse.cs" />
     <Compile Include="Responses\GetOrderResponse.cs" />
     <Compile Include="Responses\GetOrdersResponse.cs" />
     <Compile Include="Responses\ICustomResponse.cs" />
     <Compile Include="Responses\OrderSendResponse.cs" />
+    <Compile Include="Responses\SeriesInfoIntegerResponse.cs" />
+    <Compile Include="Responses\SessionResponse.cs" />
     <Compile Include="Responses\ResponseBase.cs" />
+    <Compile Include="Responses\SymbolInfoDoubleResponse.cs" />
+    <Compile Include="Responses\SymbolInfoTickResponse.cs" />
     <Compile Include="SeriesIdentifier.cs" />
     <Compile Include="TimeBarArgs.cs" />
     <Compile Include="Monitors\TimeframeTradeMonitor.cs" />

MtApi/MtApiColorConverter.cs

@@ -13,9 +13,9 @@ namespace MtApi
             return Color.FromArgb((byte)(color), (byte)(color >> 8), (byte)(color >> 16));
         }
 
-        public static int ConvertToMtColor(Color color)
+        public static int ConvertToMtColor(Color? color)
         {
-            return color == Color.Empty ? 0xffffff : (Color.FromArgb(color.B, color.G, color.R).ToArgb() & 0xffffff);
+            return color == null || color == Color.Empty ? 0xffffff : (Color.FromArgb(color.Value.B, color.Value.G, color.Value.R).ToArgb() & 0xffffff);
         }
     }
 }

MtApi/MtApiTimeConverter.cs

@@ -13,13 +13,13 @@ namespace MtApi
             return new DateTime(tmpTime.Ticks + (time * 0x989680L));
         }
 
-        public static int ConvertToMtTime(DateTime time)
+        public static int ConvertToMtTime(DateTime? time)
         {
             int result = 0;
-            if (time != DateTime.MinValue)
+            if (time != null && time != DateTime.MinValue)
             {
                 DateTime tmpTime = new DateTime(1970, 1, 1);
-                result = (int)((time.Ticks - tmpTime.Ticks) / 0x989680L);
+                result = (int)((time.Value.Ticks - tmpTime.Ticks) / 0x989680L);
             }
             return result;
         }

MtApi/MtCommandType.cs

@@ -1,9 +1,4 @@
-using System;
+namespace MtApi
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MtApi
 {
     enum MtCommandType
     {
@@ -58,9 +53,15 @@ namespace MtApi
         IsVisualMode                        = 37,
         UninitializeReason                  = 38,
         ErrorDescription                    = 39,
+        TerminalCompany                     = 68,
+        TerminalName                        = 69,
+        TerminalPath                        = 70,
+        TerminalInfoString                  = 153,
+        TerminalInfoInteger                 = 204,
+        TerminalInfoDouble                  = 205,
 
         //Account Information
-        AccountBalance                      = 40,
+        AccountBalance = 40,
         AccountCredit                       = 41,
         AccountCompany                      = 42,
         AccountCurrency                     = 43,
@@ -91,11 +92,6 @@ namespace MtApi
         SendMail                            = 66,
         Sleep                               = 67,
 
-        //Client Terminal
-        TerminalCompany                     = 68,
-        TerminalName                        = 69,
-        TerminalPath                        = 70,
-
         //Date and Time
         Day                                 = 71,
         DayOfWeek                           = 72,
@@ -139,8 +135,8 @@ namespace MtApi
         iBullsPower                         = 106,
         iCCI                                = 107,
         iCCIOnArray                         = 108,
-        iCustom                             = 109,
+        //iCustom                             = 109,
-        iCustom_d                           = 10109,
+        //iCustom_d                           = 10109,
         iDeMarker                           = 110,
         iEnvelopes                          = 111,
         iEnvelopesOnArray                   = 112,
@@ -188,13 +184,99 @@ namespace MtApi
         //
         RefreshRates                        = 150,
         //
-        TerminalInfoString                  = 153,
-        SymbolInfoString                    = 154,
 
         //Requests
         MtRequest                           = 155,
 
         //Backtesting
-        BacktestingReady                    = 156
+        BacktestingReady                    = 156,
+
+        //Market Info
+        SymbolInfoString                    = 154,
+        SymbolsTotal                        = 200,
+        SymbolName                          = 201,
+        SymbolSelect                        = 202,
+        SymbolInfoInteger                   = 203,
+
+        //Object Functions
+        ObjectCreate                        = 208,
+        ObjectName                          = 209,
+        ObjectDelete                        = 210,
+        ObjectsDeleteAll                    = 211,
+        ObjectFind                          = 212,
+        ObjectGetTimeByValue                = 213,
+        ObjectGetValueByTime                = 214,
+        ObjectMove                          = 215,
+        ObjectsTotal                        = 216,
+        ObjectGetDouble                     = 217,
+        ObjectGetInteger                    = 218,
+        ObjectGetString                     = 219,
+        ObjectSetDouble                     = 220,
+        ObjectSetInteger                    = 221,
+        ObjectSetString                     = 222,
+        TextSetFont                         = 223,
+        TextOut                             = 224,
+        TextGetSize                         = 225,
+        ObjectDescription                   = 226,
+        ObjectGet                           = 227,
+        ObjectGetFiboDescription            = 228,
+        ObjectGetShiftByValue               = 229,
+        ObjectGetValueByShift               = 230,
+        ObjectSet                           = 231,
+        ObjectSetFiboDescription            = 232,
+        ObjectSetText                       = 233,
+        ObjectType                          = 234,
+
+        UnlockTicks                         = 235,
+
+        //Chart Operations
+        ChartId                             = 206,
+        ChartRedraw                         = 207,
+        ChartApplyTemplate                  = 236,
+        ChartSaveTemplate                   = 237,
+        ChartWindowFind                     = 238,
+        ChartTimePriceToXY                  = 239,
+        ChartXYToTimePrice                  = 240,
+        ChartOpen                           = 241,
+        ChartFirst                          = 242,
+        ChartNext                           = 243,
+        ChartClose                          = 244,
+        ChartSymbol                         = 245,
+        ChartPeriod                         = 246,
+        ChartSetDouble                      = 247,
+        ChartSetInteger                     = 248,
+        ChartSetString                      = 249,
+        ChartGetDouble                      = 250,
+        ChartGetInteger                     = 251,
+        ChartGetString                      = 252,
+        ChartNavigate                       = 253,
+        ChartIndicatorDelete                = 254,
+        ChartIndicatorName                  = 255,
+        ChartIndicatorsTotal                = 256,
+        ChartWindowOnDropped                = 257,
+        ChartPriceOnDropped                 = 258,
+        ChartTimeOnDropped                  = 259,
+        ChartXOnDropped                     = 260,
+        ChartYOnDropped                     = 261,
+        ChartSetSymbolPeriod                = 262,
+        ChartScreenShot                     = 263,
+        WindowBarsPerChart                  = 264,
+        WindowExpertName                    = 265,
+        WindowFind                          = 266,
+        WindowFirstVisibleBar               = 267,
+        WindowHandle                        = 268,
+        WindowIsVisible                     = 269,
+        WindowOnDropped                     = 270,
+        WindowPriceMax                      = 271,
+        WindowPriceMin                      = 272,
+        WindowPriceOnDropped                = 273,
+        WindowRedraw                        = 274,
+        WindowScreenShot                    = 275,
+        WindowTimeOnDropped                 = 276,
+        WindowsTotal                        = 277,
+        WindowXOnDropped                    = 278,
+        WindowYOnDropped                    = 279,
+
+        ChangeAccount                       = 280
     }
 }

MtApi/MtConnectionEventArgs.cs

@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace MtApi
 {
     public class MtConnectionEventArgs: EventArgs
     {
         public MtConnectionState Status { get; private set; }
-        public String ConnectionMessage { get; private set; }
+        public string ConnectionMessage { get; private set; }
 
         public MtConnectionEventArgs(MtConnectionState status, string message)
         {

MtApi/MtErrorCode.cs

@@ -1,5 +1,6 @@
 namespace MtApi
 {
+    // https://docs.mql4.com/constants/errorswarnings/errorcodes
     public enum MtErrorCode
     {
         MtApiCustomError                    = -1,   // Error occurred in MtApi.
@@ -10,91 +11,91 @@
         ServerBusy                          = 4,    // Trade server is busy.
         OldVersion                          = 5,    // Old version of the client terminal.
         NoConnection                        = 6,    // No connection with trade server.
-        NotEnoughRights                     = 7,	// Not enough rights.
+        NotEnoughRights                     = 7,    // Not enough rights.
-        TooFrequentRequests                 = 8,	// Too frequent requests.
+        TooFrequentRequests                 = 8,    // Too frequent requests.
-        MalfunctionalTrade                  = 9,	// Malfunctional trade operation.
+        MalfunctionalTrade                  = 9,    // Malfunctional trade operation.
         AccountDisabled                     = 64,   // Account disabled.
-        InvalidAccount                      = 65,	// Invalid account.
+        InvalidAccount                      = 65,    // Invalid account.
-        TradeTimeout                        = 128,	// Trade timeout.
+        TradeTimeout                        = 128,    // Trade timeout.
-        InvalidPrice                        = 129,	// Invalid price.
+        InvalidPrice                        = 129,    // Invalid price.
-        InvalidStops                        = 130,	// Invalid stops.
+        InvalidStops                        = 130,    // Invalid stops.
-        InvalidTradeVolume                  = 131,	// Invalid trade volume.
+        InvalidTradeVolume                  = 131,    // Invalid trade volume.
-        MarketClosed                        = 132,	// Market is closed.
+        MarketClosed                        = 132,    // Market is closed.
-        TradeDisabled                       = 133,	// Trade is disabled.
+        TradeDisabled                       = 133,    // Trade is disabled.
-        NotEnoughMoney                      = 134,	// Not enough money.
+        NotEnoughMoney                      = 134,    // Not enough money.
-        PriceChanged                        = 135,	// Price changed.
+        PriceChanged                        = 135,    // Price changed.
-        OffQuotes                           = 136,	// Off quotes.
+        OffQuotes                           = 136,    // Off quotes.
-        BrokerBusy                          = 137,	// Broker is busy.
+        BrokerBusy                          = 137,    // Broker is busy.
-        Requote                             = 138,	// Requote.
+        Requote                             = 138,    // Requote.
-        OrderLocked                         = 139,	// Order is locked.
+        OrderLocked                         = 139,    // Order is locked.
-        LongPositionsOnlyAllowed            = 140,	// Long positions only allowed.
+        LongPositionsOnlyAllowed            = 140,    // Long positions only allowed.
-        TooManyRequests                     = 141,	// Too many requests.
+        TooManyRequests                     = 141,    // Too many requests.
-        TradeModifyDenied                   = 145,	// Modification denied because an order is too close to market.
+        TradeModifyDenied                   = 145,    // Modification denied because an order is too close to market.
-        TradeContextBusy                    = 146,	// Trade context is busy.
+        TradeContextBusy                    = 146,    // Trade context is busy.
-        TradeExpirationDenied               = 147,	// Expirations are denied by broker.
+        TradeExpirationDenied               = 147,    // Expirations are denied by broker.
-        TradeTooManyOrders                  = 148,	// The amount of opened and pending orders has reached the limit set by a broker.
+        TradeTooManyOrders                  = 148,    // The amount of opened and pending orders has reached the limit set by a broker.
 
-        NoMqlerror                          = 4000, // No error.
+        NoMqlerror                          = 4000,    // No error.
-        WrongFunctionPointer                = 4001, // Wrong function pointer.
+        WrongFunctionPointer                = 4001,    // Wrong function pointer.
-        ArrayIndexOutOfRange                = 4002, // Array index is out of range.
+        ArrayIndexOutOfRange                = 4002,    // Array index is out of range.
-        NoMemoryForFunctionCallStack        = 4003, // No memory for function call stack.
+        NoMemoryForFunctionCallStack        = 4003,    // No memory for function call stack.
-        RecursiveStackOverflow              = 4004, // Recursive stack overflow.
+        RecursiveStackOverflow              = 4004,    // Recursive stack overflow.
-        NotEnoughStackForParameter          = 4005, // Not enough stack for parameter.
+        NotEnoughStackForParameter          = 4005,    // Not enough stack for parameter.
-        NoMemoryForParameterString          = 4006,	// No memory for parameter string.
+        NoMemoryForParameterString          = 4006,    // No memory for parameter string.
-        NoMemoryForTempString               = 4007,	// No memory for temp string.
+        NoMemoryForTempString               = 4007,    // No memory for temp string.
-        NotInitializedString                = 4008,	// Not initialized string.
+        NotInitializedString                = 4008,    // Not initialized string.
-        NotInitializedArraystring           = 4009,	// Not initialized string in an array.
+        NotInitializedArraystring           = 4009,    // Not initialized string in an array.
-        NoMemoryForArraystring              = 4010,	// No memory for an array string.
+        NoMemoryForArraystring              = 4010,    // No memory for an array string.
-        TooLongString                       = 4011,	// Too long string.
+        TooLongString                       = 4011,    // Too long string.
-        RemainderFromZeroDivide             = 4012,	// Remainder from zero divide.
+        RemainderFromZeroDivide             = 4012,    // Remainder from zero divide.
-        ZeroDivide                          = 4013,	// Zero divide.
+        ZeroDivide                          = 4013,    // Zero divide.
-        UnknownCommand                      = 4014,	// Unknown command.
+        UnknownCommand                      = 4014,    // Unknown command.
-        WrongJump                           = 4015,	// Wrong jump.
+        WrongJump                           = 4015,    // Wrong jump.
-        NotInitializedArray                 = 4016,	// Not initialized array.
+        NotInitializedArray                 = 4016,    // Not initialized array.
-        DllCallsNotAllowed                  = 4017,	// DLL calls are not allowed.
+        DllCallsNotAllowed                  = 4017,    // DLL calls are not allowed.
-        CannotLoadLibrary                   = 4018,	// Cannot load library.
+        CannotLoadLibrary                   = 4018,    // Cannot load library.
-        CannotCallFunction                  = 4019,	// Cannot call function.
+        CannotCallFunction                  = 4019,    // Cannot call function.
-        ExternalExpertCallsNotAllowed       = 4020,	// EA function calls are not allowed.
+        ExternalExpertCallsNotAllowed       = 4020,    // EA function calls are not allowed.
-        NotEnoughMemoryForReturnedString    = 4021,	// Not enough memory for a string returned from a function.
+        NotEnoughMemoryForReturnedString    = 4021,    // Not enough memory for a string returned from a function.
-        SystemBusy                          = 4022,	// System is busy.
+        SystemBusy                          = 4022,    // System is busy.
-        InvalidFunctionParametersCount      = 4050,	// Invalid function parameters count.
+        InvalidFunctionParametersCount      = 4050,    // Invalid function parameters count.
-        InvalidFunctionParameterValue       = 4051,	// Invalid function parameter value.
+        InvalidFunctionParameterValue       = 4051,    // Invalid function parameter value.
-        StringFunctionInternalError         = 4052,	// String function internal error.
+        StringFunctionInternalError         = 4052,    // String function internal error.
-        SomeArrayError                      = 4053,	// Some array error.
+        SomeArrayError                      = 4053,    // Some array error.
-        IncorrectSeriesArrayUsing           = 4054,	// Incorrect series array using.
+        IncorrectSeriesArrayUsing           = 4054,    // Incorrect series array using.
-        CustomIndicatorError                = 4055,	// Custom indicator error.
+        CustomIndicatorError                = 4055,    // Custom indicator error.
-        IncompatibleArrays                  = 4056,	// Arrays are incompatible.
+        IncompatibleArrays                  = 4056,    // Arrays are incompatible.
-        GlobalVariablesProcessingError      = 4057,	// Global variables processing error.
+        GlobalVariablesProcessingError      = 4057,    // Global variables processing error.
-        GlobalVariableNotFound              = 4058,	// Global variable not found.
+        GlobalVariableNotFound              = 4058,    // Global variable not found.
-        FunctionNotAllowedInTestingMode     = 4059,	// Function is not allowed in testing mode.
+        FunctionNotAllowedInTestingMode     = 4059,    // Function is not allowed in testing mode.
-        FunctionNotConfirmed                = 4060,	// Function is not confirmed.
+        FunctionNotConfirmed                = 4060,    // Function is not confirmed.
-        SendMailError                       = 4061,	// Mail sending error.
+        SendMailError                       = 4061,    // Mail sending error.
-        StringParameterExpected             = 4062,	// String parameter expected.
+        StringParameterExpected             = 4062,    // String parameter expected.
-        IntegerParameterExpected            = 4063,	// Integer parameter expected.
+        IntegerParameterExpected            = 4063,    // Integer parameter expected.
-        DoubleParameterExpected             = 4064,	// Double parameter expected.
+        DoubleParameterExpected             = 4064,    // Double parameter expected.
-        ArrayAsParameterExpected            = 4065,	// Array as parameter expected.
+        ArrayAsParameterExpected            = 4065,    // Array as parameter expected.
-        HistoryWillUpdated                  = 4066,	// Requested history data in updating state.
+        HistoryWillUpdated                  = 4066,    // Requested history data in updating state.
-        TradeError	                        = 4067, // Some error in trade operation execution.
+        TradeError                            = 4067, // Some error in trade operation execution.
-        EndOfFile                           = 4099,	// End of a file.
+        EndOfFile                           = 4099,    // End of a file.
-        SomeFileError                       = 4100,	// Some file error.
+        SomeFileError                       = 4100,    // Some file error.
-        WrongFileName                       = 4101,	// Wrong file name.
+        WrongFileName                       = 4101,    // Wrong file name.
-        TooManyOpenedFiles                  = 4102,	// Too many opened files.
+        TooManyOpenedFiles                  = 4102,    // Too many opened files.
-        CannotOpenFile                      = 4103,	// Cannot open file.
+        CannotOpenFile                      = 4103,    // Cannot open file.
-        IncompatibleAccessToFile            = 4104,	// Incompatible access to a file.
+        IncompatibleAccessToFile            = 4104,    // Incompatible access to a file.
-        NoOrderSelected                     = 4105,	// No order selected.
+        NoOrderSelected                     = 4105,    // No order selected.
-        UnknownSymbol                       = 4106,	// Unknown symbol.
+        UnknownSymbol                       = 4106,    // Unknown symbol.
-        InvalidPriceParam                   = 4107,	// Invalid price.
+        InvalidPriceParam                   = 4107,    // Invalid price.
-        InvalidTicket                       = 4108,	// Invalid ticket.
+        InvalidTicket                       = 4108,    // Invalid ticket.
-        TradeNotAllowed                     = 4109,	// Trade is not allowed.
+        TradeNotAllowed                     = 4109,    // Trade is not allowed.
-        LongsNotAllowed                     = 4110,	// Longs are not allowed.
+        LongsNotAllowed                     = 4110,    // Longs are not allowed.
-        ShortsNotAllowed                    = 4111,	// Shorts are not allowed.
+        ShortsNotAllowed                    = 4111,    // Shorts are not allowed.
-        ObjectAlreadyExists                 = 4200,	// Object already exists.
+        ObjectAlreadyExists                 = 4200,    // Object already exists.
-        UnknownObjectProperty               = 4201,	// Unknown object property.
+        UnknownObjectProperty               = 4201,    // Unknown object property.
-        ObjectDoesNotExist                  = 4202,	// Object does not exist.
+        ObjectDoesNotExist                  = 4202,    // Object does not exist.
-        UnknownObjectType                   = 4203,	// Unknown object type.
+        UnknownObjectType                   = 4203,    // Unknown object type.
-        NoObjectName                        = 4204,	// No object name.
+        NoObjectName                        = 4204,    // No object name.
-        ObjectCoordinatesError              = 4205,	// Object coordinates error.
+        ObjectCoordinatesError              = 4205,    // Object coordinates error.
-        NoSpecifiedSubwindow                = 4206,	// No specified subwindow.
+        NoSpecifiedSubwindow                = 4206,    // No specified subwindow.
-        SomeObjectError                     = 4207	// Some error in object operation.
+        SomeObjectError                     = 4207    // Some error in object operation.
     }
 }

MtApi/MtQuote.cs

@@ -1,15 +1,11 @@
-using System;
+namespace MtApi
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MtApi
 {
     public class MtQuote
     {
         public string Instrument { get; private set; }
         public double Bid { get; private set; }
         public double Ask { get; private set; }
+        public int ExpertHandle { get; private set; }
 
         public MtQuote(string instrument, double bid, double ask)
         {
@@ -17,5 +13,13 @@ namespace MtApi
             Bid = bid;
             Ask = ask;
         }
+
+        internal MtQuote(MTApiService.MtQuote quote)
+        {
+            Instrument = quote.Instrument;
+            Bid = quote.Bid;
+            Ask = quote.Ask;
+            ExpertHandle = quote.ExpertHandle;
+        }
     }
 }

MtApi/MtQuoteEventArgs.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace MtApi
 {

MtApi/MtSession.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace MtApi
+{
+    public class MtSession
+    {
+        public string Symbol { get; set; }
+        public DayOfWeek DayOfWeek { get; set; }
+        public uint Index { get; set; }
+        public int MtFromTime { get; set; }
+        public DateTime From => MtApiTimeConverter.ConvertFromMtTime(MtFromTime);
+        public int MtToTime { get; set; }
+        public DateTime To => MtApiTimeConverter.ConvertFromMtTime(MtToTime);
+        public bool HasData { get; set; }
+        public SessionType Type { get; set; }
+    }
+
+    public enum SessionType
+    {
+        Quote,
+        Trade
+    }
+}

MtApi/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.30.0")]
+[assembly: AssemblyVersion("1.0.37.0")]
-[assembly: AssemblyFileVersion("1.0.30.0")]
+[assembly: AssemblyFileVersion("1.0.37.0")]

MtApi/Requests/CopyRatesRequest.cs

@@ -1,12 +1,6 @@
-using System;
+namespace MtApi.Requests
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MtApi.Requests
 {
-    public abstract class CopyRatesRequestBase : RequestBase
+    internal abstract class CopyRatesRequestBase : RequestBase
     {
         public enum CopyRatesTypeEnum
         {
@@ -15,10 +9,7 @@ namespace MtApi.Requests
             CopyRates_3 = 3,
         }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.CopyRates;
-        {
-            get { return RequestType.CopyRates; }
-        }
 
         public abstract CopyRatesTypeEnum CopyRatesType { get; }
 
@@ -26,34 +17,25 @@ namespace MtApi.Requests
         public ENUM_TIMEFRAMES Timeframe { get; set; }
     }
 
-    public class CopyRates1Request : CopyRatesRequestBase
+    internal class CopyRates1Request : CopyRatesRequestBase
     {
-        public override CopyRatesTypeEnum CopyRatesType
+        public override CopyRatesTypeEnum CopyRatesType => CopyRatesTypeEnum.CopyRates_1;
-        {
-            get { return CopyRatesTypeEnum.CopyRates_1; }
-        }
 
         public int StartPos { get; set; }
         public int Count { get; set; }
     }
 
-    public class CopyRates2Request : CopyRatesRequestBase
+    internal class CopyRates2Request : CopyRatesRequestBase
     {
-        public override CopyRatesTypeEnum CopyRatesType
+        public override CopyRatesTypeEnum CopyRatesType => CopyRatesTypeEnum.CopyRates_2;
-        {
-            get { return CopyRatesTypeEnum.CopyRates_2; }
-        }
 
         public int StartTime { get; set; }
         public int Count { get; set; }
     }
 
-    public class CopyRates3Request : CopyRatesRequestBase
+    internal class CopyRates3Request : CopyRatesRequestBase
     {
-        public override CopyRatesTypeEnum CopyRatesType
+        public override CopyRatesTypeEnum CopyRatesType => CopyRatesTypeEnum.CopyRates_3;
-        {
-            get { return CopyRatesTypeEnum.CopyRates_3; }
-        }
 
         public int StartTime { get; set; }
         public int StopTime { get; set; }

MtApi/Requests/GetOrderRequest.cs

@@ -1,14 +1,11 @@
 namespace MtApi.Requests
 {
-    public class GetOrderRequest: RequestBase
+    internal class GetOrderRequest: RequestBase
     {
         public int Index { get; set; }
         public int Select { get; set; }
         public int Pool { get; set; }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.GetOrder;
-        {
-            get { return RequestType.GetOrder; }
-        }
     }
 }

MtApi/Requests/GetOrdersRequest.cs

@@ -1,12 +1,9 @@
 namespace MtApi.Requests
 {
-    public class GetOrdersRequest: RequestBase
+    internal class GetOrdersRequest: RequestBase
     {
         public int Pool { get; set; }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.GetOrders;
-        {
-            get { return RequestType.GetOrders; }
-        }
     }
 }

MtApi/Requests/ICustomRequest.cs

@@ -1,10 +1,8 @@
-
+using System.Collections;
-using System;
-using System.Collections;
 
 namespace MtApi.Requests
 {
-    public class ICustomRequest : RequestBase
+    internal class ICustomRequest : RequestBase
     {
         public enum ParametersType
         {
@@ -22,9 +20,6 @@ namespace MtApi.Requests
         public ArrayList Params { get; set; }
         public ParametersType ParamsType { get; set; }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.iCustom;
-        {
-            get { return RequestType.iCustom; }
-        }
     }
 }

MtApi/Requests/OrderCloseByRequest.cs

@@ -1,15 +1,12 @@
 namespace MtApi.Requests
 {
-    public class OrderCloseByRequest: RequestBase
+    internal class OrderCloseByRequest: RequestBase
     {
         public int Ticket { get; set; }
         public int Opposite { get; set; }
 
         public int? ArrowColor { get; set; }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.OrderCloseBy;
-        {
-            get { return RequestType.OrderCloseBy; }
-        }
     }
 }

MtApi/Requests/OrderCloseRequest.cs

@@ -1,6 +1,6 @@
 namespace MtApi.Requests
 {
-    public class OrderCloseRequest: RequestBase
+    internal class OrderCloseRequest: RequestBase
     {
         public int Ticket { get; set; }
 
@@ -9,9 +9,6 @@
         public int? Slippage { get; set; }
         public int? ArrowColor { get; set; }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.OrderClose;
-        {
-            get { return RequestType.OrderClose; }
-        }
     }
 }

MtApi/Requests/OrderDeleteRequest.cs

@@ -1,14 +1,11 @@
 namespace MtApi.Requests
 {
-    public class OrderDeleteRequest: RequestBase
+    internal class OrderDeleteRequest: RequestBase
     {
         public int Ticket { get; set; }
 
         public int? ArrowColor { get; set; }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.OrderDelete;
-        {
-            get { return RequestType.OrderDelete; }
-        }
     }
 }

MtApi/Requests/OrderModifyRequest.cs

@@ -1,6 +1,6 @@
 namespace MtApi.Requests
 {
-    public class OrderModifyRequest: RequestBase
+    internal class OrderModifyRequest: RequestBase
     {
         public int Ticket { get; set; }
         public double Price { get; set; }
@@ -10,9 +10,6 @@
 
         public int? ArrowColor { get; set; }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.OrderModify;
-        {
-            get { return RequestType.OrderModify; }
-        }
     }
 }

MtApi/Requests/OrderSendRequest.cs

@@ -1,6 +1,6 @@
 namespace MtApi.Requests
 {
-    public class OrderSendRequest: RequestBase
+    internal class OrderSendRequest: RequestBase
     {
         public string Symbol { get; set; }
         public int Cmd { get; set; }
@@ -15,9 +15,6 @@
         public int? Expiration { get; set; }
         public int? ArrowColor { get; set; }
 
-        public override RequestType RequestType
+        public override RequestType RequestType => RequestType.OrderSend;
-        {
-            get { return RequestType.OrderSend; }
-        }
     }
 }

MtApi/Requests/RequestBase.cs

@@ -1,8 +1,6 @@
-using Newtonsoft.Json;
+namespace MtApi.Requests
-
-namespace MtApi.Requests
 {
-    public abstract class RequestBase
+    internal abstract class RequestBase
     {
         public abstract RequestType RequestType { get; }
     }

MtApi/Requests/RequestType.cs

@@ -1,16 +1,20 @@
 namespace MtApi.Requests
 {
-    public enum RequestType
+    internal enum RequestType
     {
-        Unknown         = 0,
+        Unknown             = 0,
-        GetOrder        = 1,
+        GetOrder            = 1,
-        GetOrders       = 2,
+        GetOrders           = 2,
-        OrderSend       = 3,
+        OrderSend           = 3,
-        OrderClose      = 4,
+        OrderClose          = 4,
-        OrderCloseBy    = 5,
+        OrderCloseBy        = 5,
-        OrderDelete     = 6,
+        OrderDelete         = 6,
-        OrderModify     = 7,
+        OrderModify         = 7,
-        iCustom         = 8,
+        iCustom             = 8,
-        CopyRates       = 9
+        CopyRates           = 9,
+        Session             = 10,
+        SeriesInfoInteger   = 11,
+        SymbolInfoDouble    = 12,
+        SymbolInfoTick      = 13
     }
 }

MtApi/Requests/SeriesInfoIntegerRequest.cs

@@ -0,0 +1,11 @@
+namespace MtApi.Requests
+{
+    internal class SeriesInfoIntegerRequest: RequestBase
+    {
+        public override RequestType RequestType => RequestType.SeriesInfoInteger;
+
+        public string SymbolName { get; set; }
+        public int Timeframe { get; set; }
+        public int PropId { get; set; }
+    }
+}

MtApi/Requests/SessionRequest.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace MtApi.Requests
+{
+    internal class SessionRequest : RequestBase
+    {
+        public string Symbol { get; set; }
+        public DayOfWeek DayOfWeek { get; set; }
+        public int SessionIndex { get; set; }
+        public SessionType SessionType { get; set; }
+
+        public override RequestType RequestType => RequestType.Session;
+    }
+}

MtApi/Requests/SymbolInfoDoubleRequest.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace MtApi.Requests
+{
+    internal class SymbolInfoDoubleRequest : RequestBase
+    {
+        public override RequestType RequestType => RequestType.SymbolInfoDouble;
+
+        public string SymbolName { get; set; }
+        public int PropId { get; set; }
+    }
+}

MtApi/Requests/SymbolInfoTickRequest.cs

@@ -0,0 +1,9 @@
+namespace MtApi.Requests
+{
+    internal class SymbolInfoTickRequest: RequestBase
+    {
+        public override RequestType RequestType => RequestType.SymbolInfoTick;
+
+        public string Symbol { get; set; }
+    }
+}

MtApi/Responses/CopyRatesResponse.cs

@@ -2,7 +2,7 @@
 
 namespace MtApi.Responses
 {
-    public class CopyRatesResponse: ResponseBase
+    internal class CopyRatesResponse: ResponseBase
     {
         public List<MqlRates> Rates { get; set; }
     }

MtApi/Responses/GetOrderResponse.cs

@@ -1,6 +1,6 @@
 namespace MtApi.Responses
 {
-    public class GetOrderResponse: ResponseBase
+    internal class GetOrderResponse: ResponseBase
     {
         public MtOrder Order { get; set; }
     }

MtApi/Responses/GetOrdersResponse.cs

@@ -2,7 +2,7 @@
 
 namespace MtApi.Responses
 {
-    public class GetOrdersResponse: ResponseBase
+    internal class GetOrdersResponse: ResponseBase
     {
         public List<MtOrder> Orders { get; set; } 
     }

MtApi/Responses/ICustomResponse.cs

@@ -1,12 +1,6 @@
-using System;
+namespace MtApi.Responses
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MtApi.Responses
 {
-    public class ICustomResponse: ResponseBase
+    internal class ICustomResponse: ResponseBase
     {
         public double Value { get; set; }
     }

MtApi/Responses/OrderSendResponse.cs

@@ -1,6 +1,6 @@
 namespace MtApi.Responses
 {
-    public class OrderSendResponse: ResponseBase
+    internal class OrderSendResponse: ResponseBase
     {
         public int Ticket { get; set; }
     }

MtApi/Responses/ResponseBase.cs

@@ -1,6 +1,6 @@
 namespace MtApi.Responses
 {
-    public class ResponseBase
+    internal class ResponseBase
     {
         public int ErrorCode { get; set; }
         public string ErrorMessage { get; set; }

MtApi/Responses/SeriesInfoIntegerResponse.cs

@@ -0,0 +1,7 @@
+namespace MtApi.Responses
+{
+    internal class SeriesInfoIntegerResponse: ResponseBase
+    {
+        public long Value { get; set; }
+    }
+}

MtApi/Responses/SessionResponse.cs

@@ -0,0 +1,7 @@
+namespace MtApi.Responses
+{
+    internal class SessionResponse : ResponseBase
+    {
+        public MtSession Session { get; set; }
+    }
+}

MtApi/Responses/SymbolInfoDoubleResponse.cs

@@ -0,0 +1,7 @@
+namespace MtApi.Responses
+{
+    internal class SymbolInfoDoubleResponse: ResponseBase
+    {
+        public double Value { get; set; }
+    }
+}

MtApi/Responses/SymbolInfoTickResponse.cs

@@ -0,0 +1,7 @@
+namespace MtApi.Responses
+{
+    internal class SymbolInfoTickResponse: ResponseBase
+    {
+        public MqlTick Tick { get; set; }
+    }
+}

MtApi/TimeBarArgs.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MtApi
 {

MtApi/TradeOperation.cs

@@ -1,9 +1,4 @@
-using System;
+namespace MtApi
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MtApi
 {
     public enum TradeOperation
     {

MtApi5/CopyTicksFlag.cs

@@ -0,0 +1,9 @@
+namespace MtApi5
+{
+    public enum CopyTicksFlag
+    {
+        Info    = 1, // ticks with Bid and/or Ask changes
+        Trade   = 2, // ticks with changes in Last and Volume
+        All     = -1 // all ticks
+    }
+}