Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_released().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 834b599e19df6ba775dfc3dd441e842db75ea393
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=834b599e19df6ba775dfc3dd44...

Author: Henri Verbeet 
Date:   Sun Jan 16 23:36:46 2011 +0100

wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_released().

---

dlls/wined3d/device.c          |    8 ++++----
 dlls/wined3d/resource.c        |    2 +-
 dlls/wined3d/wined3d_private.h |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b1769e8..2008aee 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6602,14 +6602,14 @@ static void device_resource_remove(struct IWineD3DDeviceImpl *device, struct IWi
     list_remove(&resource->resource.resource_list_entry);
 }

-void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *resource)
+void device_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource)
 {
-    WINED3DRESOURCETYPE type = IWineD3DResource_GetType(resource);
+    WINED3DRESOURCETYPE type = IWineD3DResource_GetType((IWineD3DResource *)resource);
     unsigned int i;

TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type));

-    context_resource_released(device, resource, type);
+    context_resource_released(device, (IWineD3DResource *)resource, type);

switch (type)
     {
@@ -6696,7 +6696,7 @@ void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *reso
     }

/* Remove the resource from the resourceStore */
-    device_resource_remove(device, (IWineD3DResourceImpl *)resource);
+    device_resource_remove(device, resource);

TRACE("Resource released.\n");
 }
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 6e90ee1..370861e 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -120,7 +120,7 @@ void resource_cleanup(struct IWineD3DResourceImpl *resource)
     resource->resource.heapMemory = 0;

if (resource->resource.device)
-        device_resource_released(resource->resource.device, (IWineD3DResource *)resource);
+        device_resource_released(resource->resource.device, resource);
 }

void resource_unload(IWineD3DResourceImpl *resource)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 1ee0b9c..bed2aa9 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1784,7 +1784,7 @@ void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN;
 LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode,
         UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN;
 void device_resource_add(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN;
-void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN;
+void device_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN;
 void device_stream_info_from_declaration(IWineD3DDeviceImpl *This,
         BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN;
 void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, struct wined3d_context *context,