Merge branch 'new_gpg' into new_gpg_autoexchange

Conflicts:
	messages.cpp

1 files changed, 42 insertions, 12 deletions

diff --git a/main.cpp b/main.cpp
index 7dad92f..415a689 100644
--- a/main.cpp
+++ b/main.cpp
@@ -94,6 +94,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 					if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 					{
 						gpg_thread.~thread();
+						TerminateProcess(params.hProcess, 1);
 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 						break;
 					}
@@ -187,6 +188,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 			  {
 				  gpg_thread.~thread();
+				  TerminateProcess(params.hProcess, 1);
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -255,6 +257,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 						  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 						  {
 							  gpg_thread.~thread();
+							  TerminateProcess(params.hProcess, 1);
 							  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 							  break;
 						  }
@@ -326,6 +329,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
 			  {
 				  delete gpg_thread;
+				  TerminateProcess(params.hProcess, 1);
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -353,6 +357,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
 			  {
 				  delete gpg_thread;
+				  TerminateProcess(params.hProcess, 1);
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -417,6 +422,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  if(!gpg_thread.timed_join(boost::posix_time::minutes(10)))
 				  {
 					  gpg_thread.~thread();
+					  TerminateProcess(params.hProcess, 1);
 					  debuglog<<time_str()<<": GPG execution timed out, aborted";
 					  break;
 				  }
@@ -447,6 +453,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 				  {
 					  gpg_thread.~thread();
+					  TerminateProcess(params.hProcess, 1);
 					  debuglog<<time_str()<<"GPG execution timed out, aborted\n";
 					  break;
 				  }
@@ -581,7 +588,11 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			gpg_configured = true;
 			boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
 			if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
+			{
 				gpg_thread.~thread();
+				TerminateProcess(params.hProcess, 1);
+				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+			}
 			gpg_configured = false;
 			DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");
 			string::size_type p1 = out.find("(GnuPG) ");
@@ -697,7 +708,11 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			  gpg_configured = true;
 			  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
 			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
+			  {
+				  TerminateProcess(params.hProcess, 1);
 				  gpg_thread.~thread();
+				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+			  }
 			  gpg_configured = false;
 			  DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");
 			  string::size_type p1 = out.find("(GnuPG) ");
@@ -781,7 +796,11 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				gpg_configured = true;
 				boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
 				if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
+				{
+					TerminateProcess(params.hProcess, 1);
 					gpg_thread.~thread();
+					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+				}
 				gpg_configured = false;
 				DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");
 				string::size_type p1 = out.find("(GnuPG) ");
@@ -870,6 +889,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				  if(!gpg_thread.timed_join(boost::posix_time::minutes(10)))
 				  {
 					  gpg_thread.~thread();
+					  TerminateProcess(params.hProcess, 1);
 					  debuglog<<time_str()<<": GPG execution timed out, aborted";
 					  gpg_configured = false;
 					  break;
@@ -877,7 +897,6 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				  gpg_configured = false;
 				  if(result == pxNotFound)
 					  break;
-
 				  DeleteFile(path.c_str());
 				  string::size_type p1 = 0;
 				  if((p1 = out.find("key ")) != string::npos)
@@ -903,6 +922,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 				  {
 					  gpg_thread.~thread();
+					  TerminateProcess(params.hProcess, 1);
 					  debuglog<<time_str()<<"GPG execution timed out, aborted\n";
 					  gpg_configured = false;
 					  break;
@@ -1218,14 +1238,13 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  if(!gpg_thread.timed_join(boost::posix_time::minutes(10)))
 				  {
 					  gpg_thread.~thread();
+					  TerminateProcess(params.hProcess, 1);
 					  MessageBox(0, _T("GPG execution timed out, aborted"), _T(""), MB_OK);
+					  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 					  break;
 				  }
 				  if(result == pxNotFound)
-				  {
-					  MessageBox(0, _T("Set path to gpg.exe first!"), _T("Warning"), MB_OK);				  
 					  break;
-				  }
 			  }
 			  DeleteFile(path.c_str());
 			  DestroyWindow(hwndDlg);
@@ -1252,6 +1271,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 					if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 					{
 						gpg_thread.~thread();
+						TerminateProcess(params.hProcess, 1);
 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 						break;
 					}
@@ -1412,6 +1432,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 					if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 					{
 						gpg_thread.~thread();
+						TerminateProcess(params.hProcess, 1);
 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 						break;
 					}
@@ -1519,6 +1540,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 			  {
 				  gpg_thread.~thread();
+				  TerminateProcess(params.hProcess, 1);
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -1628,6 +1650,7 @@ static BOOL CALLBACK DlgProcImportKeyDialog(HWND hwndDlg, UINT msg, WPARAM wPara
 			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 			  {
 				  gpg_thread.~thread();
+				  TerminateProcess(params.hProcess, 1);
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 			  }
 			  MessageBoxA(0, out.c_str(), "GPG output", MB_OK);
@@ -1748,12 +1771,18 @@ void InitCheck()
 			if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 			{
 				gpg_thread.~thread();
+				TerminateProcess(params.hProcess, 1);
 				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				return;
 			}
 			if(result == pxNotFound)
 				return;
 		}
+		TCHAR *home_dir = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
+		wstring tmp_dir = home_dir;
+		mir_free(home_dir);
+		tmp_dir += _T("\\tmp");
+		_wmkdir(tmp_dir.c_str());
 		string question = "Your secret key whith id: ";
 		char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 		question += keyid;
@@ -1811,7 +1840,7 @@ void ImportKey()
 			}
 		}
 		else
-			DBWriteContactSettingTString(metaGetCurrent(hContact), szGPGModuleName, "GPGPubKey", new_key.c_str());
+			DBWriteContactSettingTString(metaGetMostOnline(hContact), szGPGModuleName, "GPGPubKey", new_key.c_str());
 	}
 	else
 		DBWriteContactSettingTString(hContact, szGPGModuleName, "GPGPubKey", new_key.c_str());
@@ -1831,7 +1860,7 @@ void ImportKey()
 			DeleteFile(tmp2);
 			wfstream f(tmp2, std::ios::out);
 			if(metaIsProtoMetaContacts(hContact))
-				ptmp = UniGetContactSettingUtf(metaGetCurrent(hContact), szGPGModuleName, "GPGPubKey", _T(""));
+				ptmp = UniGetContactSettingUtf(metaGetMostOnline(hContact), szGPGModuleName, "GPGPubKey", _T(""));
 			else
 				ptmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
 			wstring new_key = ptmp;
@@ -1854,6 +1883,7 @@ void ImportKey()
 		if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 		{
 			gpg_thread.~thread();
+			TerminateProcess(params.hProcess, 1);
 			debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 			return;
 		}
@@ -1930,7 +1960,7 @@ void ImportKey()
 					char *tmp = NULL;
 					string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
 					string::size_type s2 = output.find(":", s);
-					DBWriteContactSettingString(metaGetCurrent(hContact), szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str());
+					DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str());
 					s2+=2;
 					s = output.find("“", s2);
 					if(s == string::npos)
@@ -1947,7 +1977,7 @@ void ImportKey()
 					tmp = new char [output.substr(s,s2-s-1).length()+1];
 					strcpy(tmp, output.substr(s,s2-s-1).c_str());
 					mir_utf8decode(tmp, 0);
-					DBWriteContactSettingString(metaGetCurrent(hContact), szGPGModuleName, "KeyMainName", tmp);
+					DBWriteContactSettingString(metaGetContact(hContact), szGPGModuleName, "KeyMainName", tmp);
 					mir_free(tmp);
 					if((s = output.find(")", s2)) == string::npos)
 						s = output.find(">", s2);
@@ -1959,14 +1989,14 @@ void ImportKey()
 						tmp = new char [output.substr(s2,s-s2).length()+1];
 						strcpy(tmp, output.substr(s2,s-s2).c_str());
 						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(metaGetCurrent(hContact), szGPGModuleName, "KeyComment", tmp);
+						DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyComment", tmp);
 						mir_free(tmp);
 						s+=3;
 						s2 = output.find(">", s);
 						tmp = new char [output.substr(s,s2-s).length()+1];
 						strcpy(tmp, output.substr(s,s2-s).c_str());
 						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(metaGetCurrent(hContact), szGPGModuleName, "KeyMainEmail", tmp);
+						DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainEmail", tmp);
 						mir_free(tmp);
 					}
 					else
@@ -1974,10 +2004,10 @@ void ImportKey()
 						tmp = new char [output.substr(s2,s-s2).length()+1];
 						strcpy(tmp, output.substr(s2,s-s2).c_str());
 						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(metaGetCurrent(hContact), szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
+						DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
 						mir_free(tmp);
 					}
-					DBDeleteContactSetting(metaGetCurrent(hContact), szGPGModuleName, "bAlwatsTrust");
+					DBDeleteContactSetting(metaGetMostOnline(hContact), szGPGModuleName, "bAlwatsTrust");
 				}
 			}
 			else