Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-25 04:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

win32-console-wrapper: simplify error printing

Browse Source 
No need for pointless prefix, print error directly. Don't use CRT
function. This will write only to console, but it's not meant to be
written to file anyway.
This commit is contained in:
Kacper Michajłow
2025-02-18 23:05:43 +01:00
parent 66a7338027
commit 30ea5da702
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
osdep/win32-console-wrapper.c
View File

@@ -24,18 +24,19 @@
int wmain(int argc, wchar_t **argv, wchar_t **envp);
static void cr_perror(const wchar_t *prefix)
static void cr_perror(void)
{
wchar_t *error;
LPWSTR error = NULL;
DWORD len = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, GetLastError(),
LANG_USER_DEFAULT,
(LPWSTR)&error, 0, NULL);
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, GetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPWSTR)&error, 0, NULL);
fwprintf(stderr, L"%ls: %ls", prefix, error);
HANDLE out = GetStdHandle(STD_ERROR_HANDLE);
if (out != INVALID_HANDLE_VALUE && GetConsoleMode(out, &(DWORD){0}))
WriteConsoleW(out, error, len, NULL, NULL);
LocalFree(error);
}
@@ -66,10 +67,8 @@ static int cr_runproc(wchar_t *name, wchar_t *cmdline)
};
si.dwFlags = (si.hStdInput || si.hStdOutput || si.hStdError) ? STARTF_USESTDHANDLES : 0;
PROCESS_INFORMATION pi = {0};
if (!CreateProcessW(name, cmdline, NULL, NULL, TRUE, 0,
NULL, NULL, &si, &pi)) {
cr_perror(L"CreateProcess");
if (!CreateProcessW(name, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) {
cr_perror();
} else {
WaitForSingleObject(pi.hProcess, INFINITE);
GetExitCodeProcess(pi.hProcess, &retval);