MirOTR:

! fixed SMP user cancel (we didn't inform our buddy about cancel actions) (dialogs.cpp)
! fixed SMP window handle leaks with all SMP dialogs (CreateDialog() uses DestroyWindow(), not EndDialog()) (dialogs.cpp)
tried to make it clear how a dialog was created by using "DlgProc" for CreateDialog() and "DlgBoxProc" for DialogBox() dialogs

git-svn-id: http://svn.miranda-ng.org/main/trunk@12505 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 898 insertions, 889 deletions

diff --git a/plugins/MirOTR/src/dialogs.cpp b/plugins/MirOTR/src/dialogs.cpp
index d2609bff09..6dd74a5390 100644
--- a/plugins/MirOTR/src/dialogs.cpp
+++ b/plugins/MirOTR/src/dialogs.cpp
@@ -1,759 +1,768 @@
-#include "stdafx.h"

-

-struct SmpData {

-	HWND dialog;

-	TrustLevel oldlevel;

-	ConnContext *context;

-	bool responder;

-	TCHAR *question;

-};

-typedef std::map<HANDLE, SmpData> SmpForContactMap;

-SmpForContactMap smp_for_contact;

-

-

-INT_PTR CALLBACK DlgSMPUpdateProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	switch ( msg ) {

-	case WM_INITDIALOG: 

-		{

-			if (!lParam) {

-				EndDialog(hwndDlg, IDCANCEL);

-				return FALSE;

-			}

-			TranslateDialogDefault( hwndDlg );

-

-			SmpData *data = (SmpData*)lParam;

-			ConnContext *context = data->context;

-			MCONTACT hContact = (MCONTACT)context->app_data;

-			data->dialog = hwndDlg;

-			//smp_for_contact.insert(SmpForContactMap::value_type(context->app_data, *data));

-			if (smp_for_contact[context->app_data].dialog) SendMessage(smp_for_contact[context->app_data].dialog, WMU_REFRESHSMP, 0, 0);

-			smp_for_contact[context->app_data].context = data->context;

-			smp_for_contact[context->app_data].dialog = hwndDlg;

-			smp_for_contact[context->app_data].oldlevel = data->oldlevel;

-			smp_for_contact[context->app_data].responder = data->responder;

-			mir_free(data);

-

-			TCHAR title[512], *proto = mir_a2t(GetContactProto(hContact));

-			const TCHAR *name =contact_get_nameT(hContact);

-			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_PROGRESS_TITLE), name, proto);

-			SetWindowText(hwndDlg, title);

-			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_PROGRESS_DESC), name, proto);

-			mir_free(proto);

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEADPRO, title);

-			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)context);

-

-			// Move window to screen center

-			// Get the owner window and dialog box rectangles. 

-			HWND hwndOwner; RECT rcOwner, rcDlg, rc;

-			if ((hwndOwner = GetParent(hwndDlg)) == NULL) 

-			{

-				hwndOwner = GetDesktopWindow(); 

-			}

-

-			GetWindowRect(hwndOwner, &rcOwner); 

-			GetWindowRect(hwndDlg, &rcDlg); 

-			CopyRect(&rc, &rcOwner); 

-

-			// Offset the owner and dialog box rectangles so that right and bottom 

-			// values represent the width and height, and then offset the owner again 

-			// to discard space taken up by the dialog box. 

-

-			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); 

-			OffsetRect(&rc, -rc.left, -rc.top); 

-			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); 

-

-			// The new position is the sum of half the remaining space and the owner's 

-			// original position. 

-

-			SetWindowPos(hwndDlg, 

-				HWND_TOP, 

-				rcOwner.left + (rc.right / 2), 

-				rcOwner.top + (rc.bottom / 2), 

-				0, 0,          // Ignores size arguments. 

-				SWP_NOSIZE); 

-

-			// end center dialog

-

-			SendDlgItemMessage(hwndDlg, IDC_PGB_SMP, PBM_SETRANGE, 0, MAKELONG(0, 100));

-			SendDlgItemMessage(hwndDlg, IDC_PGB_SMP, PBM_SETPOS, 10, 0);

-

-			EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), true);

-			EnableWindow(GetDlgItem(hwndDlg, IDOK), false);

-

-			return TRUE;

-		}

-

-	case WMU_REFRESHSMP:

-		{

-			ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-			SendDlgItemMessage(hwndDlg, IDC_PGB_SMP, PBM_SETPOS, wParam, 0);

-			switch (wParam) {

-				case 0:

-					EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), false);

-					EnableWindow(GetDlgItem(hwndDlg, IDOK), true);

-					SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, TranslateT(LANG_SMP_ERROR));

-					smp_for_contact.erase(context->app_data);

-					break;

-				case 100:

-					{

-						EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), false);

-						EnableWindow(GetDlgItem(hwndDlg, IDOK), true);

-						smp_for_contact.erase(context->app_data);

-						if (context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {

-							if (context->active_fingerprint->trust && context->active_fingerprint->trust[0]) {

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, TranslateT(LANG_SMP_SUCCESS));

-							}

-							else {

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, TranslateT(LANG_SMP_SUCCESS_VERIFY));

-							}

-						}

-						else {

-							SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, TranslateT(LANG_SMP_FAILED));

-						}

-					}

-					break;

-				default:

-					SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, _T(""));

-			}

-		}

-		break;

-

-	case WM_COMMAND: 

-		switch ( HIWORD( wParam )) {

-			case BN_CLICKED: 

-				{

-					ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-					switch ( LOWORD( wParam )) {

-						case IDCANCEL:

-							otr_abort_smp(context);

-							//break;

-						case IDOK:

-							smp_for_contact.erase(context->app_data);

-							EndDialog(hwndDlg, LOWORD( wParam ));

-							break;

-					}

-				}break;

-		}

-

-	}

-

-	return FALSE;

-}

-

-void SMPInitUpdateDialog(ConnContext *context, bool responder) {

-	if (!context) return;

-	SmpData *data = (SmpData*)mir_calloc(sizeof(SmpData));

-	data->context = context;

-	data->oldlevel = otr_context_get_trust(context);

-	data->responder = responder;

-	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_PROGRESS), 0, DlgSMPUpdateProc, (LPARAM) data);

-}

-

-INT_PTR CALLBACK DlgSMPResponseProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	switch ( msg ) {

-	case WM_INITDIALOG: 

-		{

-			if (!lParam) {

-				EndDialog(hwndDlg, IDCANCEL);

-				return FALSE;

-			}

-			TranslateDialogDefault( hwndDlg );

-

-			SmpData *data = (SmpData*)lParam;

-			ConnContext *context = data->context;

-			MCONTACT hContact = (MCONTACT)context->app_data;

-			data->dialog = hwndDlg;

-			//smp_for_contact.insert(SmpForContactMap::value_type(context->app_data, *data));

-			if (smp_for_contact[context->app_data].dialog) SendMessage(smp_for_contact[context->app_data].dialog, WMU_REFRESHSMP, 0, 0);

-			smp_for_contact[context->app_data].context = data->context;

-			smp_for_contact[context->app_data].dialog = hwndDlg;

-			smp_for_contact[context->app_data].oldlevel = data->oldlevel;

-			smp_for_contact[context->app_data].responder = data->responder;

-

-			TCHAR buff[512], *proto = mir_a2t(GetContactProto(hContact));

-			mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SMP_VERIFY_TITLE), contact_get_nameT(hContact), proto);

-			mir_free(proto);

-			SetWindowText(hwndDlg, buff);

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, buff);

-			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)context);

-

-			if (data->question) {

-				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_RESPOND_DESC), contact_get_nameT(hContact));

-

-				SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

-

-				SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, data->question);

-				SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);

-				SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_SMP_QUESTION));

-

-				SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));

-				SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);

-				SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_ANSWER));

-

-

-				ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);

-				ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);

-				ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);

-

-				mir_free(data->question);

-			} else {

-				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_RESPOND_DESC), contact_get_nameT(hContact));

-

-				SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

-

-				SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, _T(""));

-				SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);

-				SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, _T(""));

-

-				SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));

-				SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);

-				SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_PASSWORD));

-

-

-				ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);

-				ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);

-				ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);

-			}

-			mir_free(data);

-

-			// Move window to screen center

-			// Get the owner window and dialog box rectangles. 

-			HWND hwndOwner; RECT rcOwner, rcDlg, rc;

-			if ((hwndOwner = GetParent(hwndDlg)) == NULL) 

-			{

-				hwndOwner = GetDesktopWindow(); 

-			}

-

-			GetWindowRect(hwndOwner, &rcOwner); 

-			GetWindowRect(hwndDlg, &rcDlg); 

-			CopyRect(&rc, &rcOwner); 

-

-			// Offset the owner and dialog box rectangles so that right and bottom 

-			// values represent the width and height, and then offset the owner again 

-			// to discard space taken up by the dialog box. 

-

-			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); 

-			OffsetRect(&rc, -rc.left, -rc.top); 

-			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); 

-

-			// The new position is the sum of half the remaining space and the owner's 

-			// original position. 

-

-			SetWindowPos(hwndDlg, 

-				HWND_TOP, 

-				rcOwner.left + (rc.right / 2), 

-				rcOwner.top + (rc.bottom / 2), 

-				0, 0,          // Ignores size arguments. 

-				SWP_NOSIZE); 

-

-			// end center dialog

-

-			

-			

-			return TRUE;

-		}

-

-	case WM_COMMAND: 

-		switch ( HIWORD( wParam )) {

-			case BN_CLICKED: 

-				{

-				ConnContext *context = (ConnContext *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-				switch ( LOWORD( wParam )) {	

-					case IDOK:

-						{

-						SMPInitUpdateDialog(context, true);

-						

-						int len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, WM_GETTEXTLENGTH, 0, 0);

-						TCHAR *answer = new TCHAR[len+1];

-						GetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, answer, len+1);

-						char *ans = mir_utf8encodeT(answer);

-						delete[] answer;

-

-						otr_continue_smp(context, (const unsigned char *)ans, strlen(ans));

-						mir_free(ans);

-

-						EndDialog(hwndDlg, LOWORD( wParam ));

-						}break;

-					case IDCANCEL:

-						smp_for_contact.erase(context->app_data);

-						EndDialog(hwndDlg, LOWORD( wParam ));

-						break;

-				}

-				}

-		}

-		break;

-

-	}

-

-	return FALSE;

-}

-

-/*

-void SMPInitResponseDialog(ConnContext *context, const TCHAR *question) {

-	if (!context) return;

-	SmpData *data = (SmpData*)mir_calloc(sizeof(SmpData));

-	data->context = context;

-	data->oldlevel = TRUST_NOT_PRIVATE;

-	data->responder = true;

-	data->question = (question) ? mir_tstrdup(question) : NULL;

-	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgSMPResponseProc, (LPARAM) data);

-}

-*/

-

-INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	switch ( msg ) {

-	case WM_INITDIALOG: 

-		{

-			if (!lParam) {

-				EndDialog(hwndDlg, IDCANCEL);

-				return FALSE;

-			}

-			TranslateDialogDefault( hwndDlg );

-

-			ConnContext *context = (ConnContext*)lParam;

-			if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {

-				EndDialog(hwndDlg, IDCANCEL);

-				return FALSE;

-			}

-

-			MCONTACT hContact = (MCONTACT)context->app_data;

-			TCHAR title[512], *proto = mir_a2t(GetContactProto(hContact));

-			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_VERIFY_TITLE), contact_get_nameT(hContact), proto);

-			mir_free(proto);

-			SetWindowText(hwndDlg, title);

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, title);

-			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

-

-			// Move window to screen center

-			// Get the owner window and dialog box rectangles. 

-			HWND hwndOwner; RECT rcOwner, rcDlg, rc;

-			if ((hwndOwner = GetParent(hwndDlg)) == NULL) 

-			{

-				hwndOwner = GetDesktopWindow(); 

-			}

-

-			GetWindowRect(hwndOwner, &rcOwner); 

-			GetWindowRect(hwndDlg, &rcDlg); 

-			CopyRect(&rc, &rcOwner); 

-

-			// Offset the owner and dialog box rectangles so that right and bottom 

-			// values represent the width and height, and then offset the owner again 

-			// to discard space taken up by the dialog box. 

-

-			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); 

-			OffsetRect(&rc, -rc.left, -rc.top); 

-			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); 

-

-			// The new position is the sum of half the remaining space and the owner's 

-			// original position. 

-

-			SetWindowPos(hwndDlg, 

-				HWND_TOP, 

-				rcOwner.left + (rc.right / 2), 

-				rcOwner.top + (rc.bottom / 2), 

-				0, 0,          // Ignores size arguments. 

-				SWP_NOSIZE); 

-

-			// end center dialog

-

-

-			HWND cmb = GetDlgItem(hwndDlg, IDC_CBO_SMP_CHOOSE);

-			SendMessage(cmb, CB_ADDSTRING, 0, (WPARAM)TranslateT(LANG_SMPTYPE_QUESTION));

-			SendMessage(cmb, CB_ADDSTRING, 0, (WPARAM)TranslateT(LANG_SMPTYPE_PASSWORD));

-			SendMessage(cmb, CB_ADDSTRING, 0, (WPARAM)TranslateT(LANG_SMPTYPE_FINGERPRINT));

-			SendMessage(cmb, CB_SELECTSTRING, -1, (WPARAM)TranslateT(LANG_SMPTYPE_QUESTION));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_CBO_SMP_CHOOSE), TRUE);

-

-			

-			Fingerprint *fp = context->active_fingerprint;

-			if (!fp) {

-				EndDialog(hwndDlg, IDCANCEL);

-				return FALSE;

-			}

-			TCHAR buff[1024];

-			if (!fp->trust || fp->trust[0] == '\0')

-				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT(hContact));

-			else

-				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT(hContact));

-

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

-

-			SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, _T(""));

-			SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, FALSE, 0);

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_SMP_QUESTION));

-			

-			SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));

-			SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_ANSWER));

-

-			

-			ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);

-			ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);

-			ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);

-			SetFocus(GetDlgItem(hwndDlg, IDC_CBO_SMP_CHOOSE));

-			

-			return FALSE;

-		}

-

-	case WM_COMMAND: 

-		switch ( HIWORD( wParam )) {

-			case BN_CLICKED: 

-						{

-							ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-							MCONTACT hContact = (MCONTACT)context->app_data;

-							TCHAR msg[1024];

-						switch ( LOWORD( wParam )) {

-							case IDCANCEL:

-								EndDialog(hwndDlg, LOWORD( wParam ));

-								break;

-							case IDOK:

-								GetDlgItemText(hwndDlg, IDC_CBO_SMP_CHOOSE, msg, 255);

-								if (_tcsncmp(msg, TranslateT(LANG_SMPTYPE_QUESTION), 255)==0) {

-									if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {

-										TCHAR msg[512];

-										mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_SMP_IN_PROGRESS), contact_get_nameT(hContact));

-										ShowError(msg);

-									}else {

-									int len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, WM_GETTEXTLENGTH, 0, 0);

-									TCHAR *question = new TCHAR[len+1];

-									GetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, question, len+1);

-									char *quest = mir_utf8encodeT(question);

-									delete question;

-

-									len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, WM_GETTEXTLENGTH, 0, 0);

-									TCHAR *answer = new TCHAR[len+1];

-									GetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, answer, len+1);

-									char *ans = mir_utf8encodeT(answer);

-									delete answer;

-

-									SMPInitUpdateDialog(context, false);

-									otr_start_smp(context, quest, (const unsigned char*)ans, strlen(ans));

-									mir_free(quest);

-									mir_free(ans);

-									}

-

-								}else if (_tcsncmp(msg, TranslateT(LANG_SMPTYPE_PASSWORD), 255)==0) {

-									if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {

-										TCHAR msg[512];

-										mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_SMP_IN_PROGRESS), contact_get_nameT(hContact));

-										ShowError(msg);

-									}else {

-									int len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, WM_GETTEXTLENGTH, 0, 0);

-									TCHAR *answer = new TCHAR[len+1];

-									GetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, answer, len+1);

-									char *ans = mir_utf8encodeT(answer);

-									delete[] answer;

-

-									SMPInitUpdateDialog(context, false);

-									otr_start_smp(context, NULL, (const unsigned char*)ans, strlen(ans));

-									mir_free(ans);

-									}

-

-								}else break;

-								EndDialog(hwndDlg, LOWORD( wParam ));

-								break;

-							case IDYES:

-								VerifyFingerprint(context, true);

-								EndDialog(hwndDlg, LOWORD( wParam ));

-								break;

-							case IDNO:

-								VerifyFingerprint(context, false);

-								EndDialog(hwndDlg, LOWORD( wParam ));

-								break;

-						}

-						}

-						break;

-			case CBN_SELCHANGE:

-				switch ( LOWORD( wParam )) {	

-					case IDC_CBO_SMP_CHOOSE:

-						{ 

-							ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-							MCONTACT hContact = (MCONTACT)context->app_data;

-							Fingerprint *fp = context->active_fingerprint;

-							if (!fp) {

-								EndDialog(hwndDlg, IDCANCEL);

-								return TRUE;

-							}

-							BOOL trusted = false;

-							if (fp->trust && fp->trust[0] != '\0') trusted = true;

-

-							TCHAR buff[512];

-							GetDlgItemText(hwndDlg, IDC_CBO_SMP_CHOOSE, buff, 255);

-							if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_QUESTION), 255)==0) {

-								if (trusted)

-									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT(hContact));

-								else

-									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT(hContact));

-

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

-

-								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, _T(""));

-								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, FALSE, 0);

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_SMP_QUESTION));

-

-								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));

-								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_ANSWER));

-

-

-								ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);

-								ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);

-								ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);

-							} else if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_PASSWORD), 255)==0) {

-								if (trusted)

-									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_VERIFIED_DESC), contact_get_nameT(hContact));

-								else

-									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_VERIFY_DESC), contact_get_nameT(hContact));

-

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

-

-								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, _T(""));

-								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, _T(""));

-

-								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));

-								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_PASSWORD));

-

-

-								ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);

-								ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);

-								ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);

-							} else if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_FINGERPRINT), 255)==0) {

-								if (trusted)

-									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT(hContact));

-								else

-									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFY_DESC), contact_get_nameT(hContact));

-

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

-

-								unsigned char hash[20];

-								lib_cs_lock();

-								if (!otrl_privkey_fingerprint_raw(otr_user_state, hash, context->accountname, context->protocol)) {

-									lib_cs_unlock();

-									EndDialog(hwndDlg, IDCANCEL);

-									return FALSE;

-								}

-								otrl_privkey_hash_to_humanT(buff, hash);

-								lib_cs_unlock();

-								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, buff);

-								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_YOUR_PRIVKEY));

-

-								otrl_privkey_hash_to_humanT(buff, fp->fingerprint);

-								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, buff);

-								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, TRUE, 0);

-								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_CONTACT_FINGERPRINT));

-

-								ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_HIDE);

-								ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_SHOWNA);

-								ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_SHOWNA);

-

-							}

-						}break;

-				}

-		}

-		break;

-

-	}

-

-	return FALSE;

-}

-void SMPInitDialog(ConnContext *context) {

-	if (context)

-		CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgProcSMPInitProc, (LPARAM) context);

-}

-

-void SMPDialogUpdate(ConnContext *context, int percent) {

-	if (!context) return;

-	SmpForContactMap::iterator it = smp_for_contact.find(context->app_data);

-	if (it == smp_for_contact.end())	return;

-	if (it->second.dialog) PostMessage(it->second.dialog, WMU_REFRESHSMP, percent, 0);

-	TrustLevel level = otr_context_get_trust(context);

-	if (!it->second.responder && it->second.oldlevel != level) {

-		if (level == TRUST_PRIVATE) 

-			VerifyFingerprintMessage(context, true);

-		else if (level == TRUST_UNVERIFIED)

-			VerifyFingerprintMessage(context, false);

-	}

-	//if (percent == 100)

-	/*

-	switch (percent){

-		case 0:

-			VerifyFingerprint(context, false);

-			ShowWarning(_T("SMP failed"));

-			break;

-		case 100:

-			VerifyFingerprint(context, true);

-			ShowWarning(_T("SMP successful"));

-			break;

-		default:

-			ShowWarning(_T("Received an SMP update"));

-	}

-	*/

-}

-void SMPDialogReply(ConnContext *context, const char* question){

-	SmpData *data = (SmpData*)mir_calloc(sizeof(SmpData));

-	data->context = context;

-	data->oldlevel = TRUST_NOT_PRIVATE;

-	data->responder = true;

-	data->question = (question) ? mir_utf8decodeT(question) : NULL;

-	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgSMPResponseProc, (LPARAM) data);

-	/*

-	ShowError(_T("SMP requires user password (NOT IMPL YET)"));

-	otr_abort_smp(context);

-	*/

-	//otr_continue_smp(context, pass, strlen(pass));

-}

-

-unsigned int CALLBACK verify_context_thread(void *param);

-void VerifyContextDialog(ConnContext* context) {

-	if (!context) return;

-	CloseHandle((HANDLE)_beginthreadex(0, 0, verify_context_thread, context, 0, 0));

-}

-

-INT_PTR CALLBACK DlgProcVerifyContext(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	switch ( msg ) {

-	case WM_INITDIALOG: 

-		{

-			if (!lParam) {

-				EndDialog(hwndDlg, IDCANCEL);

-				return FALSE;

-			}

-			SetWindowText(hwndDlg, _T(LANG_OTR_FPVERIFY_TITLE));

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, _T(LANG_OTR_FPVERIFY_TITLE));

-			TranslateDialogDefault( hwndDlg );

-			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

-

-			// Move window to screen center

-			// Get the owner window and dialog box rectangles. 

-			HWND hwndOwner; RECT rcOwner, rcDlg, rc;

-			if ((hwndOwner = GetParent(hwndDlg)) == NULL) 

-			{

-				hwndOwner = GetDesktopWindow(); 

-			}

-

-			GetWindowRect(hwndOwner, &rcOwner); 

-			GetWindowRect(hwndDlg, &rcDlg); 

-			CopyRect(&rc, &rcOwner); 

-

-			// Offset the owner and dialog box rectangles so that right and bottom 

-			// values represent the width and height, and then offset the owner again 

-			// to discard space taken up by the dialog box. 

-

-			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); 

-			OffsetRect(&rc, -rc.left, -rc.top); 

-			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); 

-

-			// The new position is the sum of half the remaining space and the owner's 

-			// original position. 

-

-			SetWindowPos(hwndDlg, 

-				HWND_TOP, 

-				rcOwner.left + (rc.right / 2), 

-				rcOwner.top + (rc.bottom / 2), 

-				0, 0,          // Ignores size arguments. 

-				SWP_NOSIZE); 

-

-			// end center dialog

-

-			ConnContext *context = (ConnContext*)lParam;

-			MCONTACT hContact = (MCONTACT) context->app_data;

-			Fingerprint *fp = context->active_fingerprint;

-			if (!fp) {

-				EndDialog(hwndDlg, IDCANCEL);

-				return FALSE;

-			}

-			TCHAR buff[512];

-			if (!fp->trust || fp->trust[0] == '\0')

-				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFY_DESC), contact_get_nameT(hContact));

-			else

-				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT(hContact));

-

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

-

-			unsigned char hash[20];

-			lib_cs_lock();

-			if (!otrl_privkey_fingerprint_raw(otr_user_state, hash, context->accountname, context->protocol)) {

-				lib_cs_unlock();

-				EndDialog(hwndDlg, IDCANCEL);

-				return FALSE;

-			}

-			otrl_privkey_hash_to_humanT(buff, hash);

-			lib_cs_unlock();

-			SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, buff);

-			SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_YOUR_PRIVKEY));

-			

-			otrl_privkey_hash_to_humanT(buff, fp->fingerprint);

-			SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, buff);

-			SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, TRUE, 0);

-			SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_CONTACT_FINGERPRINT));

-

-			EnableWindow(GetDlgItem(hwndDlg, IDC_CBO_SMP_CHOOSE), FALSE);

-

-			ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_HIDE);

-			ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_SHOWNA);

-			ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_SHOWNA);

-			SetFocus(GetDlgItem(hwndDlg, IDCANCEL));

-			

-			return FALSE;

-		}

-

-	case WM_COMMAND: 

-		switch ( HIWORD( wParam )) {

-			case BN_CLICKED: 

-				switch ( LOWORD( wParam )) {	

-					case IDYES:

-					case IDNO:

-					case IDCANCEL:

-					case IDOK:

-						EndDialog(hwndDlg, LOWORD( wParam ));

-						break;

-				}

-		}

-		break;

-

-	}

-

-	return FALSE;

-}

-

-unsigned int CALLBACK verify_context_thread(void *param)

-{

-	Thread_Push( 0 );

-

-	if (param) {

-		ConnContext *context = (ConnContext *)param;

-		MCONTACT hContact = (MCONTACT)context->app_data;

-		TCHAR msg[1024];

-		switch ( DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgProcVerifyContext, (LPARAM)param) ) {

-			case IDOK:

-			case IDYES:

-				lib_cs_lock();

-				otrl_context_set_trust(context->active_fingerprint, "verified");

-				otrl_privkey_write_fingerprints(otr_user_state, g_fingerprint_store_filename);

-				lib_cs_unlock();

-				mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_FINGERPRINT_VERIFIED), contact_get_nameT(hContact));

-				ShowMessage(hContact, msg);

-				SetEncryptionStatus(hContact, otr_context_get_trust(context));

-				break;

-			case IDNO:

-				lib_cs_lock();

-				otrl_context_set_trust(context->active_fingerprint, NULL);

-				otrl_privkey_write_fingerprints(otr_user_state, g_fingerprint_store_filename);

-				lib_cs_unlock();

-				mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_FINGERPRINT_NOT_VERIFIED), contact_get_nameT(hContact));

-				ShowMessage(hContact, msg);

-				SetEncryptionStatus(hContact, otr_context_get_trust(context));

-				break;

-		}

-	}

-

-	Thread_Pop();

-	return 0; 

