Module: wine Branch: master Commit: a97ae0db6a696f39dc480b316556a18bc83caa6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97ae0db6a696f39dc480b3165...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Jan 6 09:39:01 2011 +0100
wined3d: Pass an IWineD3DResourceImpl pointer to resource_free_private_data().
---
dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/resource.c | 12 ++++++------ dlls/wined3d/surface_base.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volume.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b5aeee4..e3f71a0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -775,7 +775,7 @@ static HRESULT STDMETHODCALLTYPE buffer_GetPrivateData(IWineD3DBuffer *iface,
static HRESULT STDMETHODCALLTYPE buffer_FreePrivateData(IWineD3DBuffer *iface, REFGUID guid) { - return resource_free_private_data((IWineD3DResource *)iface, guid); + return resource_free_private_data((IWineD3DResourceImpl *)iface, guid); }
static DWORD STDMETHODCALLTYPE buffer_SetPriority(IWineD3DBuffer *iface, DWORD priority) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 94b414c..2449b79 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -222,8 +222,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_GetPrivateData(IWineD3DCubeTexture return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); }
-static HRESULT WINAPI IWineD3DCubeTextureImpl_FreePrivateData(IWineD3DCubeTexture *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +static HRESULT WINAPI IWineD3DCubeTextureImpl_FreePrivateData(IWineD3DCubeTexture *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); }
static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7b8066e..76267d5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -110,7 +110,7 @@ void resource_cleanup(struct IWineD3DResourceImpl *resource) LIST_FOR_EACH_SAFE(e1, e2, &resource->resource.privateData) { data = LIST_ENTRY(e1, struct private_data, entry); - hr = resource_free_private_data((IWineD3DResource *)resource, &data->tag); + hr = resource_free_private_data(resource, &data->tag); if (FAILED(hr)) ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); } @@ -156,7 +156,7 @@ HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID refguid, TRACE("iface %p, riid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(refguid), pData, SizeOfData, flags);
- resource_free_private_data(iface, refguid); + resource_free_private_data(This, refguid);
data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); if (!data) return E_OUTOFMEMORY; @@ -223,13 +223,13 @@ HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID refguid, void
return WINED3D_OK; } -HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID refguid) +HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; struct private_data *data;
- TRACE("(%p) : %s\n", This, debugstr_guid(refguid)); - data = resource_find_private_data(This, refguid); + TRACE("resource %p, guid %s.\n", resource, debugstr_guid(guid)); + + data = resource_find_private_data(resource, guid); if (!data) return WINED3DERR_NOTFOUND;
if (data->flags & WINED3DSPD_IUNKNOWN) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index f328366..14268b8 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -121,8 +121,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPrivateData(IWineD3DSurface *iface, RE return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); }
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); }
DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1722b3b..bb00fc4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -247,8 +247,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetPrivateData(IWineD3DTexture *iface, return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); }
-static HRESULT WINAPI IWineD3DTextureImpl_FreePrivateData(IWineD3DTexture *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +static HRESULT WINAPI IWineD3DTextureImpl_FreePrivateData(IWineD3DTexture *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); }
static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index dbc2116..4c55170 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -160,8 +160,9 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetPrivateData(IWineD3DVolume *iface, R return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); }
-static HRESULT WINAPI IWineD3DVolumeImpl_FreePrivateData(IWineD3DVolume *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +static HRESULT WINAPI IWineD3DVolumeImpl_FreePrivateData(IWineD3DVolume *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); }
static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index a47801e..e3e16d3 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -167,8 +167,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DVolumeTex return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); }
-static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DVolumeTexture *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DVolumeTexture *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); }
static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41456f9..5a0d068 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1829,7 +1829,7 @@ typedef struct IWineD3DResourceImpl } IWineD3DResourceImpl;
void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; -HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID guid) DECLSPEC_HIDDEN; +HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) DECLSPEC_HIDDEN; DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN;