X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fcapture_common.c;h=0fa71adcbd898c5980a85ff42138cc3bef06f3ae;hp=e088afcbd0cddcc5502bc15045df9a2a00dfb4dc;hb=c86d5f74e13e5aeff57aff84f7d65264607a29ac;hpb=0e650cac77ac5a9e418300e50d7ddd7696a18531 diff --git a/src/capture_common.c b/src/capture_common.c index e088afcb..0fa71adc 100644 --- a/src/capture_common.c +++ b/src/capture_common.c @@ -285,30 +285,19 @@ try_exclude(const tchar *full_path, const struct capture_params *params) } if (unlikely(params->add_flags & WIMLIB_ADD_FLAG_TEST_FILE_EXCLUSION)) { + union wimlib_progress_info info; + tchar *cookie; info.test_file_exclusion.path = full_path; info.test_file_exclusion.will_exclude = false; - #ifdef __WIN32__ - /* Hack for Windows... */ - - wchar_t *p_question_mark = NULL; - - if (!wcsncmp(full_path, L"\\??\\", 4)) { - /* Trivial transformation: NT namespace => Win32 namespace */ - p_question_mark = (wchar_t *)&full_path[1]; - *p_question_mark = L'\\'; - } - #endif + cookie = progress_get_win32_path(full_path); ret = call_progress(params->progfunc, WIMLIB_PROGRESS_MSG_TEST_FILE_EXCLUSION, &info, params->progctx); - #ifdef __WIN32__ - if (p_question_mark) - *p_question_mark = L'?'; - #endif + progress_put_win32_path(cookie); if (ret) return ret;