yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Windows: get GUI preview working by fixing child-spawning from a GUI app

Browse source
This commit is contained in:
Jean-Francois Dockes 2015-10-07 10:36:37 +02:00
parent 07753a03ce
commit 601effdaf8
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/windows/execmd_w.cpp
View file

@ -538,7 +538,10 @@ bool ExecCmd::Internal::preparePipes(bool has_input,HANDLE *hChildInput,
0, TRUE, 0, TRUE,
DUPLICATE_SAME_ACCESS)) { DUPLICATE_SAME_ACCESS)) {
printError("preparePipes: DuplicateHandle(stdout)"); printError("preparePipes: DuplicateHandle(stdout)");
goto errout; // This occurs when the parent process is a GUI app. Ignoring the error works, but
// not too sure this is the right approach. Maybe look a bit more at:
// https://support.microsoft.com/en-us/kb/190351
//goto errout;
} }
} }
@ -580,7 +583,7 @@ bool ExecCmd::Internal::preparePipes(bool has_input,HANDLE *hChildInput,
0, TRUE, 0, TRUE,
DUPLICATE_SAME_ACCESS)) { DUPLICATE_SAME_ACCESS)) {
printError("preparePipes: DuplicateHandle(stdin)"); printError("preparePipes: DuplicateHandle(stdin)");
goto errout; //goto errout;
} }
} }
@ -588,6 +591,7 @@ bool ExecCmd::Internal::preparePipes(bool has_input,HANDLE *hChildInput,
// for the moment // for the moment
if (false && !m_stderrFile.empty()) { if (false && !m_stderrFile.empty()) {
// Open the file set up the child handle: TBD // Open the file set up the child handle: TBD
printError("preparePipes: m_stderrFile not empty");
} else { } else {
// Let the child inherit our standard input // Let the child inherit our standard input
HANDLE hstd = GetStdHandle(STD_ERROR_HANDLE); HANDLE hstd = GetStdHandle(STD_ERROR_HANDLE);
@ -600,7 +604,7 @@ bool ExecCmd::Internal::preparePipes(bool has_input,HANDLE *hChildInput,
0, TRUE, 0, TRUE,
DUPLICATE_SAME_ACCESS)) { DUPLICATE_SAME_ACCESS)) {
printError("preparePipes: DuplicateHandle(stderr)"); printError("preparePipes: DuplicateHandle(stderr)");
goto errout; //goto errout;
} }
} }
@ -662,10 +666,13 @@ int ExecCmd::startExec(const string &cmd, const vector<string>& args,
// This structure specifies the STDIN and STDOUT handles for redirection. // This structure specifies the STDIN and STDOUT handles for redirection.
ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); ZeroMemory(&siStartInfo, sizeof(STARTUPINFO));
siStartInfo.cb = sizeof(STARTUPINFO); siStartInfo.cb = sizeof(STARTUPINFO);
siStartInfo.dwFlags |= STARTF_USESTDHANDLES; siStartInfo.dwFlags |= STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
siStartInfo.hStdOutput = hOutputWrite; siStartInfo.hStdOutput = hOutputWrite;
siStartInfo.hStdInput = hInputRead; siStartInfo.hStdInput = hInputRead;
siStartInfo.hStdError = hErrorWrite; siStartInfo.hStdError = hErrorWrite;
// This is to hide the console when starting a cmd line command from
// the GUI. Also note STARTF_USESHOWWINDOW above
siStartInfo.wShowWindow = SW_HIDE;
char *envir = mergeEnvironment(m->m_env); char *envir = mergeEnvironment(m->m_env);
@ -969,7 +976,7 @@ int ExecCmd::doexec(const string &cmd, const vector<string>& args,
if (input) { if (input) {
if (!input->empty()) { if (!input->empty()) {
if (send(*input) != input->size()) { if (send(*input) != (int)input->size()) {
LOGERR(("ExecCmd::doexec: send failed\n")); LOGERR(("ExecCmd::doexec: send failed\n"));
CloseHandle(m->m_hInputWrite); CloseHandle(m->m_hInputWrite);
m->m_hInputWrite = NULL; m->m_hInputWrite = NULL;
@ -984,7 +991,7 @@ int ExecCmd::doexec(const string &cmd, const vector<string>& args,
m->m_hInputWrite = NULL; m->m_hInputWrite = NULL;
break; break;
} }
if (send(*input) != input->size()) { if (send(*input) != (int)input->size()) {
LOGERR(("ExecCmd::doexec: send failed\n")); LOGERR(("ExecCmd::doexec: send failed\n"));
CloseHandle(m->m_hInputWrite); CloseHandle(m->m_hInputWrite);
m->m_hInputWrite = NULL; m->m_hInputWrite = NULL;