forked from Mirrors/wine-wine
cmd: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>feature/deterministic
parent
160654be63
commit
88c34b39ed
|
@ -134,12 +134,11 @@ void WINAPIV WCMD_output (const WCHAR *format, ...) {
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
|
||||||
__ms_va_start(ap,format);
|
__ms_va_start(ap,format);
|
||||||
SetLastError(NO_ERROR);
|
|
||||||
string = NULL;
|
string = NULL;
|
||||||
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
||||||
format, 0, 0, (LPWSTR)&string, 0, &ap);
|
format, 0, 0, (LPWSTR)&string, 0, &ap);
|
||||||
__ms_va_end(ap);
|
__ms_va_end(ap);
|
||||||
if (len == 0 && GetLastError() != NO_ERROR)
|
if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE)
|
||||||
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
|
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -160,12 +159,11 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) {
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
|
||||||
__ms_va_start(ap,format);
|
__ms_va_start(ap,format);
|
||||||
SetLastError(NO_ERROR);
|
|
||||||
string = NULL;
|
string = NULL;
|
||||||
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
||||||
format, 0, 0, (LPWSTR)&string, 0, &ap);
|
format, 0, 0, (LPWSTR)&string, 0, &ap);
|
||||||
__ms_va_end(ap);
|
__ms_va_end(ap);
|
||||||
if (len == 0 && GetLastError() != NO_ERROR)
|
if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE)
|
||||||
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
|
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -186,11 +184,10 @@ WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...)
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
|
||||||
__ms_va_start(ap,format);
|
__ms_va_start(ap,format);
|
||||||
SetLastError(NO_ERROR);
|
|
||||||
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
||||||
format, 0, 0, (LPWSTR)&string, 0, &ap);
|
format, 0, 0, (LPWSTR)&string, 0, &ap);
|
||||||
__ms_va_end(ap);
|
__ms_va_end(ap);
|
||||||
if (len == 0 && GetLastError() != NO_ERROR) {
|
if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) {
|
||||||
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
|
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
|
||||||
string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2);
|
string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2);
|
||||||
*string = 0;
|
*string = 0;
|
||||||
|
|
Loading…
Reference in New Issue