X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fprogress.c;h=5696fbae87435284725c154c55dd2f32eb881b88;hb=2fd8bf9f1c54daa5680ad8998b2228a4db9bd6de;hp=b616dff45d1401c0c5fd046e70159423ff7cb23c;hpb=bdea6a2538495fb297e62534f4a6c99b5373fed1;p=wimlib diff --git a/src/progress.c b/src/progress.c index b616dff4..5696fbae 100644 --- a/src/progress.c +++ b/src/progress.c @@ -31,6 +31,7 @@ report_error(wimlib_progress_func_t progfunc, { int ret; union wimlib_progress_info progress; + tchar *cookie; if (error_code == WIMLIB_ERR_SUCCESS || error_code == WIMLIB_ERR_ABORTED_BY_PROGRESS || @@ -41,25 +42,12 @@ report_error(wimlib_progress_func_t progfunc, progress.handle_error.error_code = error_code; progress.handle_error.will_ignore = false; -#ifdef __WIN32__ - /* Hack for Windows... */ - - wchar_t *p_question_mark = NULL; - - if (!wcsncmp(path, L"\\??\\", 4)) { - /* Trivial transformation: NT namespace => Win32 namespace */ - p_question_mark = (wchar_t *)&path[1]; - *p_question_mark = L'\\'; - } -#endif + cookie = progress_get_win32_path(path); ret = call_progress(progfunc, WIMLIB_PROGRESS_MSG_HANDLE_ERROR, &progress, progctx); -#ifdef __WIN32__ - if (p_question_mark) - *p_question_mark = L'?'; -#endif + progress_put_win32_path(cookie); if (ret) return ret;