dxerr9: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Sat Oct 7 17:50:14 CDT 2006
---
dlls/dxerr9/Makefile.in | 1 -
dlls/dxerr9/dxerr9.c | 16 ++++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in
index d40946d..eb4e114 100644
--- a/dlls/dxerr9/Makefile.in
+++ b/dlls/dxerr9/Makefile.in
@@ -3,7 +3,6 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = libdxerr9.a
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
dxerr9.c
diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c
index e419925..7bfb91b 100644
--- a/dlls/dxerr9/dxerr9.c
+++ b/dlls/dxerr9/dxerr9.c
@@ -58,7 +58,7 @@ #include "errors.h"
const char * WINAPI DXGetErrorString9A(HRESULT hr)
{
unsigned int i, j, k = 0;
- TRACE("(0x%08lx)\n", hr);
+ TRACE("(0x%08x)\n", hr);
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
j = k + (i / 2);
@@ -77,7 +77,7 @@ const WCHAR * WINAPI DXGetErrorString9W(
{
static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 };
unsigned int i, j, k = 0;
- TRACE("(0x%08lx)\n", hr);
+ TRACE("(0x%08x)\n", hr);
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
j = k + (i / 2);
@@ -95,7 +95,7 @@ const WCHAR * WINAPI DXGetErrorString9W(
const char * WINAPI DXGetErrorDescription9A(HRESULT hr)
{
unsigned int i, j, k = 0;
- TRACE("(0x%08lx)\n", hr);
+ TRACE("(0x%08x)\n", hr);
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
j = k + (i / 2);
@@ -114,7 +114,7 @@ const WCHAR * WINAPI DXGetErrorDescripti
{
static const WCHAR na[] = { 'n', '/', 'a', 0 };
unsigned int i, j, k = 0;
- TRACE("(0x%08lx)\n", hr);
+ TRACE("(0x%08x)\n", hr);
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
j = k + (i / 2);
@@ -132,14 +132,14 @@ const WCHAR * WINAPI DXGetErrorDescripti
HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox)
{
char msg[1024];
- TRACE("(%p,%ld,0x%08lx,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox);
+ TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox);
if (bPopMsgBox) {
- snprintf(msg, sizeof(msg), "File: %s\nLine: %ld\nError Code: %s (0x%08lx)\nCalling: %s",
+ snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s",
strFile, dwLine, DXGetErrorString9A(hr), hr, strMsg);
MessageBoxA(0, msg, "Unexpected error encountered", MB_OK|MB_ICONERROR);
} else {
- snprintf(msg, sizeof(msg), "%s(%ld): %s (hr=%s (0x%08lx))", strFile,
+ snprintf(msg, sizeof(msg), "%s(%d): %s (hr=%s (0x%08x))", strFile,
dwLine, strMsg, DXGetErrorString9A(hr), hr);
OutputDebugStringA(msg);
}
@@ -150,7 +150,7 @@ HRESULT WINAPI DXTraceA(const char* strF
HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox)
{
WCHAR msg[1024];
- TRACE("(%p,%ld,0x%08lx,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox);
+ TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox);
if (bPopMsgBox) {
static const WCHAR format[] = { 'F','i','l','e',':',' ','%','s','\\','n','L','i','n',
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061008/67a07d91/attachment.pgp
More information about the wine-patches
mailing list