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

Code cleanups

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

37
bypy/windows/portable.cpp
View File

@ -24,26 +24,29 @@
// error handling {{{ // error handling {{{
void show_error(LPCWSTR msg) { static void
show_error(LPCWSTR msg) {
MessageBeep(MB_ICONERROR); MessageBeep(MB_ICONERROR);
MessageBoxW(NULL, msg, L"Error", MB_OK|MB_ICONERROR); MessageBoxW(NULL, msg, L"Error", MB_OK|MB_ICONERROR);
} }
void show_detailed_error(LPCTSTR preamble, LPCTSTR msg, int code) { static void
show_detailed_error(LPCWSTR preamble, LPCWSTR msg, int code) {
LPTSTR buf; LPTSTR buf;
buf = (LPTSTR)LocalAlloc(LMEM_ZEROINIT, sizeof(TCHAR)* buf = (LPTSTR)LocalAlloc(LMEM_ZEROINIT, sizeof(TCHAR)*
(_tcslen(msg) + _tcslen(preamble) + 80)); (_tcslen(msg) + _tcslen(preamble) + 80));
_sntprintf_s(buf, _snwprintf_s(buf,
LocalSize(buf) / sizeof(TCHAR), _TRUNCATE, LocalSize(buf) / sizeof(TCHAR), _TRUNCATE,
_T("%s\r\n %s (Error Code: %d)\r\n"), L"%s\r\n %s (Error Code: %d)\r\n",
preamble, msg, code); preamble, msg, code);
show_error(buf); show_error(buf);
LocalFree(buf); LocalFree(buf);
} }
void show_last_error_crt(LPCTSTR preamble) { static void
show_last_error_crt(LPCWSTR preamble) {
TCHAR buf[BUFSIZE]; TCHAR buf[BUFSIZE];
int err = 0; int err = 0;
@ -52,7 +55,8 @@ void show_last_error_crt(LPCTSTR preamble) {
show_detailed_error(preamble, buf, err); show_detailed_error(preamble, buf, err);
} }
void show_last_error(LPCTSTR preamble) { static void
show_last_error(LPCWSTR preamble) {
TCHAR *msg = NULL; TCHAR *msg = NULL;
DWORD dw = GetLastError(); DWORD dw = GetLastError();
@ -160,24 +164,24 @@ quote_argv(const std::wstring& arg, std::wstring& cmd_line) {
cmd_line.push_back (L'"'); cmd_line.push_back (L'"');
} }
void static int
launch_exe(LPCWSTR exe_path, const std::wstring &cmd_line, LPCWSTR config_dir) { 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;
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); return 1;
} }
if (!SetEnvironmentVariable(_T("CALIBRE_CONFIG_DIRECTORY"), config_dir)) { if (!SetEnvironmentVariableW(L"CALIBRE_CONFIG_DIRECTORY", config_dir)) {
show_last_error(_T("Failed to set environment variables")); show_last_error(L"Failed to set environment variables");
ExitProcess(1); return 1;
} }
if (!SetEnvironmentVariable(_T("CALIBRE_PORTABLE_BUILD"), exe_path)) { if (!SetEnvironmentVariableW(L"CALIBRE_PORTABLE_BUILD", exe_path)) {
show_last_error(_T("Failed to set environment variables")); show_last_error(L"Failed to set environment variables");
ExitProcess(1); return 1;
} }
dwFlags = CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_PROCESS_GROUP; dwFlags = CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_PROCESS_GROUP;
@ -206,6 +210,7 @@ launch_exe(LPCWSTR exe_path, const std::wstring &cmd_line, LPCWSTR config_dir) {
// Close process and thread handles. // Close process and thread handles.
CloseHandle( pi.hProcess ); CloseHandle( pi.hProcess );
CloseHandle( pi.hThread ); CloseHandle( pi.hThread );
return 0;
} }
@ -231,7 +236,5 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR orig_cmd_line, int
quote_argv(arg, cmd_line); quote_argv(arg, cmd_line);
} }
LocalFree(argv); LocalFree(argv);
launch_exe(exe.c_str(), cmd_line.c_str(), config_dir.c_str()); return launch_exe(exe.c_str(), cmd_line.c_str(), config_dir.c_str());
return 0;
} }