[PATCH 3/3] ddraw/tests: Fix IDirectDraw leaks.
Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 39e7d109438b..eafcd38f72ca 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11707,8 +11707,9 @@ static void test_viewport(void) IDirect3DDevice_DeleteMatrix(device, proj_handle); destroy_material(black_background); refcount = IDirect3DDevice_Release(device); - IDirect3D2_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D2_Release(d3d); + IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9e2107cda43c..0a4750a8911d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12989,8 +12989,9 @@ static void test_viewport(void) destroy_material(black_background); refcount = IDirect3DDevice2_Release(device); - IDirect3D2_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D2_Release(d3d); + IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index cc77eea4a99f..b89d752606ef 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15083,8 +15083,9 @@ static void test_viewport(void) } refcount = IDirect3DDevice3_Release(device); - IDirect3D3_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D3_Release(d3d); + IDirectDraw4_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 501c9a184e28..0fddc82ed9a7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14399,6 +14399,7 @@ static void test_viewport(void) refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw7_Release(ddraw); DestroyWindow(window); } -- 2.16.4
Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=40591 Your paranoid android. === wvistau64 (32 bit ddraw2) === ddraw2.c:2830: Test failed: Expected message 0x46, but didn't receive it. ddraw2.c:2832: Test failed: Expected screen size 1024x768, got 0x0. ddraw2.c:2838: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:2868: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:2875: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:2901: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:2924: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:2953: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:2979: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:2999: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:3035: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:3045: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:3071: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:3094: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:3116: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:3142: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:3162: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw2.c:3199: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). === wvistau64 (64 bit ddraw7) === ddraw7.c:2701: Test failed: Expected message 0x46, but didn't receive it. ddraw7.c:2703: Test failed: Expected screen size 1024x768, got 0x0. ddraw7.c:2709: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2739: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2746: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2772: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2795: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2817: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2843: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2863: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2899: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2909: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2935: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2958: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:2980: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:3006: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:3026: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746). ddraw7.c:3063: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,746).
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Pretty clear copypaste fail on my part... Thank you for the fix!
participants (4)
-
Henri Verbeet -
Józef Kucia -
Marvin -
Matteo Bruni