Francois Gouget : oleaut32: Fix a trace containing a null character.

Alexandre Julliard julliard at winehq.org
Wed Jul 7 15:01:30 CDT 2021


Module: wine
Branch: master
Commit: 6763ed84cf0629dd7d1495263e1e3ea9aaf3d663
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6763ed84cf0629dd7d1495263e1e3ea9aaf3d663

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Jul  7 19:13:53 2021 +0200

oleaut32: Fix a trace containing a null character.

printf("%c Hello\n", 0) works but not TRACE("%c Hello\n", 0) because the
string is formatted before printing.
Work around the issue with wine_dbgstr_w().

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/oleaut32/variant.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index ace33a006f4..129e13da17d 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -1554,8 +1554,8 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID
             break;
     default: WARN("buffer too small for LOCALE_SCURRENCY\n");
   }
-  TRACE("lcid 0x%x, cCurrencyLocal =%d,%d '%c','%c'\n", lcid, lpChars->cCurrencyLocal,
-        lpChars->cCurrencyLocal2, lpChars->cCurrencyLocal, lpChars->cCurrencyLocal2);
+  TRACE("lcid 0x%x, cCurrencyLocal=%d,%d %s\n", lcid, lpChars->cCurrencyLocal,
+        lpChars->cCurrencyLocal2, wine_dbgstr_w(buff));
 
   memcpy(&lastChars, lpChars, sizeof(defaultChars));
   lastLcid = lcid;




More information about the wine-cvs mailing list