ddraw/tests: Don't leak overlay if DWM cannot be disabled.
This fixes test_caps on my GeForce 650M Windows 10 machine. Signed-off-by: Stefan Dösinger <stefan@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
37554c1cb0
commit
ed33ddd452
|
@ -9478,10 +9478,11 @@ static void test_overlay_rect(void)
|
||||||
ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x);
|
ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x);
|
||||||
ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y);
|
ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y);
|
||||||
|
|
||||||
IDirectDrawSurface_Release(overlay);
|
|
||||||
done:
|
done:
|
||||||
if (primary)
|
if (primary)
|
||||||
IDirectDrawSurface_Release(primary);
|
IDirectDrawSurface_Release(primary);
|
||||||
|
if (overlay)
|
||||||
|
IDirectDrawSurface_Release(overlay);
|
||||||
IDirectDraw_Release(ddraw);
|
IDirectDraw_Release(ddraw);
|
||||||
DestroyWindow(window);
|
DestroyWindow(window);
|
||||||
}
|
}
|
||||||
|
|
|
@ -10180,10 +10180,11 @@ static void test_overlay_rect(void)
|
||||||
ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x);
|
ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x);
|
||||||
ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y);
|
ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y);
|
||||||
|
|
||||||
IDirectDrawSurface_Release(overlay);
|
|
||||||
done:
|
done:
|
||||||
if (primary)
|
if (primary)
|
||||||
IDirectDrawSurface_Release(primary);
|
IDirectDrawSurface_Release(primary);
|
||||||
|
if (overlay)
|
||||||
|
IDirectDrawSurface_Release(overlay);
|
||||||
IDirectDraw2_Release(ddraw);
|
IDirectDraw2_Release(ddraw);
|
||||||
DestroyWindow(window);
|
DestroyWindow(window);
|
||||||
}
|
}
|
||||||
|
|
|
@ -12058,10 +12058,11 @@ static void test_overlay_rect(void)
|
||||||
ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x);
|
ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x);
|
||||||
ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y);
|
ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y);
|
||||||
|
|
||||||
IDirectDrawSurface4_Release(overlay);
|
|
||||||
done:
|
done:
|
||||||
if (primary)
|
if (primary)
|
||||||
IDirectDrawSurface4_Release(primary);
|
IDirectDrawSurface4_Release(primary);
|
||||||
|
if (overlay)
|
||||||
|
IDirectDrawSurface4_Release(overlay);
|
||||||
IDirectDraw4_Release(ddraw);
|
IDirectDraw4_Release(ddraw);
|
||||||
DestroyWindow(window);
|
DestroyWindow(window);
|
||||||
}
|
}
|
||||||
|
|
|
@ -12049,10 +12049,11 @@ static void test_overlay_rect(void)
|
||||||
ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x);
|
ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x);
|
||||||
ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y);
|
ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y);
|
||||||
|
|
||||||
IDirectDrawSurface7_Release(overlay);
|
|
||||||
done:
|
done:
|
||||||
if (primary)
|
if (primary)
|
||||||
IDirectDrawSurface7_Release(primary);
|
IDirectDrawSurface7_Release(primary);
|
||||||
|
if (overlay)
|
||||||
|
IDirectDrawSurface7_Release(overlay);
|
||||||
IDirectDraw7_Release(ddraw);
|
IDirectDraw7_Release(ddraw);
|
||||||
DestroyWindow(window);
|
DestroyWindow(window);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue