d3d9: Win64 printf format warning fixes
H. Verbeet
hverbeet at gmail.com
Tue Oct 10 12:23:22 CDT 2006
-------------- next part --------------
---
dlls/d3d9/Makefile.in | 1 -
dlls/d3d9/basetexture.c | 4 ++--
dlls/d3d9/cubetexture.c | 6 +++---
dlls/d3d9/d3d9_main.c | 10 +++++-----
dlls/d3d9/device.c | 12 ++++++------
dlls/d3d9/directx.c | 4 ++--
dlls/d3d9/indexbuffer.c | 4 ++--
dlls/d3d9/pixelshader.c | 4 ++--
dlls/d3d9/query.c | 6 +++---
dlls/d3d9/resource.c | 4 ++--
dlls/d3d9/stateblock.c | 4 ++--
dlls/d3d9/surface.c | 6 +++---
dlls/d3d9/swapchain.c | 4 ++--
dlls/d3d9/texture.c | 6 +++---
dlls/d3d9/vertexbuffer.c | 4 ++--
dlls/d3d9/vertexdeclaration.c | 4 ++--
dlls/d3d9/vertexshader.c | 8 ++++----
dlls/d3d9/volume.c | 6 +++---
dlls/d3d9/volumetexture.c | 6 +++---
19 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index 731ab37..904dda9 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -6,7 +6,6 @@ MODULE = d3d9.dll
IMPORTLIB = libd3d9.$(IMPLIBEXT)
IMPORTS = wined3d user32 gdi32 kernel32
EXTRALIBS = -ldxguid -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
basetexture.c \
diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c
index 7940ea4..1dff756 100644
--- a/dlls/d3d9/basetexture.c
+++ b/dlls/d3d9/basetexture.c
@@ -45,7 +45,7 @@ static ULONG WINAPI IDirect3DBaseTexture
IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -54,7 +54,7 @@ static ULONG WINAPI IDirect3DBaseTexture
IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DBaseTexture_Release(This->wineD3DBaseTexture);
diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c
index 7cc0f34..e140b2e 100644
--- a/dlls/d3d9/cubetexture.c
+++ b/dlls/d3d9/cubetexture.c
@@ -47,7 +47,7 @@ static ULONG WINAPI IDirect3DCubeTexture
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -56,7 +56,7 @@ static ULONG WINAPI IDirect3DCubeTexture
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
TRACE("Releasing child %p\n", This->wineD3DCubeTexture);
@@ -251,7 +251,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cr
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
HRESULT hr = D3D_OK;
- TRACE("(%p) : ELen(%d) Lvl(%d) Usage(%ld) fmt(%u), Pool(%d) Shared(%p)\n", This, EdgeLength, Levels, Usage, Format, Pool, pSharedHandle);
+ TRACE("(%p) : ELen(%d) Lvl(%d) Usage(%d) fmt(%u), Pool(%d) Shared(%p)\n", This, EdgeLength, Levels, Usage, Format, Pool, pSharedHandle);
/* Allocate the storage for the device */
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c
index a81fb01..a5e1cef 100644
--- a/dlls/d3d9/d3d9_main.c
+++ b/dlls/d3d9/d3d9_main.c
@@ -53,7 +53,7 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT
/* At process attach */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
{
- TRACE("fdwReason=%ld\n", fdwReason);
+ TRACE("fdwReason=%d\n", fdwReason);
if (fdwReason == DLL_PROCESS_ATTACH)
DisableThreadLibraryCalls(hInstDLL);
@@ -64,7 +64,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL,
* D3DPERF_BeginEvent (D3D9.@)
*/
int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) {
- FIXME("(color %#lx, name %s) : stub\n", color, debugstr_w(name));
+ FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name));
return D3DPERF_event_level++;
}
@@ -93,7 +93,7 @@ DWORD WINAPI D3DPERF_GetStatus(void) {
*/
void WINAPI D3DPERF_SetOptions(DWORD options)
{
- FIXME("(%#lx) : stub\n", options);
+ FIXME("(%#x) : stub\n", options);
}
/***********************************************************************
@@ -109,12 +109,12 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(voi
* D3DPERF_SetMarker (D3D9.@)
*/
void WINAPI D3DPERF_SetMarker(D3DCOLOR color, LPCWSTR name) {
- FIXME("(color %#lx, name %s) : stub\n", color, debugstr_w(name));
+ FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name));
}
/***********************************************************************
* D3DPERF_SetRegion (D3D9.@)
*/
void WINAPI D3DPERF_SetRegion(D3DCOLOR color, LPCWSTR name) {
- FIXME("(color %#lx, name %s) : stub\n", color, debugstr_w(name));
+ FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name));
}
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index e8033ed..4ccdabb 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -46,7 +46,7 @@ static ULONG WINAPI IDirect3DDevice9Impl
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -55,7 +55,7 @@ static ULONG WINAPI IDirect3DDevice9Impl
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DDevice_Uninit3D(This->WineD3DDevice);
@@ -246,13 +246,13 @@ static HRESULT WINAPI IDirect3DDevice9I
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
TRACE("(%p) Relay\n", This);
if(MultisampleQuality < 0) {
- FIXME("MultisampleQuality out of range %ld, substituting 0\n", MultisampleQuality);
+ FIXME("MultisampleQuality out of range %d, substituting 0\n", MultisampleQuality);
/*FIXME: Find out what windows does with a MultisampleQuality < 0 */
MultisampleQuality=0;
}
if(MultisampleQuality > 0){
- FIXME("MultisampleQuality set to %ld, bstituting 0\n", MultisampleQuality);
+ FIXME("MultisampleQuality set to %d, bstituting 0\n", MultisampleQuality);
/*
MultisampleQuality
[in] Quality level. The valid range is between zero and one less than the level returned by pQualityLevels used by IDirect3D9::CheckDeviceMultiSampleType. Passing a larger value returns the error D3DERR_INVALIDCALL. The MultisampleQuality values of paired render targets, depth stencil surfaces, and the MultiSample type must all match.
@@ -577,7 +577,7 @@ static HRESULT WINAPI IDirect3DDevice9
IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture);
IWineD3DBaseTexture_Release(retTexture);
}else{
- FIXME("Call to get texture (%ld) failed (%p)\n", Stage, retTexture);
+ FIXME("Call to get texture (%d) failed (%p)\n", Stage, retTexture);
*ppTexture = NULL;
}
return rc;
@@ -585,7 +585,7 @@ static HRESULT WINAPI IDirect3DDevice9
static HRESULT WINAPI IDirect3DDevice9Impl_SetTexture(LPDIRECT3DDEVICE9 iface, DWORD Stage, IDirect3DBaseTexture9* pTexture) {
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
- TRACE("(%p) Relay %ld %p\n" , This, Stage, pTexture);
+ TRACE("(%p) Relay %d %p\n" , This, Stage, pTexture);
return IWineD3DDevice_SetTexture(This->WineD3DDevice, Stage,
pTexture==NULL ? NULL:((IDirect3DBaseTexture9Impl *)pTexture)->wineD3DBaseTexture);
}
diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c
index a61526e..fe9568a 100644
--- a/dlls/d3d9/directx.c
+++ b/dlls/d3d9/directx.c
@@ -45,7 +45,7 @@ static ULONG WINAPI IDirect3D9Impl_AddRe
IDirect3D9Impl *This = (IDirect3D9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -54,7 +54,7 @@ static ULONG WINAPI IDirect3D9Impl_Relea
IDirect3D9Impl *This = (IDirect3D9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3D_Release(This->WineD3D);
diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c
index 269552a..c15df38 100644
--- a/dlls/d3d9/indexbuffer.c
+++ b/dlls/d3d9/indexbuffer.c
@@ -45,7 +45,7 @@ static ULONG WINAPI IDirect3DIndexBuffer
IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -54,7 +54,7 @@ static ULONG WINAPI IDirect3DIndexBuffer
IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DIndexBuffer_Release(This->wineD3DIndexBuffer);
diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c
index 210d85b..c20cb6c 100644
--- a/dlls/d3d9/pixelshader.c
+++ b/dlls/d3d9/pixelshader.c
@@ -44,7 +44,7 @@ static ULONG WINAPI IDirect3DPixelShader
IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -53,7 +53,7 @@ static ULONG WINAPI IDirect3DPixelShader
IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DPixelShader_Release(This->wineD3DPixelShader);
diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c
index e8a9270..75ff13d 100644
--- a/dlls/d3d9/query.c
+++ b/dlls/d3d9/query.c
@@ -46,7 +46,7 @@ static ULONG WINAPI IDirect3DQuery9Impl_
IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -54,7 +54,7 @@ static ULONG WINAPI IDirect3DQuery9Impl_
IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IUnknown_Release(This->parentDevice);
@@ -152,6 +152,6 @@ HRESULT WINAPI IDirect3DDevice9Impl_Crea
*ppQuery = (LPDIRECT3DQUERY9) object;
TRACE("(%p) : Created query %p\n", This , object);
}
- TRACE("(%p) : returning %lx\n", This, hr);
+ TRACE("(%p) : returning %x\n", This, hr);
return hr;
}
diff --git a/dlls/d3d9/resource.c b/dlls/d3d9/resource.c
index 0ec2072..d07d1da 100644
--- a/dlls/d3d9/resource.c
+++ b/dlls/d3d9/resource.c
@@ -44,7 +44,7 @@ static ULONG WINAPI IDirect3DResource9Im
IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -53,7 +53,7 @@ static ULONG WINAPI IDirect3DResource9Im
IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DResource_Release(This->wineD3DResource);
diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c
index 15400dd..5bfc870 100644
--- a/dlls/d3d9/stateblock.c
+++ b/dlls/d3d9/stateblock.c
@@ -45,7 +45,7 @@ static ULONG WINAPI IDirect3DStateBlock9
IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -54,7 +54,7 @@ static ULONG WINAPI IDirect3DStateBlock9
IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DStateBlock_Release(This->wineD3DStateBlock);
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 6eea19e..e953540 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -55,7 +55,7 @@ static ULONG WINAPI IDirect3DSurface9Imp
} else {
/* No container, handle our own refcounting */
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -76,7 +76,7 @@ static ULONG WINAPI IDirect3DSurface9Imp
} else {
/* No container, handle our own refcounting */
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DSurface_Release(This->wineD3DSurface);
@@ -198,7 +198,7 @@ static HRESULT WINAPI IDirect3DSurface9I
static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) {
IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface;
TRACE("(%p) Relay\n", This);
- TRACE("(%p) calling IWineD3DSurface_LockRect %p %p %p %ld\n", This, This->wineD3DSurface, pLockedRect, pRect, Flags);
+ TRACE("(%p) calling IWineD3DSurface_LockRect %p %p %p %d\n", This, This->wineD3DSurface, pLockedRect, pRect, Flags);
return IWineD3DSurface_LockRect(This->wineD3DSurface, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags);
}
diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c
index dd6d1e1..0b06049 100644
--- a/dlls/d3d9/swapchain.c
+++ b/dlls/d3d9/swapchain.c
@@ -46,7 +46,7 @@ static ULONG WINAPI IDirect3DSwapChain9I
IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -55,7 +55,7 @@ static ULONG WINAPI IDirect3DSwapChain9I
IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DSwapChain_Release(This->wineD3DSwapChain);
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 789cdb6..427a7a2 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -47,7 +47,7 @@ static ULONG WINAPI IDirect3DTexture9Imp
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -56,7 +56,7 @@ static ULONG WINAPI IDirect3DTexture9Imp
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DTexture_Release(This->wineD3DTexture);
@@ -244,7 +244,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cr
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
HRESULT hrc = D3D_OK;
- TRACE("(%p) : W(%d) H(%d), Lvl(%d) d(%ld), Fmt(%u), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, Pool);
+ TRACE("(%p) : W(%d) H(%d), Lvl(%d) d(%d), Fmt(%u), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, Pool);
/* Allocate the storage for the device */
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DTexture9Impl));
diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c
index 5626920..fe34eef 100644
--- a/dlls/d3d9/vertexbuffer.c
+++ b/dlls/d3d9/vertexbuffer.c
@@ -46,7 +46,7 @@ static ULONG WINAPI IDirect3DVertexBuffe
IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -55,7 +55,7 @@ static ULONG WINAPI IDirect3DVertexBuffe
IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DVertexBuffer_Release(This->wineD3DVertexBuffer);
diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c
index 246b52f..5572552 100644
--- a/dlls/d3d9/vertexdeclaration.c
+++ b/dlls/d3d9/vertexdeclaration.c
@@ -200,7 +200,7 @@ static ULONG WINAPI IDirect3DVertexDecla
IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -209,7 +209,7 @@ static ULONG WINAPI IDirect3DVertexDecla
IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DVertexDeclaration_Release(This->wineD3DVertexDeclaration);
diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c
index 2244dbd..aad04ac 100644
--- a/dlls/d3d9/vertexshader.c
+++ b/dlls/d3d9/vertexshader.c
@@ -44,7 +44,7 @@ static ULONG WINAPI IDirect3DVertexShade
IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -53,7 +53,7 @@ static ULONG WINAPI IDirect3DVertexShade
IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DVertexShader_Release(This->wineD3DVertexShader);
@@ -141,7 +141,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetV
TRACE("(%p) : Relay\n", This);
hrc = IWineD3DDevice_SetVertexShader(This->WineD3DDevice, pShader==NULL?NULL:((IDirect3DVertexShader9Impl *)pShader)->wineD3DVertexShader);
- TRACE("(%p) : returning hr(%lu)\n", This, hrc);
+ TRACE("(%p) : returning hr(%u)\n", This, hrc);
return hrc;
}
@@ -156,7 +156,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetV
hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader);
IWineD3DVertexShader_Release(pShader);
} else {
- WARN("(%p) : Call to IWineD3DDevice_GetVertexShader failed %lu (device %p)\n", This, hrc, This->WineD3DDevice);
+ WARN("(%p) : Call to IWineD3DDevice_GetVertexShader failed %u (device %p)\n", This, hrc, This->WineD3DDevice);
}
TRACE("(%p) : returning %p\n", This, *ppShader);
return hrc;
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index dbbdbb3..6ced19a 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -54,7 +54,7 @@ static ULONG WINAPI IDirect3DVolume9Impl
} else {
/* No container, handle our own refcounting */
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
}
@@ -73,7 +73,7 @@ static ULONG WINAPI IDirect3DVolume9Impl
} else {
/* No container, handle our own refcounting */
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DVolume_Release(This->wineD3DVolume);
@@ -172,7 +172,7 @@ static HRESULT WINAPI IDirect3DVolume9Im
static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) {
IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
- TRACE("(%p) relay %p %p %p %ld\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags);
+ TRACE("(%p) relay %p %p %p %d\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags);
return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (WINED3DBOX *) pBox, Flags);
}
diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c
index cba0ccb..79ac57d 100644
--- a/dlls/d3d9/volumetexture.c
+++ b/dlls/d3d9/volumetexture.c
@@ -46,7 +46,7 @@ static ULONG WINAPI IDirect3DVolumeTextu
IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
@@ -55,7 +55,7 @@ static ULONG WINAPI IDirect3DVolumeTextu
IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
IWineD3DVolumeTexture_Release(This->wineD3DVolumeTexture);
@@ -189,7 +189,7 @@ static HRESULT WINAPI IDirect3DVolumeTex
static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) {
IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface;
- TRACE("(%p) Relay %p %p %p %ld\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags);
+ TRACE("(%p) Relay %p %p %p %d\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags);
return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (WINED3DBOX *) pBox, Flags);
}
More information about the wine-patches
mailing list