-}
\ No newline at end of file
+#include "stdafx.h"
+
+struct SmpData {
+	HWND dialog;
+	TrustLevel oldlevel;
+	ConnContext *context;
+	bool responder;
+	TCHAR *question;
+};
+typedef std::map<HANDLE, SmpData> SmpForContactMap;
+SmpForContactMap smp_for_contact;
+
+
+INT_PTR CALLBACK DlgSMPUpdateProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	switch ( msg ) {
+	case WM_DESTROY:{
+		ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+		if(context)
+			otr_abort_smp(context);
+		break;}
+	case WM_INITDIALOG:
+		{
+			if (!lParam) {
+				DestroyWindow(hwndDlg);
+				return FALSE;
+			}
+			TranslateDialogDefault( hwndDlg );
+
+			SmpData *data = (SmpData*)lParam;
+			ConnContext *context = data->context;
+			MCONTACT hContact = (MCONTACT)context->app_data;
+			data->dialog = hwndDlg;
+			//smp_for_contact.insert(SmpForContactMap::value_type(context->app_data, *data));
+			if (smp_for_contact[context->app_data].dialog) SendMessage(smp_for_contact[context->app_data].dialog, WMU_REFRESHSMP, 0, 0);
+			smp_for_contact[context->app_data].context = data->context;
+			smp_for_contact[context->app_data].dialog = hwndDlg;
+			smp_for_contact[context->app_data].oldlevel = data->oldlevel;
+			smp_for_contact[context->app_data].responder = data->responder;
+			mir_free(data);
+
+			TCHAR title[512], *proto = mir_a2t(GetContactProto(hContact));
+			const TCHAR *name =contact_get_nameT(hContact);
+			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_PROGRESS_TITLE), name, proto);
+			SetWindowText(hwndDlg, title);
+			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_PROGRESS_DESC), name, proto);
+			mir_free(proto);
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEADPRO, title);
+			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)context);
+
+			// Move window to screen center
+			// Get the owner window and dialog box rectangles. 
+			HWND hwndOwner; RECT rcOwner, rcDlg, rc;
+			if ((hwndOwner = GetParent(hwndDlg)) == NULL) 
+			{
+				hwndOwner = GetDesktopWindow(); 
+			}
+
+			GetWindowRect(hwndOwner, &rcOwner); 
+			GetWindowRect(hwndDlg, &rcDlg); 
+			CopyRect(&rc, &rcOwner); 
+
+			// Offset the owner and dialog box rectangles so that right and bottom 
+			// values represent the width and height, and then offset the owner again 
+			// to discard space taken up by the dialog box. 
+
+			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); 
+			OffsetRect(&rc, -rc.left, -rc.top); 
+			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); 
+
+			// The new position is the sum of half the remaining space and the owner's 
+			// original position. 
+
+			SetWindowPos(hwndDlg, 
+				HWND_TOP, 
+				rcOwner.left + (rc.right / 2), 
+				rcOwner.top + (rc.bottom / 2), 
+				0, 0,          // Ignores size arguments. 
+				SWP_NOSIZE); 
+
+			// end center dialog
+
+			SendDlgItemMessage(hwndDlg, IDC_PGB_SMP, PBM_SETRANGE, 0, MAKELONG(0, 100));
+			SendDlgItemMessage(hwndDlg, IDC_PGB_SMP, PBM_SETPOS, 10, 0);
+
+			EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), true);
+			EnableWindow(GetDlgItem(hwndDlg, IDOK), false);
+
+			return TRUE;
+		}
+
+	case WMU_REFRESHSMP:
+		{
+			ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+			SendDlgItemMessage(hwndDlg, IDC_PGB_SMP, PBM_SETPOS, wParam, 0);
+			switch (wParam) {
+				case 0:
+					EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), false);
+					EnableWindow(GetDlgItem(hwndDlg, IDOK), true);
+					SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, TranslateT(LANG_SMP_ERROR));
+					smp_for_contact.erase(context->app_data);
+					break;
+				case 100:
+					{
+						EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), false);
+						EnableWindow(GetDlgItem(hwndDlg, IDOK), true);
+						smp_for_contact.erase(context->app_data);
+						if (context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
+							if (context->active_fingerprint->trust && context->active_fingerprint->trust[0]) {
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, TranslateT(LANG_SMP_SUCCESS));
+							}
+							else {
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, TranslateT(LANG_SMP_SUCCESS_VERIFY));
+							}
+						}
+						else {
+							SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, TranslateT(LANG_SMP_FAILED));
+						}
+					}
+					break;
+				default:
+					SetDlgItemText(hwndDlg, IDC_STC_SMP_PROGRESS, _T(""));
+			}
+		}
+		break;
+
+	case WM_COMMAND: 
+		switch ( HIWORD( wParam )) {
+			case BN_CLICKED: 
+				{
+					ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+					switch ( LOWORD( wParam )) {
+						case IDOK:
+							smp_for_contact.erase(context->app_data);
+							SetWindowLongPtr(hwndDlg, GWLP_USERDATA, NULL);
+						case IDCANCEL:
+							DestroyWindow(hwndDlg);
+							break;
+					}
+				}break;
+		}
+
+	}
+
+	return FALSE;
+}
+
+void SMPInitUpdateDialog(ConnContext *context, bool responder) {
+	if (!context) return;
+	SmpData *data = (SmpData*)mir_calloc(sizeof(SmpData));
+	data->context = context;
+	data->oldlevel = otr_context_get_trust(context);
+	data->responder = responder;
+	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_PROGRESS), 0, DlgSMPUpdateProc, (LPARAM) data);
+}
+
+INT_PTR CALLBACK DlgSMPResponseProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	switch ( msg ) {
+	case WM_DESTROY:{
+		ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+		if(context)
+			otr_abort_smp(context);
+		break;}
+	case WM_INITDIALOG: 
+		{
+			if (!lParam) {
+				DestroyWindow(hwndDlg);
+				return FALSE;
+			}
+			TranslateDialogDefault( hwndDlg );
+
+			SmpData *data = (SmpData*)lParam;
+			ConnContext *context = data->context;
+			MCONTACT hContact = (MCONTACT)context->app_data;
+			data->dialog = hwndDlg;
+			//smp_for_contact.insert(SmpForContactMap::value_type(context->app_data, *data));
+			if (smp_for_contact[context->app_data].dialog) SendMessage(smp_for_contact[context->app_data].dialog, WMU_REFRESHSMP, 0, 0);
+			smp_for_contact[context->app_data].context = data->context;
+			smp_for_contact[context->app_data].dialog = hwndDlg;
+			smp_for_contact[context->app_data].oldlevel = data->oldlevel;
+			smp_for_contact[context->app_data].responder = data->responder;
+
+			TCHAR buff[512], *proto = mir_a2t(GetContactProto(hContact));
+			mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SMP_VERIFY_TITLE), contact_get_nameT(hContact), proto);
+			mir_free(proto);
+			SetWindowText(hwndDlg, buff);
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, buff);
+			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)context);
+
+			if (data->question) {
+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_RESPOND_DESC), contact_get_nameT(hContact));
+
+				SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
+
+				SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, data->question);
+				SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);
+				SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_SMP_QUESTION));
+
+				SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));
+				SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);
+				SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_ANSWER));
+
+
+				ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);
+				ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);
+				ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);
+
+				mir_free(data->question);
+			} else {
+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_RESPOND_DESC), contact_get_nameT(hContact));
+
+				SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
+
+				SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, _T(""));
+				SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);
+				SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, _T(""));
+
+				SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));
+				SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);
+				SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_PASSWORD));
+
+
+				ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);
+				ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);
+				ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);
+			}
+			mir_free(data);
+
+			// Move window to screen center
+			// Get the owner window and dialog box rectangles. 
+			HWND hwndOwner; RECT rcOwner, rcDlg, rc;
+			if ((hwndOwner = GetParent(hwndDlg)) == NULL) 
+			{
+				hwndOwner = GetDesktopWindow(); 
+			}
+
+			GetWindowRect(hwndOwner, &rcOwner); 
+			GetWindowRect(hwndDlg, &rcDlg); 
+			CopyRect(&rc, &rcOwner); 
+
+			// Offset the owner and dialog box rectangles so that right and bottom 
+			// values represent the width and height, and then offset the owner again 
+			// to discard space taken up by the dialog box. 
+
+			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); 
+			OffsetRect(&rc, -rc.left, -rc.top); 
+			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); 
+
+			// The new position is the sum of half the remaining space and the owner's 
+			// original position. 
+
+			SetWindowPos(hwndDlg, 
+				HWND_TOP, 
+				rcOwner.left + (rc.right / 2), 
+				rcOwner.top + (rc.bottom / 2), 
+				0, 0,          // Ignores size arguments. 
+				SWP_NOSIZE); 
+
+			// end center dialog
+
+			
+			
+			return TRUE;
+		}
+
+	case WM_COMMAND: 
+		switch ( HIWORD( wParam )) {
+			case BN_CLICKED: 
+				{
+				ConnContext *context = (ConnContext *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+				switch ( LOWORD( wParam )) {	
+					case IDOK:
+						{
+						SMPInitUpdateDialog(context, true);
+						
+						int len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, WM_GETTEXTLENGTH, 0, 0);
+						TCHAR *answer = new TCHAR[len+1];
+						GetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, answer, len+1);
+						char *ans = mir_utf8encodeT(answer);
+						delete[] answer;
+
+						otr_continue_smp(context, (const unsigned char *)ans, strlen(ans));
+						mir_free(ans);
+						SetWindowLongPtr(hwndDlg, GWLP_USERDATA, NULL);
+						DestroyWindow(hwndDlg);
+						}break;
+					case IDCANCEL:
+						smp_for_contact.erase(context->app_data);
+						DestroyWindow(hwndDlg);
+						break;
+				}
+				}
+		}
+		break;
+
+	}
+
+	return FALSE;
+}
+
+/*
+void SMPInitResponseDialog(ConnContext *context, const TCHAR *question) {
+	if (!context) return;
+	SmpData *data = (SmpData*)mir_calloc(sizeof(SmpData));
+	data->context = context;
+	data->oldlevel = TRUST_NOT_PRIVATE;
+	data->responder = true;
+	data->question = (question) ? mir_tstrdup(question) : NULL;
+	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgSMPResponseProc, (LPARAM) data);
+}
+*/
+
+INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	switch ( msg ) {
+	case WM_INITDIALOG: 
+		{
+			if (!lParam) {
+				DestroyWindow(hwndDlg);
+				return FALSE;
+			}
+			TranslateDialogDefault( hwndDlg );
+
+			ConnContext *context = (ConnContext*)lParam;
+			if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {
+				DestroyWindow(hwndDlg);
+				return FALSE;
+			}
+
+			MCONTACT hContact = (MCONTACT)context->app_data;
+			TCHAR title[512], *proto = mir_a2t(GetContactProto(hContact));
+			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_VERIFY_TITLE), contact_get_nameT(hContact), proto);
+			mir_free(proto);
+			SetWindowText(hwndDlg, title);
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, title);
+			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
+
+			// Move window to screen center
+			// Get the owner window and dialog box rectangles. 
+			HWND hwndOwner; RECT rcOwner, rcDlg, rc;
+			if ((hwndOwner = GetParent(hwndDlg)) == NULL) 
+			{
+				hwndOwner = GetDesktopWindow(); 
+			}
+
+			GetWindowRect(hwndOwner, &rcOwner); 
+			GetWindowRect(hwndDlg, &rcDlg); 
+			CopyRect(&rc, &rcOwner); 
+
+			// Offset the owner and dialog box rectangles so that right and bottom 
+			// values represent the width and height, and then offset the owner again 
+			// to discard space taken up by the dialog box. 
+
+			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); 
+			OffsetRect(&rc, -rc.left, -rc.top); 
+			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); 
+
+			// The new position is the sum of half the remaining space and the owner's 
+			// original position. 
+
+			SetWindowPos(hwndDlg, 
+				HWND_TOP, 
+				rcOwner.left + (rc.right / 2), 
+				rcOwner.top + (rc.bottom / 2), 
+				0, 0,          // Ignores size arguments. 
+				SWP_NOSIZE); 
+
+			// end center dialog
+
+
+			HWND cmb = GetDlgItem(hwndDlg, IDC_CBO_SMP_CHOOSE);
+			SendMessage(cmb, CB_ADDSTRING, 0, (WPARAM)TranslateT(LANG_SMPTYPE_QUESTION));
+			SendMessage(cmb, CB_ADDSTRING, 0, (WPARAM)TranslateT(LANG_SMPTYPE_PASSWORD));
+			SendMessage(cmb, CB_ADDSTRING, 0, (WPARAM)TranslateT(LANG_SMPTYPE_FINGERPRINT));
+			SendMessage(cmb, CB_SELECTSTRING, -1, (WPARAM)TranslateT(LANG_SMPTYPE_QUESTION));
+			EnableWindow(GetDlgItem(hwndDlg, IDC_CBO_SMP_CHOOSE), TRUE);
+
+			
+			Fingerprint *fp = context->active_fingerprint;
+			if (!fp) {
+				DestroyWindow(hwndDlg);
+				return FALSE;
+			}
+			TCHAR buff[1024];
+			if (!fp->trust || fp->trust[0] == '\0')
+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT(hContact));
+			else
+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT(hContact));
+
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
+
+			SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, _T(""));
+			SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, FALSE, 0);
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_SMP_QUESTION));
+			
+			SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));
+			SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_ANSWER));
+
+			
+			ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);
+			ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);
+			ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);
+			SetFocus(GetDlgItem(hwndDlg, IDC_CBO_SMP_CHOOSE));
+			
+			return FALSE;
+		}
+
+	case WM_COMMAND: 
+		switch ( HIWORD( wParam )) {
+			case BN_CLICKED: 
+						{
+							ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+							MCONTACT hContact = (MCONTACT)context->app_data;
+							TCHAR msg[1024];
+						switch ( LOWORD( wParam )) {
+							case IDCANCEL:
+								DestroyWindow(hwndDlg);
+								break;
+							case IDOK:
+								GetDlgItemText(hwndDlg, IDC_CBO_SMP_CHOOSE, msg, 255);
+								if (_tcsncmp(msg, TranslateT(LANG_SMPTYPE_QUESTION), 255)==0) {
+									if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {
+										TCHAR msg[512];
+										mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_SMP_IN_PROGRESS), contact_get_nameT(hContact));
+										ShowError(msg);
+									}else {
+									int len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, WM_GETTEXTLENGTH, 0, 0);
+									TCHAR *question = new TCHAR[len+1];
+									GetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, question, len+1);
+									char *quest = mir_utf8encodeT(question);
+									delete question;
+
+									len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, WM_GETTEXTLENGTH, 0, 0);
+									TCHAR *answer = new TCHAR[len+1];
+									GetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, answer, len+1);
+									char *ans = mir_utf8encodeT(answer);
+									delete answer;
+
+									SMPInitUpdateDialog(context, false);
+									otr_start_smp(context, quest, (const unsigned char*)ans, strlen(ans));
+									mir_free(quest);
+									mir_free(ans);
+									}
+
+								}else if (_tcsncmp(msg, TranslateT(LANG_SMPTYPE_PASSWORD), 255)==0) {
+									if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {
+										TCHAR msg[512];
+										mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_SMP_IN_PROGRESS), contact_get_nameT(hContact));
+										ShowError(msg);
+									}else {
+									int len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, WM_GETTEXTLENGTH, 0, 0);
+									TCHAR *answer = new TCHAR[len+1];
+									GetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, answer, len+1);
+									char *ans = mir_utf8encodeT(answer);
+									delete[] answer;
+
+									SMPInitUpdateDialog(context, false);
+									otr_start_smp(context, NULL, (const unsigned char*)ans, strlen(ans));
+									mir_free(ans);
+									}
+
+								}else break;
+								DestroyWindow(hwndDlg);
+								break;
+							case IDYES:
+								VerifyFingerprint(context, true);
+								DestroyWindow(hwndDlg);
+								break;
+							case IDNO:
+								VerifyFingerprint(context, false);
+								DestroyWindow(hwndDlg);
+								break;
+						}
+						}
+						break;
+			case CBN_SELCHANGE:
+				switch ( LOWORD( wParam )) {	
+					case IDC_CBO_SMP_CHOOSE:
+						{ 
+							ConnContext *context = (ConnContext*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+							MCONTACT hContact = (MCONTACT)context->app_data;
+							Fingerprint *fp = context->active_fingerprint;
+							if (!fp) {
+								DestroyWindow(hwndDlg);
+								return TRUE;
+							}
+							BOOL trusted = false;
+							if (fp->trust && fp->trust[0] != '\0') trusted = true;
+
+							TCHAR buff[512];
+							GetDlgItemText(hwndDlg, IDC_CBO_SMP_CHOOSE, buff, 255);
+							if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_QUESTION), 255)==0) {
+								if (trusted)
+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT(hContact));
+								else
+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT(hContact));
+
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
+
+								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, _T(""));
+								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, FALSE, 0);
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_SMP_QUESTION));
+
+								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));
+								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_ANSWER));
+
+
+								ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);
+								ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);
+								ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);
+							} else if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_PASSWORD), 255)==0) {
+								if (trusted)
+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_VERIFIED_DESC), contact_get_nameT(hContact));
+								else
+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_VERIFY_DESC), contact_get_nameT(hContact));
+
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
+
+								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, _T(""));
+								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, _T(""));
+
+								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, _T(""));
+								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, FALSE, 0);
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_SMP_PASSWORD));
+
+
+								ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_SHOWNA);
+								ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_HIDE);
+								ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);
+							} else if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_FINGERPRINT), 255)==0) {
+								if (trusted)
+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT(hContact));
+								else
+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFY_DESC), contact_get_nameT(hContact));
+
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
+
+								unsigned char hash[20];
+								lib_cs_lock();
+								if (!otrl_privkey_fingerprint_raw(otr_user_state, hash, context->accountname, context->protocol)) {
+									lib_cs_unlock();
+									DestroyWindow(hwndDlg);
+									return FALSE;
+								}
+								otrl_privkey_hash_to_humanT(buff, hash);
+								lib_cs_unlock();
+								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, buff);
+								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_YOUR_PRIVKEY));
+
+								otrl_privkey_hash_to_humanT(buff, fp->fingerprint);
+								SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, buff);
+								SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, TRUE, 0);
+								SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_CONTACT_FINGERPRINT));
+
+								ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_HIDE);
+								ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_SHOWNA);
+								ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_SHOWNA);
+
+							}
+						}break;
+				}
+		}
+		break;
+
+	}
+
+	return FALSE;
+}
+void SMPInitDialog(ConnContext *context) {
+	if (context)
+		CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgProcSMPInitProc, (LPARAM) context);
+}
+
+void SMPDialogUpdate(ConnContext *context, int percent) {
+	if (!context) return;
+	SmpForContactMap::iterator it = smp_for_contact.find(context->app_data);
+	if (it == smp_for_contact.end())	return;
+	if (it->second.dialog) PostMessage(it->second.dialog, WMU_REFRESHSMP, percent, 0);
+	TrustLevel level = otr_context_get_trust(context);
+	if (!it->second.responder && it->second.oldlevel != level) {
+		if (level == TRUST_PRIVATE) 
+			VerifyFingerprintMessage(context, true);
+		else if (level == TRUST_UNVERIFIED)
+			VerifyFingerprintMessage(context, false);
+	}
+	//if (percent == 100)
+	/*
+	switch (percent){
+		case 0:
+			VerifyFingerprint(context, false);
+			ShowWarning(_T("SMP failed"));
+			break;
+		case 100:
+			VerifyFingerprint(context, true);
+			ShowWarning(_T("SMP successful"));
+			break;
+		default:
+			ShowWarning(_T("Received an SMP update"));
+	}
+	*/
+}
+void SMPDialogReply(ConnContext *context, const char* question){
+	SmpData *data = (SmpData*)mir_calloc(sizeof(SmpData));
+	data->context = context;
+	data->oldlevel = TRUST_NOT_PRIVATE;
+	data->responder = true;
+	data->question = (question) ? mir_utf8decodeT(question) : NULL;
+	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgSMPResponseProc, (LPARAM) data);
+	/*
+	ShowError(_T("SMP requires user password (NOT IMPL YET)"));
+	otr_abort_smp(context);
+	*/
+	//otr_continue_smp(context, pass, strlen(pass));
+}
+
+unsigned int CALLBACK verify_context_thread(void *param);
+void VerifyContextDialog(ConnContext* context) {
+	if (!context) return;
+	CloseHandle((HANDLE)_beginthreadex(0, 0, verify_context_thread, context, 0, 0));
+}
+
+INT_PTR CALLBACK DlgBoxProcVerifyContext(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	switch ( msg ) {
+	case WM_INITDIALOG: 
+		{
+			if (!lParam) {
+				EndDialog(hwndDlg, IDCANCEL);
+				return FALSE;
+			}
+			SetWindowText(hwndDlg, _T(LANG_OTR_FPVERIFY_TITLE));
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, _T(LANG_OTR_FPVERIFY_TITLE));
+			TranslateDialogDefault( hwndDlg );
+			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
+
+			// Move window to screen center
+			// Get the owner window and dialog box rectangles. 
+			HWND hwndOwner; RECT rcOwner, rcDlg, rc;
+			if ((hwndOwner = GetParent(hwndDlg)) == NULL) 
+			{
+				hwndOwner = GetDesktopWindow(); 
+			}
+
+			GetWindowRect(hwndOwner, &rcOwner); 
+			GetWindowRect(hwndDlg, &rcDlg); 
+			CopyRect(&rc, &rcOwner); 
+
+			// Offset the owner and dialog box rectangles so that right and bottom 
+			// values represent the width and height, and then offset the owner again 
+			// to discard space taken up by the dialog box. 
+
+			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); 
+			OffsetRect(&rc, -rc.left, -rc.top); 
+			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); 
+
+			// The new position is the sum of half the remaining space and the owner's 
+			// original position. 
+
+			SetWindowPos(hwndDlg, 
+				HWND_TOP, 
+				rcOwner.left + (rc.right / 2), 
+				rcOwner.top + (rc.bottom / 2), 
+				0, 0,          // Ignores size arguments. 
+				SWP_NOSIZE); 
+
+			// end center dialog
+
+			ConnContext *context = (ConnContext*)lParam;
+			MCONTACT hContact = (MCONTACT) context->app_data;
+			Fingerprint *fp = context->active_fingerprint;
+			if (!fp) {
+				EndDialog(hwndDlg, IDCANCEL);
+				return FALSE;
+			}
+			TCHAR buff[512];
+			if (!fp->trust || fp->trust[0] == '\0')
+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFY_DESC), contact_get_nameT(hContact));
+			else
+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT(hContact));
+
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
+
+			unsigned char hash[20];
+			lib_cs_lock();
+			if (!otrl_privkey_fingerprint_raw(otr_user_state, hash, context->accountname, context->protocol)) {
+				lib_cs_unlock();
+				EndDialog(hwndDlg, IDCANCEL);
+				return FALSE;
+			}
+			otrl_privkey_hash_to_humanT(buff, hash);
+			lib_cs_unlock();
+			SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD1, buff);
+			SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, EM_SETREADONLY, TRUE, 0);
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD1, TranslateT(LANG_YOUR_PRIVKEY));
+			
+			otrl_privkey_hash_to_humanT(buff, fp->fingerprint);
+			SetDlgItemText(hwndDlg, IDC_EDT_SMP_FIELD2, buff);
+			SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, EM_SETREADONLY, TRUE, 0);
+			SetDlgItemText(hwndDlg, IDC_STC_SMP_FIELD2, TranslateT(LANG_CONTACT_FINGERPRINT));
+
+			EnableWindow(GetDlgItem(hwndDlg, IDC_CBO_SMP_CHOOSE), FALSE);
+
+			ShowWindow(GetDlgItem(hwndDlg, IDOK), SW_HIDE);
+			ShowWindow(GetDlgItem(hwndDlg, IDYES), SW_SHOWNA);
+			ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_SHOWNA);
+			SetFocus(GetDlgItem(hwndDlg, IDCANCEL));
+			
+			return FALSE;
+		}
+
+	case WM_COMMAND: 
+		switch ( HIWORD( wParam )) {
+			case BN_CLICKED: 
+				switch ( LOWORD( wParam )) {	
+					case IDYES:
+					case IDNO:
+					case IDCANCEL:
+					case IDOK:
+						EndDialog(hwndDlg, LOWORD( wParam ));
+						break;
+				}
+		}
+		break;
+
+	}
+
+	return FALSE;
+}
+
+unsigned int CALLBACK verify_context_thread(void *param)
+{
+	Thread_Push( 0 );
+
+	if (param) {
+		ConnContext *context = (ConnContext *)param;
+		MCONTACT hContact = (MCONTACT)context->app_data;
+		TCHAR msg[1024];
+		switch ( DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgBoxProcVerifyContext, (LPARAM)param) ) {
+			case IDOK:
+			case IDYES:
+				lib_cs_lock();
+				otrl_context_set_trust(context->active_fingerprint, "verified");
+				otrl_privkey_write_fingerprints(otr_user_state, g_fingerprint_store_filename);
+				lib_cs_unlock();
+				mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_FINGERPRINT_VERIFIED), contact_get_nameT(hContact));
+				ShowMessage(hContact, msg);
+				SetEncryptionStatus(hContact, otr_context_get_trust(context));
+				break;
+			case IDNO:
+				lib_cs_lock();
+				otrl_context_set_trust(context->active_fingerprint, NULL);
+				otrl_privkey_write_fingerprints(otr_user_state, g_fingerprint_store_filename);
+				lib_cs_unlock();
+				mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_FINGERPRINT_NOT_VERIFIED), contact_get_nameT(hContact));
+				ShowMessage(hContact, msg);
+				SetEncryptionStatus(hContact, otr_context_get_trust(context));
+				break;
+		}
+	}
+
+	Thread_Pop();
+	return 0; 
+}
diff --git a/plugins/MirOTR/src/dialogs.h b/plugins/MirOTR/src/dialogs.h
index 0422dc3095..39db06189f 100644
--- a/plugins/MirOTR/src/dialogs.h
+++ b/plugins/MirOTR/src/dialogs.h
@@ -1,8 +1,8 @@
-#pragma once

