From b4a9c99abcfc267af6caa0d0bd802ac27fcca39e Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 8 Jun 2009 18:13:13 +0200
Subject: [PATCH] kernel32: Fix handling of %ws format for Unicode.

---
 dlls/kernel32/format_msg.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c
index f4baaaec81d..e8f9fbc9831 100644
--- 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);
-- 
2.11.4.GIT