477c0a2cab
Windows does not support UTF-8, so pushing a file with non-ASCII characters failed. Convert the UTF-8 command line to a wide characters string and call CreateProcessW(). Fixes <https://github.com/Genymobile/scrcpy/issues/422>
72 lines
1.9 KiB
C
72 lines
1.9 KiB
C
#include "command.h"
|
|
|
|
#include "config.h"
|
|
#include "log.h"
|
|
#include "str_util.h"
|
|
|
|
static int build_cmd(char *cmd, size_t len, const char *const argv[]) {
|
|
// Windows command-line parsing is WTF:
|
|
// <http://daviddeley.com/autohotkey/parameters/parameters.htm#WINPASS>
|
|
// only make it work for this very specific program
|
|
// (don't handle escaping nor quotes)
|
|
size_t ret = xstrjoin(cmd, argv, ' ', len);
|
|
if (ret >= len) {
|
|
LOGE("Command too long (%" PRIsizet " chars)", len - 1);
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
enum process_result cmd_execute(const char *path, const char *const argv[], HANDLE *handle) {
|
|
STARTUPINFOW si;
|
|
PROCESS_INFORMATION pi;
|
|
memset(&si, 0, sizeof(si));
|
|
si.cb = sizeof(si);
|
|
|
|
char cmd[256];
|
|
if (build_cmd(cmd, sizeof(cmd), argv)) {
|
|
*handle = NULL;
|
|
return PROCESS_ERROR_GENERIC;
|
|
}
|
|
|
|
wchar_t *wide = utf8_to_wide_char(cmd);
|
|
if (!wide) {
|
|
LOGC("Cannot allocate wide char string");
|
|
return PROCESS_ERROR_GENERIC;
|
|
}
|
|
|
|
#ifdef WINDOWS_NOCONSOLE
|
|
int flags = CREATE_NO_WINDOW;
|
|
#else
|
|
int flags = 0;
|
|
#endif
|
|
if (!CreateProcessW(NULL, wide, NULL, NULL, FALSE, flags, NULL, NULL, &si, &pi)) {
|
|
free(wide);
|
|
*handle = NULL;
|
|
if (GetLastError() == ERROR_FILE_NOT_FOUND) {
|
|
return PROCESS_ERROR_MISSING_BINARY;
|
|
}
|
|
return PROCESS_ERROR_GENERIC;
|
|
}
|
|
|
|
free(wide);
|
|
*handle = pi.hProcess;
|
|
return PROCESS_SUCCESS;
|
|
}
|
|
|
|
SDL_bool cmd_terminate(HANDLE handle) {
|
|
return TerminateProcess(handle, 1) && CloseHandle(handle);
|
|
}
|
|
|
|
SDL_bool cmd_simple_wait(HANDLE handle, DWORD *exit_code) {
|
|
DWORD code;
|
|
if (WaitForSingleObject(handle, INFINITE) != WAIT_OBJECT_0 || !GetExitCodeProcess(handle, &code)) {
|
|
// cannot wait or retrieve the exit code
|
|
code = -1; // max value, it's unsigned
|
|
}
|
|
if (exit_code) {
|
|
*exit_code = code;
|
|
}
|
|
return !code;
|
|
}
|