ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Fix wsprintfW %S conversion.

Browse Source 
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Akihiro Sagawa 2020-02-09 20:51:37 +09:00 committed by Alexandre Julliard
parent c8f46313e4
commit fa8a9a81e6
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/user32/tests/wsprintf.c
View File

@ -188,12 +188,11 @@ static void wsprintfWTest(void)
memset(buf, 0x11, sizeof(buf)); memset(buf, 0x11, sizeof(buf));
rc = wsprintfW(buf, testcase[i].fmt, testcase[i].input); rc = wsprintfW(buf, testcase[i].fmt, testcase[i].input);
todo_wine_if (i == 2)
ok(rc == testcase[i].rc, ok(rc == testcase[i].rc,
"%u: expected %d, got %d\n", "%u: expected %d, got %d\n",
i, testcase[i].rc, rc); i, testcase[i].rc, rc);
todo_wine ok(!memcmp(buf, testcase[i].str, (testcase[i].rc + 1) * sizeof(WCHAR)), ok(!memcmp(buf, testcase[i].str, (testcase[i].rc + 1) * sizeof(WCHAR)),
"%u: expected %s, got %s\n", i, "%u: expected %s, got %s\n", i,
wine_dbgstr_wn(testcase[i].str, testcase[i].rc + 1), wine_dbgstr_wn(testcase[i].str, testcase[i].rc + 1),
wine_dbgstr_wn(buf, rc + 1)); wine_dbgstr_wn(buf, rc + 1));

27
dlls/user32/wsprintf.c
View File

@ -259,8 +259,22 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg,
return (format->precision = 1); return (format->precision = 1);
case WPR_STRING: case WPR_STRING:
if (!arg->lpcstr_view) arg->lpcstr_view = null_stringA; if (!arg->lpcstr_view) arg->lpcstr_view = null_stringA;
for (len = 0; !format->precision || (len < format->precision); len++) if (dst_is_wide)
if (!*(arg->lpcstr_view + len)) break; {
LPCSTR p = arg->lpcstr_view;
for (len = 0; (!format->precision || len < format->precision) && *p; p++)
{
/* This isn't applicable for UTF-8 and UTF-7 */
if (IsDBCSLeadByte( *p )) p++;
len++;
if (!*p) break;
}
}
else
{
for (len = 0; !format->precision || (len < format->precision); len++)
if (!*(arg->lpcstr_view + len)) break;
}
if (len > maxlen) len = maxlen; if (len > maxlen) len = maxlen;
return (format->precision = len); return (format->precision = len);
case WPR_WSTRING: case WPR_WSTRING:
@ -494,7 +508,14 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a
case WPR_STRING: case WPR_STRING:
{ {
LPCSTR ptr = argData.lpcstr_view; LPCSTR ptr = argData.lpcstr_view;
for (i = 0; i < len; i++) *p++ = (BYTE)*ptr++; for (i = 0; i < len; i++)
{
WCHAR buf[2]; /* for LeadByte + NUL case, we need 2 WCHARs. */
int ret, mb_len = IsDBCSLeadByte( *ptr ) ? 2 : 1;
ret = MultiByteToWideChar( CP_ACP, 0, ptr, mb_len, buf, ARRAY_SIZE( buf ));
*p++ = buf[ret - 1];
ptr += mb_len;
}
} }
break; break;
case WPR_WSTRING: case WPR_WSTRING: