Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/dxdiag/Makefile.in | 1 - programs/dxdiag/information.c | 2 +- programs/dxdiag/output.c | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 9f2f0f19b14..2ea7a084d19 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxdiag.exe IMPORTS = dxguid ole32 oleaut32 user32 comctl32
diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index 74fe15f7aec..99c1a6715b2 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -190,7 +190,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) &IID_IDxDiagProvider, (void **)&pddp); if (FAILED(hr)) { - WINE_ERR("IDxDiagProvider instance creation failed with 0x%08x\n", hr); + WINE_ERR("IDxDiagProvider instance creation failed with 0x%08lx\n", hr); goto error; }
diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 95941785c1c..a8eb733ba4b 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -85,7 +85,7 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_
assert(total_len <= sizeof(output_buffer));
- sprintf(sprintf_fmt, "%%%us: ", field_width); + sprintf(sprintf_fmt, "%%%lus: ", field_width); ptr += sprintf(ptr, sprintf_fmt, field_name);
ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL); @@ -153,7 +153,7 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - WINE_ERR("File creation failed, last error %u\n", GetLastError()); + WINE_ERR("File creation failed, last error %lu\n", GetLastError()); return FALSE; }
@@ -277,7 +277,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const &IID_IXMLDOMDocument, (void **)&xmldoc); if (FAILED(hr)) { - WINE_ERR("IXMLDOMDocument instance creation failed with 0x%08x\n", hr); + WINE_ERR("IXMLDOMDocument instance creation failed with 0x%08lx\n", hr); goto error; }