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

hostname: Use wide-char string literals. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2020-10-05 23:22:52 +02:00 committed by Alexandre Julliard
parent 69dd275285
commit 0df592b7d5
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
programs/hostname/hostname.c
View File

@ -91,18 +91,15 @@ static int WINAPIV hostname_message_printfW(int msg, ...)
static int hostname_message(int msg) static int hostname_message(int msg)
{ {
static const WCHAR formatW[] = {'%','s',0};
WCHAR msg_buffer[8192]; WCHAR msg_buffer[8192];
LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
return hostname_printfW(formatW, msg_buffer); return hostname_printfW(L"%s", msg_buffer);
} }
static int display_computer_name(void) static int display_computer_name(void)
{ {
static const WCHAR fmtW[] = {'%','s','\r','\n',0};
WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR name[MAX_COMPUTERNAME_LENGTH + 1];
DWORD size = ARRAY_SIZE(name); DWORD size = ARRAY_SIZE(name);
BOOL ret; BOOL ret;
@ -114,7 +111,7 @@ static int display_computer_name(void)
return 1; return 1;
} }
hostname_printfW(fmtW, name); hostname_printfW(L"%s\r\n", name);
return 0; return 0;
} }
@ -122,11 +119,9 @@ int __cdecl wmain(int argc, WCHAR *argv[])
{ {
if (argc > 1) if (argc > 1)
{ {
static const WCHAR slashHelpW[] = {'/','?',0};
unsigned int i; unsigned int i;
if (!wcsncmp(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) if (!wcsncmp(argv[1], L"/?", ARRAY_SIZE(L"/?") - 1))
{ {
hostname_message(STRING_USAGE); hostname_message(STRING_USAGE);
return 1; return 1;