[PATCH 2/4] d3drm: Use ref and appdata from d3drm_object in d3drm_texture.
Aaryaman Vasishta
jem456.vasishta at gmail.com
Sun Apr 24 10:50:20 CDT 2016
Resending as a part of this patch series.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta at gmail.com>
---
dlls/d3drm/d3drm_private.h | 2 --
dlls/d3drm/texture.c | 9 ++++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
index 3dae0bb..2eb8e4d 100644
--- a/dlls/d3drm/d3drm_private.h
+++ b/dlls/d3drm/d3drm_private.h
@@ -40,8 +40,6 @@ struct d3drm_texture
IDirect3DRMTexture IDirect3DRMTexture_iface;
IDirect3DRMTexture2 IDirect3DRMTexture2_iface;
IDirect3DRMTexture3 IDirect3DRMTexture3_iface;
- LONG ref;
- DWORD app_data;
};
void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN;
diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c
index 60374d3..886bb0b 100644
--- a/dlls/d3drm/texture.c
+++ b/dlls/d3drm/texture.c
@@ -707,7 +707,7 @@ static HRESULT WINAPI d3drm_texture3_QueryInterface(IDirect3DRMTexture3 *iface,
static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface)
{
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);
- ULONG refcount = InterlockedIncrement(&texture->ref);
+ ULONG refcount = InterlockedIncrement(&texture->obj.ref);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
@@ -717,7 +717,7 @@ static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface)
static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface)
{
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);
- ULONG refcount = InterlockedDecrement(&texture->ref);
+ ULONG refcount = InterlockedDecrement(&texture->obj.ref);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
@@ -764,7 +764,7 @@ static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWOR
TRACE("iface %p, data %#x.\n", iface, data);
- texture->app_data = data;
+ texture->obj.appdata = data;
return D3DRM_OK;
}
@@ -775,7 +775,7 @@ static DWORD WINAPI d3drm_texture3_GetAppData(IDirect3DRMTexture3 *iface)
TRACE("iface %p.\n", iface);
- return texture->app_data;
+ return texture->obj.appdata;
}
static HRESULT WINAPI d3drm_texture3_SetName(IDirect3DRMTexture3 *iface, const char *name)
@@ -1056,7 +1056,6 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture)
object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl;
object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl;
object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl;
- object->ref = 1;
d3drm_object_init(&object->obj);
--
2.3.2 (Apple Git-55)
More information about the wine-patches
mailing list