Octavian Voicu : ddraw/tests: Test detachment of attached surfaces on Release.
Module: wine Branch: master Commit: 9cff895a69dfad2e4e987c1da48a59274e4e48d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cff895a69dfad2e4e987c1da4... Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Oct 10 13:15:21 2011 +0300 ddraw/tests: Test detachment of attached surfaces on Release. --- dlls/ddraw/tests/refcount.c | 98 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 970865e..736ce8d 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -47,11 +47,11 @@ static void test_ddraw_objects(void) IDirectDraw2 *DDraw2; IDirectDraw *DDraw1; IDirectDrawPalette *palette; - IDirectDrawSurface7 *surface = NULL; - IDirectDrawSurface *surface1; + IDirectDrawSurface7 *surface = NULL, *stencil; + IDirectDrawSurface *surface1, *stencil1; IDirectDrawSurface4 *surface4; PALETTEENTRY Table[256]; - DDSURFACEDESC2 ddsd; + DDSURFACEDESC2 ddsd, ddsd_stencil; hr = pDirectDrawCreateEx(NULL, (void **) &DDraw7, &IID_IDirectDraw7, NULL); ok(hr == DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %x\n", hr); @@ -92,6 +92,17 @@ static void test_ddraw_objects(void) U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; + memset(&ddsd_stencil, 0, sizeof(ddsd_stencil)); + ddsd_stencil.dwSize = sizeof(ddsd_stencil); + ddsd_stencil.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd_stencil.dwWidth = ddsd.dwWidth; + ddsd_stencil.dwHeight = ddsd.dwHeight; + ddsd_stencil.ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER; + U4(ddsd_stencil).ddpfPixelFormat.dwSize = sizeof(U4(ddsd_stencil).ddpfPixelFormat); + U4(ddsd_stencil).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(ddsd_stencil).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(ddsd_stencil).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + hr = IDirectDraw7_CreateSurface(DDraw7, &ddsd, &surface, NULL); if (!surface) { @@ -186,6 +197,87 @@ static void test_ddraw_objects(void) ok(ref == 1, "Got refcount %d, expected 1\n", ref); IDirectDrawSurface_Release(surface1); + /* AddAttachedSurface with IDirectDrawSurface7 */ + ddsd.dwSize = sizeof(DDSURFACEDESC2); + ddsd.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE; + hr = IDirectDraw7_CreateSurface(DDraw7, &ddsd, &surface, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + ddsd_stencil.dwSize = sizeof(DDSURFACEDESC2); + hr = IDirectDraw7_CreateSurface(DDraw7, &ddsd_stencil, &stencil, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + /* AddAttachedSurface with DeleteAttachedSurface */ + hr = IDirectDrawSurface7_AddAttachedSurface(surface, stencil); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + ref = getRefcount( (IUnknown *) stencil); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); + hr = IDirectDrawSurface7_DeleteAttachedSurface(surface, 0, stencil); + ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) stencil); + ok(ref == 1, "Got refcount %d, expected 1\n", ref); + } + + /* Releasing a surface should detach any attached surfaces */ + hr = IDirectDrawSurface7_AddAttachedSurface(surface, stencil); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) stencil); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); + ref = IDirectDrawSurface7_Release(surface); + ok(!ref, "Got refcount %d, expected 0\n", ref); + ref = getRefcount( (IUnknown *) stencil); + ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ref = IDirectDrawSurface7_Release(stencil); + ok(!ref, "Got refcount %d, expected 0\n", ref); + } + else + IDirectDrawSurface7_Release(surface); + } + + /* AddAttachedSurface with IDirectDrawSurface */ + ddsd.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDraw_CreateSurface(DDraw1, (DDSURFACEDESC *) &ddsd, &surface1, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + ddsd_stencil.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDraw_CreateSurface(DDraw1, (DDSURFACEDESC *) &ddsd_stencil, &stencil1, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + /* AddAttachedSurface with DeleteAttachedSurface */ + hr = IDirectDrawSurface_AddAttachedSurface(surface1, stencil1); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + ref = getRefcount( (IUnknown *) stencil1); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, stencil1); + ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) stencil1); + ok(ref == 1, "Got refcount %d, expected 1\n", ref); + } + + /* Releasing a surface should detach any attached surfaces */ + hr = IDirectDrawSurface_AddAttachedSurface(surface1, stencil1); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) stencil1); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); + ref = IDirectDrawSurface_Release(surface1); + ok(!ref, "Got refcount %d, expected 0\n", ref); + ref = getRefcount( (IUnknown *) stencil1); + todo_wine ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ref = IDirectDrawSurface_Release(stencil1); + todo_wine ok(!ref, "Got refcount %d, expected 0\n", ref); + } + else + IDirectDrawSurface_Release(surface1); + } + IDirectDraw7_Release(DDraw7); IDirectDraw4_Release(DDraw4); IDirectDraw2_Release(DDraw2);
participants (1)
-
Alexandre Julliard