kernel32: Fix handling of %ws format for Unicode.

2009-06-08 18:13:13 +02:00 · 2009-06-08 18:13:13 +02:00 · b4a9c99abc
parent 031c73af30
commit b4a9c99abc
1 changed files with 3 additions and 0 deletions
--- a/dlls/kernel32/format_msg.c
+++ b/dlls/kernel32/format_msg.c
@ -485,7 +485,10 @@ DWORD WINAPI FormatMessageW(

                        if (fmtstr[strlenW(fmtstr)-1]=='s' && argliststart[0]) {
                            DWORD xarr[3];
+                            WCHAR *fmt_end = fmtstr + strlenW(fmtstr) - 1;

+                            /* remap %ws to %ls */
+                            if (fmt_end > fmtstr && (fmt_end[-1] == 'w')) fmt_end[-1] = 'l';
                            xarr[0]=*(argliststart+0);
                            /* possible invalid pointers */
                            xarr[1]=*(argliststart+1);