Michael Stefaniuc : d3dxof: Win64 printf format warning fixes.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 9 06:03:28 CDT 2006
Module: wine
Branch: master
Commit: 51ca8e8ef87de3999854b329a8b4f458c7df35fc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ca8e8ef87de3999854b329a8b4f458c7df35fc
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Sun Oct 8 18:59:55 2006 +0200
d3dxof: Win64 printf format warning fixes.
---
dlls/d3dxof/Makefile.in | 1 -
dlls/d3dxof/d3dxof.c | 42 +++++++++++++++++++++---------------------
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in
index 1df954e..6bdc04b 100644
--- a/dlls/d3dxof/Makefile.in
+++ b/dlls/d3dxof/Makefile.in
@@ -6,7 +6,6 @@ MODULE = d3dxof.dll
IMPORTLIB = libd3dxof.$(IMPLIBEXT)
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = -ldxguid -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
main.c \
diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
index e082a4e..0904f64 100644
--- a/dlls/d3dxof/d3dxof.c
+++ b/dlls/d3dxof/d3dxof.c
@@ -82,7 +82,7 @@ static ULONG WINAPI IDirectXFileImpl_Add
IDirectXFileImpl *This = (IDirectXFileImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1);
+ TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1);
return ref;
}
@@ -92,7 +92,7 @@ static ULONG WINAPI IDirectXFileImpl_Rel
IDirectXFileImpl *This = (IDirectXFileImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref);
+ TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref);
if (!ref)
HeapFree(GetProcessHeap(), 0, This);
@@ -107,7 +107,7 @@ static HRESULT WINAPI IDirectXFileImpl_C
IDirectXFileImpl *This = (IDirectXFileImpl *)iface;
IDirectXFileEnumObjectImpl* object;
- FIXME("(%p/%p)->(%p,%lx,%p) stub!\n", This, iface, pvSource, dwLoadOptions, ppEnumObj);
+ FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pvSource, dwLoadOptions, ppEnumObj);
if (dwLoadOptions == 0)
{
@@ -128,7 +128,7 @@ static HRESULT WINAPI IDirectXFileImpl_C
{
IDirectXFileImpl *This = (IDirectXFileImpl *)iface;
- FIXME("(%p/%p)->(%s,%lx,%p) stub!\n", This, iface, szFileName, dwFileFormat, ppSaveObj);
+ FIXME("(%p/%p)->(%s,%x,%p) stub!\n", This, iface, szFileName, dwFileFormat, ppSaveObj);
return S_FALSE;
}
@@ -137,7 +137,7 @@ static HRESULT WINAPI IDirectXFileImpl_R
{
IDirectXFileImpl *This = (IDirectXFileImpl *)iface;
- FIXME("(%p/%p)->(%p,%ld) stub!\n", This, iface, pvData, cbSize);
+ FIXME("(%p/%p)->(%p,%d) stub!\n", This, iface, pvData, cbSize);
return S_FALSE;
}
@@ -193,7 +193,7 @@ static ULONG WINAPI IDirectXFileBinaryIm
IDirectXFileBinaryImpl *This = (IDirectXFileBinaryImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1);
+ TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1);
return ref;
}
@@ -203,7 +203,7 @@ static ULONG WINAPI IDirectXFileBinaryIm
IDirectXFileBinaryImpl *This = (IDirectXFileBinaryImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref);
+ TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref);
if (!ref)
HeapFree(GetProcessHeap(), 0, This);
@@ -254,7 +254,7 @@ static HRESULT WINAPI IDirectXFileBinary
{
IDirectXFileBinaryImpl *This = (IDirectXFileBinaryImpl *)iface;
- FIXME("(%p/%p)->(%p, %ld, %p) stub!\n", This, iface, pvData, cbSize, pcbRead);
+ FIXME("(%p/%p)->(%p, %d, %p) stub!\n", This, iface, pvData, cbSize, pcbRead);
return S_FALSE;
}
@@ -312,7 +312,7 @@ static ULONG WINAPI IDirectXFileDataImpl
IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1);
+ TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1);
return ref;
}
@@ -322,7 +322,7 @@ static ULONG WINAPI IDirectXFileDataImpl
IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref);
+ TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref);
if (!ref)
HeapFree(GetProcessHeap(), 0, This);
@@ -400,7 +400,7 @@ static HRESULT WINAPI IDirectXFileDataIm
{
IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface;
- FIXME("(%p/%p)->(%s,%p,%s,%p,%ld) stub!\n", This, iface, szName, pguid, szMimeType, pvData, cbSize);
+ FIXME("(%p/%p)->(%s,%p,%s,%p,%d) stub!\n", This, iface, szName, pguid, szMimeType, pvData, cbSize);
return S_FALSE;
}
@@ -461,7 +461,7 @@ static ULONG WINAPI IDirectXFileDataRefe
IDirectXFileDataReferenceImpl *This = (IDirectXFileDataReferenceImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1);
+ TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1);
return ref;
}
@@ -471,7 +471,7 @@ static ULONG WINAPI IDirectXFileDataRefe
IDirectXFileDataReferenceImpl *This = (IDirectXFileDataReferenceImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref);
+ TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref);
if (!ref)
HeapFree(GetProcessHeap(), 0, This);
@@ -558,7 +558,7 @@ static ULONG WINAPI IDirectXFileEnumObje
IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1);
+ TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1);
return ref;
}
@@ -568,7 +568,7 @@ static ULONG WINAPI IDirectXFileEnumObje
IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref);
+ TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref);
if (!ref)
HeapFree(GetProcessHeap(), 0, This);
@@ -662,7 +662,7 @@ static ULONG WINAPI IDirectXFileObjectIm
IDirectXFileObjectImpl *This = (IDirectXFileObjectImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1);
+ TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1);
return ref;
}
@@ -672,7 +672,7 @@ static ULONG WINAPI IDirectXFileObjectIm
IDirectXFileObjectImpl *This = (IDirectXFileObjectImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref);
+ TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref);
if (!ref)
HeapFree(GetProcessHeap(), 0, This);
@@ -748,7 +748,7 @@ static ULONG WINAPI IDirectXFileSaveObje
IDirectXFileSaveObjectImpl *This = (IDirectXFileSaveObjectImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1);
+ TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1);
return ref;
}
@@ -758,7 +758,7 @@ static ULONG WINAPI IDirectXFileSaveObje
IDirectXFileSaveObjectImpl *This = (IDirectXFileSaveObjectImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref);
+ TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref);
if (!ref)
HeapFree(GetProcessHeap(), 0, This);
@@ -770,7 +770,7 @@ static HRESULT WINAPI IDirectXFileSaveOb
{
IDirectXFileSaveObjectImpl *This = (IDirectXFileSaveObjectImpl *)iface;
- FIXME("(%p/%p)->(%ld,%p) stub!\n", This, iface, cTemplates, ppguidTemplates);
+ FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, cTemplates, ppguidTemplates);
return S_FALSE;
}
@@ -779,7 +779,7 @@ static HRESULT WINAPI IDirectXFileSaveOb
{
IDirectXFileSaveObjectImpl *This = (IDirectXFileSaveObjectImpl *)iface;
- FIXME("(%p/%p)->(%p,%s,%p,%ld,%p,%p) stub!\n", This, iface, rguidTemplate, szName, pguid, cbSize, pvData, ppDataObj);
+ FIXME("(%p/%p)->(%p,%s,%p,%d,%p,%p) stub!\n", This, iface, rguidTemplate, szName, pguid, cbSize, pvData, ppDataObj);
return S_FALSE;
}
More information about the wine-cvs
mailing list