[PATCH 3/3] d3dx9_36: Remove 'relay' in traces for functions that do not forward to another ones.

Christian Costa titan.costa at gmail.com
Tue Jun 4 02:32:08 CDT 2013


This is misleading. We expect in traces a call to a counterpart function whereas it's not the case.
---
 dlls/d3dx9_36/line.c   |    2 +-
 dlls/d3dx9_36/sprite.c |   12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c
index 1ec643a..e305eb9 100644
--- a/dlls/d3dx9_36/line.c
+++ b/dlls/d3dx9_36/line.c
@@ -85,7 +85,7 @@ static HRESULT WINAPI ID3DXLineImpl_GetDevice(struct ID3DXLine *iface, struct ID
 {
     ID3DXLineImpl *This = impl_from_ID3DXLine(iface);
 
-    TRACE ("(%p)->(%p): relay\n", This, device);
+    TRACE ("(%p)->(%p)\n", This, device);
 
     if (device == NULL) return D3DERR_INVALIDCALL;
 
diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c
index 658b6ea..1f7defb 100644
--- a/dlls/d3dx9_36/sprite.c
+++ b/dlls/d3dx9_36/sprite.c
@@ -123,7 +123,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_GetDevice(struct ID3DXSprite *iface, struc
 {
     ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface);
 
-    TRACE("(%p)->(%p): relay\n", This, device);
+    TRACE("(%p)->(%p)\n", This, device);
 
     if(device==NULL) return D3DERR_INVALIDCALL;
     *device=This->device;
@@ -258,7 +258,8 @@ static HRESULT WINAPI ID3DXSpriteImpl_Begin(ID3DXSprite *iface, DWORD flags)
 {
     ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface);
     HRESULT hr;
-    TRACE("(%p): relay\n", This);
+
+    TRACE("(%p)->(%#x)\n", This, flags);
 
     if(flags>D3DXSPRITE_FLAGLIMIT || This->ready) return D3DERR_INVALIDCALL;
 
@@ -384,7 +385,8 @@ static HRESULT WINAPI ID3DXSpriteImpl_Flush(ID3DXSprite *iface)
     ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface);
     SPRITEVERTEX *vertices;
     int i, count=0, start;
-    TRACE("(%p)->(): relay\n", This);
+
+    TRACE("(%p)->()\n", This);
 
     if(!This->ready) return D3DERR_INVALIDCALL;
     if(!This->sprite_count) return D3D_OK;
@@ -456,7 +458,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_End(ID3DXSprite *iface)
 {
     ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface);
 
-    TRACE("(%p)->(): relay\n", This);
+    TRACE("(%p)->()\n", This);
 
     if(!This->ready) return D3DERR_INVALIDCALL;
 
@@ -534,7 +536,7 @@ HRESULT WINAPI D3DXCreateSprite(struct IDirect3DDevice9 *device, struct ID3DXSpr
     ID3DXSpriteImpl *object;
     D3DCAPS9 caps;
 
-    TRACE("(%p, %p): relay\n", device, sprite);
+    TRACE("(%p, %p)\n", device, sprite);
 
     if(device==NULL || sprite==NULL) return D3DERR_INVALIDCALL;
 




More information about the wine-patches mailing list