Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_force_reload().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 32b1f25f4beaeae419e86ed8123730a33c38a0b6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=32b1f25f4beaeae419e86ed812...

Author: Henri Verbeet 
Date:   Mon Apr 26 11:02:36 2010 +0200

wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_force_reload().

---

dlls/wined3d/surface.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c62d741..d768ff4 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -463,11 +463,9 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type,
     return hr;
 }

-static void surface_force_reload(IWineD3DSurface *iface)
+static void surface_force_reload(IWineD3DSurfaceImpl *surface)
 {
-    IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
-
-    This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED);
+    surface->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED);
 }

void surface_set_texture_name(IWineD3DSurface *iface, GLuint new_name, BOOL srgb)
@@ -499,7 +497,7 @@ void surface_set_texture_name(IWineD3DSurface *iface, GLuint new_name, BOOL srgb
     }

*name = new_name;
-    surface_force_reload(iface);
+    surface_force_reload(This);
 }

void surface_set_texture_target(IWineD3DSurface *iface, GLenum target)
@@ -520,7 +518,7 @@ void surface_set_texture_target(IWineD3DSurface *iface, GLenum target)
         }
     }
     This->texture_target = target;
-    surface_force_reload(iface);
+    surface_force_reload(This);
 }

/* Context activation is done by the caller. */
@@ -2025,7 +2023,7 @@ static void surface_release_client_storage(IWineD3DSurface *iface)

IWineD3DSurface_ModifyLocation(iface, SFLAG_INSRGBTEX, FALSE);
     IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE);
-    surface_force_reload(iface);
+    surface_force_reload(This);
 }

static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC)