Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PING]

Browse source 
- Use a dynamic-allocated buffer with FormatMessageW, fixes messages disappearance (eg. ping help in russian). CORE-12108 #comment Fixed in r72943.
- Remove the unneeded 1-line function "Usage" and instead just directly call the corresponding PrintString function.

svn path=/trunk/; revision=72943
This commit is contained in:
Hermès Bélusca-Maïto 2016-10-08 14:48:18 +00:00
parent d03fd72465
commit 8dd8a9d989
1 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
reactos/base/applications/network/ping/ping.c
View file

@ -49,7 +49,6 @@
static BOOL ParseCmdLine(int argc, PWSTR argv[]);
static BOOL ResolveTarget(PCWSTR target);
static void Usage(void);
static void Ping(void);
static void PrintStats(void);
static BOOL WINAPI ConsoleCtrlHandler(DWORD ControlType);
@ -180,46 +179,37 @@ static
void
PrintString(UINT id, ...)
{
WCHAR Format[1024];
WCHAR Msg[1024];
DWORD Len, written;
#define RC_STRING_MAX_SIZE 4096
WCHAR Format[RC_STRING_MAX_SIZE];
LPWSTR lpMsgBuf = NULL;
DWORD Len;
va_list args;
if (!LoadStringW(GetModuleHandleW(NULL), id, Format, _countof(Format)))
{
DPRINT("LoadStringW failed: %lu\n", GetLastError());
return;
}
va_start(args, id);
Len = FormatMessageW(
FORMAT_MESSAGE_FROM_STRING,
Format, 0, 0,
Msg, 1024, &args);
if (Len == 0)
Len = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
Format, 0, 0, (PWSTR)&lpMsgBuf, 0, &args);
if (lpMsgBuf /* && Len != 0 */)
{
// TODO: Handle writing to file. Well, use the ConUtils lib!
WriteConsoleW(hStdOut, lpMsgBuf, Len, &Len, NULL);
LocalFree(lpMsgBuf);
}
else
{
DPRINT("FormatMessageW failed: %lu\n", GetLastError());
va_end(args);
return;
}
// TODO: Handle writing to file.
WriteConsole(hStdOut, Msg, Len, &written, NULL);
va_end(args);
}
static
void
Usage(void)
{
PrintString(IDS_USAGE);
}
static
BOOL
ParseCmdLine(int argc, PWSTR argv[])
@ -228,8 +218,7 @@ ParseCmdLine(int argc, PWSTR argv[])
if (argc < 2)
{
Usage();
PrintString(IDS_USAGE);
return FALSE;
}
@ -404,14 +393,12 @@ ParseCmdLine(int argc, PWSTR argv[])
break;
case L'?':
Usage();
PrintString(IDS_USAGE);
return FALSE;
default:
PrintString(IDS_BAD_OPTION, argv[i]);
Usage();
PrintString(IDS_USAGE);
return FALSE;
}
}