Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better error message when failing to launch portable exe

Browse Source
This commit is contained in:
Kovid Goyal 2020-11-01 08:22:18 +05:30
parent e9d1f2c25c
commit 7f5072665d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bypy/windows/portable.cpp
View File

@ -165,7 +165,6 @@ launch_exe(LPCWSTR exe_path, const std::wstring &cmd_line, LPCWSTR config_dir) {
DWORD dwFlags=0; DWORD dwFlags=0;
STARTUPINFO si; STARTUPINFO si;
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
BOOL fSuccess;
if (cmd_line.length() > BUFSIZE - 4) { if (cmd_line.length() > BUFSIZE - 4) {
show_error(L"Path to executable in portable folder too long."); show_error(L"Path to executable in portable folder too long.");
ExitProcess(1); ExitProcess(1);
@ -189,7 +188,7 @@ launch_exe(LPCWSTR exe_path, const std::wstring &cmd_line, LPCWSTR config_dir) {
static wchar_t mutable_cmdline[BUFSIZE] = {0}; static wchar_t mutable_cmdline[BUFSIZE] = {0};
cmd_line.copy(mutable_cmdline, BUFSIZE-1); cmd_line.copy(mutable_cmdline, BUFSIZE-1);
fSuccess = CreateProcess(NULL, mutable_cmdline, if (!CreateProcess(NULL, mutable_cmdline,
NULL, // Process handle not inheritable NULL, // Process handle not inheritable
NULL, // Thread handle not inheritable NULL, // Thread handle not inheritable
FALSE, // Set handle inheritance to FALSE FALSE, // Set handle inheritance to FALSE
@ -198,10 +197,10 @@ launch_exe(LPCWSTR exe_path, const std::wstring &cmd_line, LPCWSTR config_dir) {
NULL, // Use parent's starting directory NULL, // Use parent's starting directory
&si, // Pointer to STARTUPINFO structure &si, // Pointer to STARTUPINFO structure
&pi // Pointer to PROCESS_INFORMATION structure &pi // Pointer to PROCESS_INFORMATION structure
); )) {
std::wstring message(L"Failed to launch: ");
if (fSuccess == 0) { message.append(mutable_cmdline);
show_last_error(_T("Failed to launch the calibre program")); show_last_error(message.c_str());
} }
// Close process and thread handles. // Close process and thread handles.