Skip to content

W
wine-winehq
Commit 1e5777ed authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

The behavior for wsprintfA is different that for wsprintf16 in how it

handles NULLs being passed as character parameters.
parent 5ee3879c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 16 deletions
dlls/user/wsprintf.c
View file @ 1e5777ed
......@@ -312,6 +312,7 @@ static INT16 wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec,
case WPR_WCHAR: /* No Unicode in Win16 */
case WPR_CHAR:
*p= cur_arg.char_view;
/* wsprintf16 (unlike wsprintf) ignores null characters */
if (*p != '\0') p++;
else if (format.width > 1) *p++ = ' ';
else len = 0;
......@@ -400,16 +401,10 @@ INT WINAPI wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args )
switch(format.type)
{
case WPR_WCHAR:
*p = argData.wchar_view;
if (*p != '\0') p++;
else if (format.width > 1) *p++ = ' ';
else len = 0;
*p++ = argData.wchar_view;
break;
case WPR_CHAR:
*p = argData.char_view;
if (*p != '\0') p++;
else if (format.width > 1) *p++ = ' ';
else len = 0;
*p++ = argData.char_view;
break;
case WPR_STRING:
memcpy( p, argData.lpcstr_view, len );
......@@ -501,16 +496,10 @@ INT WINAPI wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args )
switch(format.type)
{
case WPR_WCHAR:
*p = argData.wchar_view;
if (*p != '\0') p++;
else if (format.width > 1) *p++ = ' ';
else len = 0;
*p++ = argData.wchar_view;
break;
case WPR_CHAR:
*p = argData.char_view;
if (*p != '\0') p++;
else if (format.width > 1) *p++ = ' ';
else len = 0;
*p++ = argData.char_view;
break;
case WPR_STRING:
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment