[PATCH] msvcp: Trace delimiter characters as single char strings

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---

Otherwise newline delimiter causes actual newline to be inserted in trace message, splitting it
to next line.

 dlls/msvcp60/ios.c | 16 ++++++++--------
 dlls/msvcp90/ios.c | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c
index f5dabbfa42..fea2adee16 100644
--- a/dlls/msvcp60/ios.c
+++ b/dlls/msvcp60/ios.c
@@ -7932,7 +7932,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch
     basic_ios_char *base = basic_istream_char_get_basic_ios(this);
     int ch = delim;
 
-    TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim);
+    TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1));
 
     this->count = 0;
 
@@ -7978,7 +7978,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr
     basic_ios_char *base = basic_istream_char_get_basic_ios(this);
     int ch = delim;
 
-    TRACE("(%p %p %c)\n", this, strbuf, delim);
+    TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1));
 
     this->count = 0;
 
@@ -8022,7 +8022,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch
     basic_ios_char *base = basic_istream_char_get_basic_ios(this);
     int ch = (unsigned char)delim;
 
-    TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim);
+    TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1));
 
     this->count = 0;
 
@@ -8724,7 +8724,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim(
     IOSB_iostate state = IOSTATE_goodbit;
     int c = (unsigned char)delim;
 
-    TRACE("(%p %p %c)\n", istream, str, delim);
+    TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1));
 
     MSVCP_basic_string_char_clear(str);
     if(basic_istream_char_sentry_create(istream, TRUE)) {
@@ -9400,7 +9400,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_
     basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this);
     unsigned short ch = delim;
 
-    TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim);
+    TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1));
 
     this->count = 0;
 
@@ -9450,7 +9450,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is
     basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this);
     unsigned short ch = delim;
 
-    TRACE("(%p %p %c)\n", this, strbuf, delim);
+    TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1));
 
     this->count = 0;
 
@@ -9498,7 +9498,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_
     basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this);
     unsigned short ch = delim;
 
-    TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim);
+    TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1));
 
     this->count = 0;
 
@@ -10397,7 +10397,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim(
     IOSB_iostate state = IOSTATE_goodbit;
     int c = delim;
 
-    TRACE("(%p %p %c)\n", istream, str, delim);
+    TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1));
 
     MSVCP_basic_string_wchar_clear(str);
     if(basic_istream_wchar_sentry_create(istream, TRUE)) {
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index 5d2f0ca9c6..9ae9e65b93 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -8414,7 +8414,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch
     basic_ios_char *base = basic_istream_char_get_basic_ios(this);
     int ch = delim;
 
-    TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim);
+    TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1));
 
     this->count = 0;
 
@@ -8460,7 +8460,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr
     basic_ios_char *base = basic_istream_char_get_basic_ios(this);
     int ch = delim;
 
-    TRACE("(%p %p %c)\n", this, strbuf, delim);
+    TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1));
 
     this->count = 0;
 
@@ -8504,7 +8504,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch
     basic_ios_char *base = basic_istream_char_get_basic_ios(this);
     int ch = (unsigned char)delim;
 
-    TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim);
+    TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1));
 
     this->count = 0;
 
@@ -9271,7 +9271,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim(
     IOSB_iostate state = IOSTATE_goodbit;
     int c = (unsigned char)delim;
 
-    TRACE("(%p %p %c)\n", istream, str, delim);
+    TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1));
 
     if(basic_istream_char_sentry_create(istream, TRUE)) {
         basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
@@ -9957,7 +9957,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_
     basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this);
     unsigned short ch = delim;
 
-    TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim);
+    TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1));
 
     this->count = 0;
 
@@ -10007,7 +10007,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is
     basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this);
     unsigned short ch = delim;
 
-    TRACE("(%p %p %c)\n", this, strbuf, delim);
+    TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1));
 
     this->count = 0;
 
@@ -10055,7 +10055,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_
     basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this);
     unsigned short ch = delim;
 
-    TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim);
+    TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1));
 
     this->count = 0;
 
@@ -11018,7 +11018,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim(
     IOSB_iostate state = IOSTATE_goodbit;
     int c = delim;
 
-    TRACE("(%p %p %c)\n", istream, str, delim);
+    TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1));
 
     if(basic_istream_wchar_sentry_create(istream, TRUE)) {
         basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base);
-- 
2.15.0