From a739fa0c551a79c27f715fc081a6f398fbe9519a Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 1 Sep 2010 01:46:24 +0300 Subject: modified: commonheaders.h modified: main.cpp modified: new_gpg.vcproj --- commonheaders.h | 1 + main.cpp | 12 ++++++++++-- new_gpg.vcproj | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/commonheaders.h b/commonheaders.h index e80d81f..e7b6e7e 100644 --- a/commonheaders.h +++ b/commonheaders.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/main.cpp b/main.cpp index 0941c28..2eb1cd7 100644 --- a/main.cpp +++ b/main.cpp @@ -401,10 +401,18 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_INITDIALOG: { TranslateDialogDefault(hwndDlg); - tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("")); + TCHAR *path = new TCHAR [MAX_PATH]; + DWORD len = MAX_PATH; + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", (SHGetValue(HKEY_CURRENT_USER, _T("Software\\GNU\\GnuPG\\gpgProgram"), 0, 0, path, &len) == ERROR_SUCCESS)?path:_T("")); + delete [] path; SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp); mir_free(tmp); - tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); + path = new TCHAR [MAX_PATH]; + ExpandEnvironmentStrings(_T("%APPDATA%"), path, MAX_PATH); + wstring path_ = path; + delete [] path; + path_ += _T("\\GnuPG"); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", (TCHAR*)path_.c_str()); SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp); mir_free(tmp); return TRUE; diff --git a/new_gpg.vcproj b/new_gpg.vcproj index 9cccfd6..bb907a5 100644 --- a/new_gpg.vcproj +++ b/new_gpg.vcproj @@ -179,7 +179,7 @@ />