From d664193c050b38791c5ae2e5e52f5b594f197467 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 17 May 2023 11:38:08 -0700 Subject: [PATCH] tex tools: remove newlines from FORMAT_MESSAGE_FROM_SYSTEM (#355) --- Texassemble/texassemble.cpp | 8 ++++++++ Texconv/texconv.cpp | 8 ++++++++ Texdiag/texdiag.cpp | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp index 08d824c..06d70f8 100644 --- a/Texassemble/texassemble.cpp +++ b/Texassemble/texassemble.cpp @@ -752,6 +752,14 @@ namespace if (errorText) LocalFree(errorText); + + for (wchar_t* ptr = desc; *ptr != 0; ++ptr) + { + if (*ptr == L'\r' || *ptr == L'\n') + { + *ptr = L' '; + } + } } return desc; diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp index 6d89cdc..c2c7949 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -1047,6 +1047,14 @@ namespace if (errorText) LocalFree(errorText); + + for (wchar_t* ptr = desc; *ptr != 0; ++ptr) + { + if (*ptr == L'\r' || *ptr == L'\n') + { + *ptr = L' '; + } + } } return desc; diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp index ef7605b..b2fde0c 100644 --- a/Texdiag/texdiag.cpp +++ b/Texdiag/texdiag.cpp @@ -751,6 +751,14 @@ namespace if (errorText) LocalFree(errorText); + + for(wchar_t* ptr = desc; *ptr != 0; ++ptr) + { + if (*ptr == L'\r' || *ptr == L'\n') + { + *ptr = L' '; + } + } } return desc;