mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 11:43:31 +00:00
kernel32: If string arg to FormatMessage is NULL, use "(null)" instead of crashing.
This commit is contained in:
parent
4e7b3bad6b
commit
b1f04e23bf
2 changed files with 19 additions and 3 deletions
|
@ -135,15 +135,18 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format,
|
|||
if (*format != '!') /* simple string */
|
||||
{
|
||||
arg = get_arg( insert, flags, args );
|
||||
if (unicode_caller)
|
||||
if (unicode_caller || !arg)
|
||||
{
|
||||
WCHAR *str = (WCHAR *)arg;
|
||||
static const WCHAR nullW[] = {'(','n','u','l','l',')',0};
|
||||
const WCHAR *str = (const WCHAR *)arg;
|
||||
|
||||
if (!str) str = nullW;
|
||||
*result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) );
|
||||
strcpyW( *result, str );
|
||||
}
|
||||
else
|
||||
{
|
||||
char *str = (char *)arg;
|
||||
const char *str = (const char *)arg;
|
||||
DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 );
|
||||
*result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) );
|
||||
MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length );
|
||||
|
|
|
@ -125,6 +125,7 @@ static void test_message_from_string_wide(void)
|
|||
static const WCHAR s_sp002sp001[] = {' ',' ','0','0','0','2',',',' ',' ','0','0','1',0};
|
||||
static const WCHAR s_sp002sp003[] = {' ',' ','0','0','0','2',',',' ','0','0','0','0','3',0};
|
||||
static const WCHAR s_sp001004[] = {' ',' ','0','0','1',',','0','0','0','0','0','4',0};
|
||||
static const WCHAR s_null[] = {'(','n','u','l','l',')',0};
|
||||
|
||||
static const WCHAR init_buf[] = {'x', 'x', 'x', 'x', 'x', 'x'};
|
||||
static const WCHAR broken_buf[] = {'t','e','s','t','x','x'};
|
||||
|
@ -381,6 +382,12 @@ static void test_message_from_string_wide(void)
|
|||
ok(!lstrcmpW(s_crlfcrlf, out), "failed out=%s\n", wine_dbgstr_w(out));
|
||||
ok(r==4,"failed: r=%d\n", r);
|
||||
|
||||
/* null string as argument */
|
||||
r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0,
|
||||
0, out, sizeof(out)/sizeof(WCHAR), NULL);
|
||||
ok(!lstrcmpW(s_null, out),"failed out=[%s]\n", wine_dbgstr_w(out));
|
||||
ok(r==6,"failed: r=%d\n",r);
|
||||
|
||||
/* precision and width */
|
||||
|
||||
r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_13s,
|
||||
|
@ -700,6 +707,12 @@ static void test_message_from_string(void)
|
|||
ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out);
|
||||
ok(r==4,"failed: r=%d\n",r);
|
||||
|
||||
/* null string as argument */
|
||||
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0,
|
||||
0, out, sizeof(out)/sizeof(CHAR), NULL);
|
||||
ok(!strcmp("(null)", out),"failed out=[%s]\n",out);
|
||||
ok(r==6,"failed: r=%d\n",r);
|
||||
|
||||
/* precision and width */
|
||||
|
||||
r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!3s!",
|
||||
|
|
Loading…
Reference in a new issue