ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Move IDirect3DTexture and IDirect3DTexture2 to IDirectDrawSurface reference counts.

This commit is contained in:
Ričardas Barkauskas 2011-06-21 00:14:30 +03:00 committed by Alexandre Julliard
parent 5f6d7021aa
commit 90112e97ea
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ddraw/surface.c
View File

@ -329,7 +329,7 @@ static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface)
IDirectDrawSurfaceImpl *This = surface_from_texture2(iface);
TRACE("iface %p.\n", iface);
return ddraw_surface7_AddRef(&This->IDirectDrawSurface7_iface);
return ddraw_surface1_AddRef(&This->IDirectDrawSurface_iface);
}
static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface)
@ -337,7 +337,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface)
IDirectDrawSurfaceImpl *This = surface_from_texture1(iface);
TRACE("iface %p.\n", iface);
return ddraw_surface7_AddRef(&This->IDirectDrawSurface7_iface);
return ddraw_surface1_AddRef(&This->IDirectDrawSurface_iface);
}
/*****************************************************************************
@ -606,7 +606,7 @@ static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface)
IDirectDrawSurfaceImpl *This = surface_from_texture2(iface);
TRACE("iface %p.\n", iface);
return ddraw_surface7_Release(&This->IDirectDrawSurface7_iface);
return ddraw_surface1_Release(&This->IDirectDrawSurface_iface);
}
static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface)
@ -614,7 +614,7 @@ static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface)
IDirectDrawSurfaceImpl *This = surface_from_texture1(iface);
TRACE("iface %p.\n", iface);
return ddraw_surface7_Release(&This->IDirectDrawSurface7_iface);
return ddraw_surface1_Release(&This->IDirectDrawSurface_iface);
}
/*****************************************************************************

16
dlls/ddraw/tests/dsurface.c
View File

@ -1111,29 +1111,29 @@ static void IFaceRefCount(void)
if (SUCCEEDED(ret))
{
ref = getRefcount((IUnknown *) tex);
todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref);
ok(ref == 2, "Refcount is %u, expected 2\n", ref);
ref = getRefcount((IUnknown *) surf);
todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref);
ok(ref == 2, "Refcount is %u, expected 2\n", ref);
IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture2, (void **) &tex2);
ref = getRefcount((IUnknown *) tex);
todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref);
ok(ref == 3, "Refcount is %u, expected 3\n", ref);
ref = getRefcount((IUnknown *) tex2);
todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref);
ok(ref == 3, "Refcount is %u, expected 3\n", ref);
ref = getRefcount((IUnknown *) surf);
todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref);
ok(ref == 3, "Refcount is %u, expected 3\n", ref);
IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawGammaControl, (void **) &gamma);
ref = getRefcount((IUnknown *) gamma);
todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref);
ref = IDirect3DTexture2_Release(tex2); /* Release the texture */
todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref);
ok(ref == 2, "Refcount is %u, expected 2\n", ref);
ref = getRefcount((IUnknown *) surf);
todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref);
ok(ref == 2, "Refcount is %u, expected 2\n", ref);
ref = IDirect3DTexture_Release(tex); /* Release the texture */
todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref);
ok(ref == 1, "Refcount is %u, expected 1\n", ref);
ref = getRefcount((IUnknown *) surf);
ok(ref == 1, "Refcount is %u, expected 1\n", ref);