From a9feca3461062a266adf9e240a2f436ca27b4ffb Mon Sep 17 00:00:00 2001 From: Alexander Gluzsky Date: Tue, 31 Mar 2015 10:36:37 +0000 Subject: new_gpg: various startup validation fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@12572 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/New_GPG/src/gpg_wrapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/New_GPG/src/gpg_wrapper.cpp') diff --git a/plugins/New_GPG/src/gpg_wrapper.cpp b/plugins/New_GPG/src/gpg_wrapper.cpp index 1f2e6090fe..57f8d79205 100755 --- a/plugins/New_GPG/src/gpg_wrapper.cpp +++ b/plugins/New_GPG/src/gpg_wrapper.cpp @@ -62,7 +62,7 @@ pxResult pxExecute(std::vector &aargv, string *aoutput, LPDWORD ae if(bDebugLog) { std::wstring args; - for(int i = 0; i < argv.size(); ++i) + for(unsigned int i = 0; i < argv.size(); ++i) { args += argv[i]; args += L" "; @@ -79,10 +79,10 @@ pxResult pxExecute(std::vector &aargv, string *aoutput, LPDWORD ae file_descriptor_sink sout(pout.sink, close_handle); file_descriptor_sink serr(perr.sink, close_handle); - char *mir_path = new char [MAX_PATH]; - PathToAbsolute("\\", mir_path); + TCHAR *mir_path = new TCHAR [MAX_PATH]; + PathToAbsoluteW(_T("\\"), mir_path); - c = new child(execute(set_args(argv), bind_stdout(sout), bind_stderr(serr), close_stdin(),/*bind_stdin(sin),*/ show_window(SW_HIDE), hide_console(), inherit_env(), set_env(env), start_in_dir(toUTF16(mir_path)))); + c = new child(execute(set_args(argv), bind_stdout(sout), bind_stderr(serr), close_stdin(),/*bind_stdin(sin),*/ show_window(SW_HIDE), hide_console(), inherit_env(), set_env(env), start_in_dir(mir_path))); _child = c; delete [] mir_path; -- cgit v1.2.3