Jacek Caban : msvcrt: Use %ls format for wchar strings in _wassert.

Alexandre Julliard julliard at winehq.org
Wed Nov 6 16:54:29 CST 2019


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Nov  6 12:48:04 2019 +0100

msvcrt: Use %ls format for wchar strings in _wassert.

%s does not do the right thing in ucrtbase.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcrt/exit.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index 2f344b6dab..9f9cad0964 100644
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -290,10 +290,10 @@ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int m
 void CDECL MSVCRT__wassert(const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* file, unsigned int line)
 {
   static const MSVCRT_wchar_t assertion_failed[] = {'A','s','s','e','r','t','i','o','n',' ','f','a','i','l','e','d','!',0};
-  static const MSVCRT_wchar_t format_msgbox[] = {'F','i','l','e',':',' ','%','s','\n','L','i','n','e',':',' ','%','d',
-      '\n','\n','E','x','p','r','e','s','s','i','o','n',':',' ','\"','%','s','\"',0};
+  static const MSVCRT_wchar_t format_msgbox[] = {'F','i','l','e',':',' ','%','l','s','\n','L','i','n','e',':',' ','%','d',
+      '\n','\n','E','x','p','r','e','s','s','i','o','n',':',' ','\"','%','l','s','\"',0};
   static const MSVCRT_wchar_t format_console[] = {'A','s','s','e','r','t','i','o','n',' ','f','a','i','l','e','d',':',' ',
-      '%','s',',',' ','f','i','l','e',' ','%','s',',',' ','l','i','n','e',' ','%','d','\n','\n',0};
+      '%','l','s',',',' ','f','i','l','e',' ','%','l','s',',',' ','l','i','n','e',' ','%','d','\n','\n',0};
 
   TRACE("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line);
 




More information about the wine-cvs mailing list