Module: wine Branch: master Commit: f41513205c4858619cd56c01803a9f9346d4b1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41513205c4858619cd56c0180...
Author: Stefan Dösinger stefan@codeweavers.com Date: Thu Sep 15 23:53:56 2011 +0200
ddraw/tests: Accept another error when setting an overlay with a NULL rect.
---
dlls/ddraw/tests/overlay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 9660d74..4f5a694 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -124,7 +124,8 @@ static void rectangle_settings(void) {
/* Passing a NULL dest rect sets the position to 0/0 . Visually it can be seen that the overlay overlays the whole primary(==screen)*/ hr2 = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, 0, NULL); - ok(hr2 == DD_OK || hr2 == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); + ok(hr2 == DD_OK || hr2 == DDERR_INVALIDPARAMS + || hr2 == DDERR_OUTOFCAPS, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr2); hr = IDirectDrawSurface7_GetOverlayPosition(overlay, &posx, &posy); ok(hr == DD_OK, "IDirectDrawSurface7_GetOverlayPosition failed with hr=0x%08x\n", hr); if (SUCCEEDED(hr2))