Henri Verbeet : wined3d: Simply inline dumpResources().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Sun Apr  4 19:51:38 2010 +0200

wined3d: Simply inline dumpResources().

---

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

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index a1b1db6..c699032 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -610,9 +610,17 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) {
         /* NOTE: You must release the parent if the object was created via a callback
         ** ***************************/

-        if (!list_empty(&This->resources)) {
+        if (!list_empty(&This->resources))
+        {
+            IWineD3DResourceImpl *resource;
             FIXME("(%p) Device released with resources still bound, acceptable but unexpected\n", This);
-            dumpResources(&This->resources);
+
+            LIST_FOR_EACH_ENTRY(resource, &This->resources, IWineD3DResourceImpl, resource.resource_list_entry)
+            {
+                WINED3DRESOURCETYPE type = IWineD3DResource_GetType((IWineD3DResource *)resource);
+                FIXME("Leftover resource %p with type %s (%#x).\n",
+                        resource, debug_d3dresourcetype(type), type);
+            }
         }

if(This->contexts) ERR("Context array not freed!\n");
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 154ff8b..67622a3 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -247,11 +247,3 @@ HRESULT resource_get_parent(IWineD3DResource *iface, IUnknown **pParent)
     *pParent = This->resource.parent;
     return WINED3D_OK;
 }
-
-void dumpResources(struct list *list) {
-    IWineD3DResourceImpl *resource;
-
-    LIST_FOR_EACH_ENTRY(resource, list, IWineD3DResourceImpl, resource.resource_list_entry) {
-        FIXME("Leftover resource %p with type %d,%s\n", resource, IWineD3DResource_GetType((IWineD3DResource *) resource), debug_d3dresourcetype(IWineD3DResource_GetType((IWineD3DResource *) resource)));
-    }
-}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 038d784..470c7f0 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1571,9 +1571,6 @@ HRESULT wined3d_init(IWineD3DImpl *wined3d, UINT version, IUnknown *parent) DECL
 BOOL wined3d_register_window(HWND window, struct IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN;
 void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN;

-/* A helper function that dumps a resource list */
-void dumpResources(struct list *list) DECLSPEC_HIDDEN;
-
 /*****************************************************************************
  * IWineD3DDevice implementation structure
  */