d3d9: Void functions should not return a value (Try 2)

Andrew Talbot Andrew.Talbot at talbotville.com
Sat Apr 7 15:58:48 CDT 2007


Please use this one: I missed a few functions, before.

Thanks,

-- Andy.
---
Changelog:
    d3d9: Void functions should not return a value.

diff -urN a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c
--- a/dlls/d3d9/basetexture.c	2006-10-10 19:21:44.000000000 +0100
+++ b/dlls/d3d9/basetexture.c	2007-04-07 21:25:34.000000000 +0100
@@ -147,7 +147,7 @@
 static void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPDIRECT3DBASETEXTURE9 iface) {
     IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface;
     TRACE("(%p) Relay\n" , This);
-    return IWineD3DBaseTexture_GenerateMipSubLevels(This->wineD3DBaseTexture);
+    IWineD3DBaseTexture_GenerateMipSubLevels(This->wineD3DBaseTexture);
 }
 
 const IDirect3DBaseTexture9Vtbl Direct3DBaseTexture9_Vtbl =
diff -urN a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c
--- a/dlls/d3d9/cubetexture.c	2006-12-18 11:36:16.000000000 +0000
+++ b/dlls/d3d9/cubetexture.c	2007-04-07 21:25:24.000000000 +0100
@@ -107,7 +107,7 @@
 static void WINAPI IDirect3DCubeTexture9Impl_PreLoad(LPDIRECT3DCUBETEXTURE9 iface) {
     IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture);
+    IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture);
 }
 
 static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(LPDIRECT3DCUBETEXTURE9 iface) {
@@ -150,7 +150,7 @@
 static void WINAPI IDirect3DCubeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DCUBETEXTURE9 iface) {
     IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DCubeTexture_GenerateMipSubLevels(This->wineD3DCubeTexture);
+    IWineD3DCubeTexture_GenerateMipSubLevels(This->wineD3DCubeTexture);
 }
 
 /* IDirect3DCubeTexture9 Interface follow: */
diff -urN a/dlls/d3d9/device.c b/dlls/d3d9/device.c
--- a/dlls/d3d9/device.c	2007-04-07 19:01:32.000000000 +0100
+++ b/dlls/d3d9/device.c	2007-04-07 21:55:08.000000000 +0100
@@ -163,7 +163,7 @@
 static void     WINAPI  IDirect3DDevice9Impl_SetCursorPosition(LPDIRECT3DDEVICE9 iface, int XScreenSpace, int YScreenSpace, DWORD Flags) {
     IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DDevice_SetCursorPosition(This->WineD3DDevice, XScreenSpace, YScreenSpace, Flags);
+    IWineD3DDevice_SetCursorPosition(This->WineD3DDevice, XScreenSpace, YScreenSpace, Flags);
 }
 
 static BOOL     WINAPI  IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9 iface, BOOL bShow) {
@@ -256,7 +256,7 @@
     TRACE("(%p) Relay\n", This);
    
     /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ 
-    return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (CONST WINED3DGAMMARAMP *)pRamp);
+    IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (CONST WINED3DGAMMARAMP *)pRamp);
 }
 
 static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) {    
@@ -264,7 +264,7 @@
     TRACE("(%p) Relay\n", This);
     
     /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */
-    return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, (WINED3DGAMMARAMP *) pRamp);
+    IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, (WINED3DGAMMARAMP *) pRamp);
 }
 
 
diff -urN a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c
--- a/dlls/d3d9/indexbuffer.c	2006-10-10 19:21:44.000000000 +0100
+++ b/dlls/d3d9/indexbuffer.c	2007-04-07 21:55:17.000000000 +0100
@@ -104,7 +104,7 @@
 static void WINAPI IDirect3DIndexBuffer9Impl_PreLoad(LPDIRECT3DINDEXBUFFER9 iface) {
     IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer);
+    IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer);
 }
 
 static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer9Impl_GetType(LPDIRECT3DINDEXBUFFER9 iface) {
diff -urN a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
--- a/dlls/d3d9/texture.c	2006-12-18 11:36:16.000000000 +0000
+++ b/dlls/d3d9/texture.c	2007-04-07 21:55:30.000000000 +0100
@@ -106,7 +106,7 @@
 static void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) {
     IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DTexture_PreLoad(This->wineD3DTexture);
+    IWineD3DTexture_PreLoad(This->wineD3DTexture);
 }
 
 static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 iface) {
@@ -149,7 +149,7 @@
 static void WINAPI IDirect3DTexture9Impl_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) {
     IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DTexture_GenerateMipSubLevels(This->wineD3DTexture);
+    IWineD3DTexture_GenerateMipSubLevels(This->wineD3DTexture);
 }
 
 /* IDirect3DTexture9 Interface follow: */



More information about the wine-patches mailing list