-void VerifyContextDialog(ConnContext* context);

-void SMPInitDialog(ConnContext* context);

-INT_PTR CALLBACK DlgProcVerifyContext(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-void SMPDialogUpdate(ConnContext *context, int percent);

-void SMPDialogReply(ConnContext *context, const char* question);

-

-#define WMU_REFRESHSMP			(WM_USER + 245)
\ No newline at end of file
+#pragma once
+void VerifyContextDialog(ConnContext* context);
+void SMPInitDialog(ConnContext* context);
+INT_PTR CALLBACK DlgBoxProcVerifyContext(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+void SMPDialogUpdate(ConnContext *context, int percent);
+void SMPDialogReply(ConnContext *context, const char* question);
+
+#define WMU_REFRESHSMP			(WM_USER + 245)
diff --git a/plugins/MirOTR/src/dllmain.cpp b/plugins/MirOTR/src/dllmain.cpp
index 55f8eef436..3e90e5c17b 100644
--- a/plugins/MirOTR/src/dllmain.cpp
+++ b/plugins/MirOTR/src/dllmain.cpp
@@ -1,121 +1,121 @@
-// dllmain.cpp : Definiert den Einstiegspunkt für die DLL-Anwendung.

-#include "stdafx.h"

-

-HANDLE hEventWindow;

-HINSTANCE hInst;

-

-int hLangpack;

-

-PLUGININFOEX pluginInfo={

-	sizeof(PLUGININFOEX),

-	__PLUGIN_NAME,

-	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

-	__DESCRIPTION,

-	__AUTHOR,

-	__AUTHOREMAIL,

-	__COPYRIGHT,

-	__AUTHORWEB,

-	UNICODE_AWARE,

-	// {12D8FAAD-78AB-4E3C-9854-320E9EA5CC9F}

-	{0x12d8faad, 0x78ab, 0x4e3c, {0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f}}

-};

-

-BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)

-{

-	hInst = hModule;

-	return TRUE;

-}

-

-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

-{

-	return &pluginInfo;

-}

-

-int ModulesLoaded(WPARAM wParam, LPARAM lParam)

-{

-	InitUtils();

-

-	lib_cs_lock();

-	otr_user_state = otrl_userstate_create();

-	lib_cs_unlock();

-

-	// this calls ReadPrivkeyFiles (above) to set filename values (also called on ME_FOLDERS_PATH_CHANGED)

-	InitOptions();

-

-	InitDBFilter();

-	InitMenu();

-

-	InitSRMM();

-

-	hEventWindow = HookEvent(ME_MSG_WINDOWEVENT, WindowEvent);

-

-	if (options.bHaveSecureIM && !db_get_b(0, MODULENAME, "sim_warned", 0)) {

-		db_set_b(0, MODULENAME, "sim_warned", 1);

-		options.default_policy = OTRL_POLICY_MANUAL_MOD;

-		SaveOptions();

-		MessageBox(0, TranslateT(LANG_OTR_SECUREIM_TEXT), TranslateT(LANG_OTR_SECUREIM_TITLE), 0x30);

-	}

-	return 0;

-}

-

-extern "C" __declspec(dllexport) int Load(void)

-{

-	DEBUGOUT_T("LOAD MIROTR")

-

-	mir_getLP( &pluginInfo );

-	/* for timezones

-	 mir_getTMI(&tmi);  */

-

-	InitIcons();

-

-	OTRL_INIT;

-	INITCOMMONCONTROLSEX icce = {0};

-	icce.dwSize = sizeof(icce);

-	icce.dwICC = ICC_LISTVIEW_CLASSES|ICC_PROGRESS_CLASS;

-	InitCommonControlsEx(&icce);

-

-	db_set_resident(MODULENAME, "TrustLevel");

-

-	/////////////

-	////// init plugin

-	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };

-	pd.szName = MODULENAME;

-	pd.type = PROTOTYPE_ENCRYPTION;

-	CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd);

