Thomas Faber : dxdiag: Do not omit mandatory argument to WriteFile.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jul 14 14:52:32 CDT 2014
Module: wine
Branch: master
Commit: f325bf745872cfeec383f33ea2b19dcaa67361c5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f325bf745872cfeec383f33ea2b19dcaa67361c5
Author: Thomas Faber <thomas.faber at reactos.org>
Date: Sat Jul 12 10:40:12 2014 +0200
dxdiag: Do not omit mandatory argument to WriteFile.
---
programs/dxdiag/output.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c
index 7fb9a4c..c18c75d 100644
--- a/programs/dxdiag/output.c
+++ b/programs/dxdiag/output.c
@@ -72,6 +72,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption)
DWORD len = strlen(caption);
DWORD total_len = 3 * (len + sizeof(crlf));
char *ptr = output_buffer;
+ DWORD bytes_written;
assert(total_len <= sizeof(output_buffer));
@@ -92,7 +93,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption)
memcpy(ptr, crlf, sizeof(crlf));
- return WriteFile(hFile, output_buffer, total_len, NULL, NULL);
+ return WriteFile(hFile, output_buffer, total_len, &bytes_written, NULL);
}
static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_width, const WCHAR *value)
@@ -102,6 +103,7 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_
DWORD total_len = field_width + sizeof(": ") - 1 + value_lenA + sizeof(crlf);
char sprintf_fmt[1 + 10 + 3 + 1];
char *ptr = output_buffer;
+ DWORD bytes_written;
assert(total_len <= sizeof(output_buffer));
@@ -111,12 +113,13 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_
ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL);
memcpy(ptr, crlf, sizeof(crlf));
- return WriteFile(hFile, output_buffer, total_len, NULL, NULL);
+ return WriteFile(hFile, output_buffer, total_len, &bytes_written, NULL);
}
static BOOL output_crlf(HANDLE hFile)
{
- return WriteFile(hFile, crlf, sizeof(crlf), NULL, NULL);
+ DWORD bytes_written;
+ return WriteFile(hFile, crlf, sizeof(crlf), &bytes_written, NULL);
}
static inline void fill_system_text_output_table(struct dxdiag_information *dxdiag_info, struct text_information_field *fields)
More information about the wine-cvs
mailing list