-

-	// remove us as a filter to all contacts - fix filter type problem

-	if(db_get_b(0, MODULENAME, "FilterOrderFix", 0) != 2) {

-		for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

-			CallService(MS_PROTO_REMOVEFROMCONTACT, hContact, (LPARAM)MODULENAME);

-		db_set_b(0, MODULENAME, "FilterOrderFix", 2);

-	}

-

-	// create our services

-	CreateProtoServiceFunction(MODULENAME, PSS_MESSAGE, SVC_OTRSendMessage);

-	CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, SVC_OTRRecvMessage);

-

-	// hook modules loaded for updater support

-	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

-

-	return 0;

-}

-

-extern "C" __declspec(dllexport) int Unload(void)

-{

-	//UnhookEvent(hSettingChanged);

-	UnhookEvent(hEventWindow);

-	//UnhookEvent(hEventDbEventAddedFilter);

-	//UnhookEvent(hEventDbEventAdded);

-	DEBUGOUT_T("UNLOAD MIROTR")

-	DeinitSRMM();

-	DeinitOptions();

-	DeinitDBFilter();

-

-	lib_cs_lock();

-	otrl_userstate_free(otr_user_state);

-	lib_cs_unlock();

-

-	DeinitUtils();

-

-	return 0;

-}
\ No newline at end of file
+// dllmain.cpp : Definiert den Einstiegspunkt für die DLL-Anwendung.
+#include "stdafx.h"
+
+HANDLE hEventWindow;
+HINSTANCE hInst;
+
+int hLangpack;
+
+PLUGININFOEX pluginInfo={
+	sizeof(PLUGININFOEX),
+	__PLUGIN_NAME,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+	__DESCRIPTION,
+	__AUTHOR,
+	__AUTHOREMAIL,
+	__COPYRIGHT,
+	__AUTHORWEB,
+	UNICODE_AWARE,
+	// {12D8FAAD-78AB-4E3C-9854-320E9EA5CC9F}
+	{0x12d8faad, 0x78ab, 0x4e3c, {0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f}}
+};
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
+{
+	hInst = hModule;
+	return TRUE;
+}
+
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+{
+	return &pluginInfo;
+}
+
+int ModulesLoaded(WPARAM wParam, LPARAM lParam)
+{
+	InitUtils();
+
+	lib_cs_lock();
+	otr_user_state = otrl_userstate_create();
+	lib_cs_unlock();
+
+	// this calls ReadPrivkeyFiles (above) to set filename values (also called on ME_FOLDERS_PATH_CHANGED)
+	InitOptions();
+
+	InitDBFilter();
+	InitMenu();
+
+	InitSRMM();
+
+	hEventWindow = HookEvent(ME_MSG_WINDOWEVENT, WindowEvent);
+
+	if (options.bHaveSecureIM && !db_get_b(0, MODULENAME, "sim_warned", 0)) {
+		db_set_b(0, MODULENAME, "sim_warned", 1);
+		options.default_policy = OTRL_POLICY_MANUAL_MOD;
+		SaveOptions();
+		MessageBox(0, TranslateT(LANG_OTR_SECUREIM_TEXT), TranslateT(LANG_OTR_SECUREIM_TITLE), 0x30);
+	}
+	return 0;
+}
+
+extern "C" __declspec(dllexport) int Load(void)
+{
+	DEBUGOUT_T("LOAD MIROTR");
+
+	mir_getLP( &pluginInfo );
+	/* for timezones
+	 mir_getTMI(&tmi);  */
+
+	InitIcons();
+
+	OTRL_INIT;
+	INITCOMMONCONTROLSEX icce = {0};
+	icce.dwSize = sizeof(icce);
+	icce.dwICC = ICC_LISTVIEW_CLASSES|ICC_PROGRESS_CLASS;
+	InitCommonControlsEx(&icce);
+
+	db_set_resident(MODULENAME, "TrustLevel");
+
+	/////////////
+	////// init plugin
+	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
+	pd.szName = MODULENAME;
+	pd.type = PROTOTYPE_ENCRYPTION;
+	CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd);
+
+	// remove us as a filter to all contacts - fix filter type problem
+	if(db_get_b(0, MODULENAME, "FilterOrderFix", 0) != 2) {
+		for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
+			CallService(MS_PROTO_REMOVEFROMCONTACT, hContact, (LPARAM)MODULENAME);
+		db_set_b(0, MODULENAME, "FilterOrderFix", 2);
+	}
+
+	// create our services
+	CreateProtoServiceFunction(MODULENAME, PSS_MESSAGE, SVC_OTRSendMessage);
+	CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, SVC_OTRRecvMessage);
+
+	// hook modules loaded for updater support
+	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
+
+	return 0;
+}
+
+extern "C" __declspec(dllexport) int Unload(void)
+{
+	//UnhookEvent(hSettingChanged);
+	UnhookEvent(hEventWindow);
+	//UnhookEvent(hEventDbEventAddedFilter);
+	//UnhookEvent(hEventDbEventAdded);
+	DEBUGOUT_T("UNLOAD MIROTR");
+	DeinitSRMM();
+	DeinitOptions();
+	DeinitDBFilter();
+
+	lib_cs_lock();
+	otrl_userstate_free(otr_user_state);
+	lib_cs_unlock();
+
+	DeinitUtils();
+
+	return 0;
+}
diff --git a/plugins/MirOTR/src/otr.cpp b/plugins/MirOTR/src/otr.cpp
index ba91ff8594..e9354d23ca 100644
--- a/plugins/MirOTR/src/otr.cpp
+++ b/plugins/MirOTR/src/otr.cpp
@@ -48,7 +48,7 @@ static unsigned int CALLBACK generate_key_thread(void* param)
 	return 0;
 }
 
-INT_PTR CALLBACK GenKeyDlgFunc(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
+INT_PTR CALLBACK GenKeyDlgBoxProc(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
 	switch(msg) {
 		case WM_INITDIALOG:
 			{