[PATCH] ddraw/tests: Recognize E_NOTIMPL returned from UpdateOverlay
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes several test.winehq.org failures on Windows XP virtual machines. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c306c4db1a..27b1b0defc 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8679,7 +8679,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a7801ee3e..56ca6e4cdd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9813,7 +9813,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 048331dfc3..50665af63a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11268,7 +11268,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d1ff85d5d5..9bc3c0913d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11229,7 +11229,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ -- 2.15.1
On 20 December 2017 at 07:02, Alex Henrie <alexhenrie24(a)gmail.com> wrote:
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes several test.winehq.org failures on Windows XP virtual machines. --- Is that on VMware? Could you make the broken() a bit more specific? E.g:
broken(hr == E_NOTIMPL && ddraw_is_vmw_svga()) See the other ddraw_is_*() helpers for how to implement ddraw_is_vmw_svga().
2017-12-21 7:03 GMT-07:00 Henri Verbeet <hverbeet(a)gmail.com>:
On 20 December 2017 at 07:02, Alex Henrie <alexhenrie24(a)gmail.com> wrote:
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes several test.winehq.org failures on Windows XP virtual machines. --- Is that on VMware? Could you make the broken() a bit more specific? E.g:
broken(hr == E_NOTIMPL && ddraw_is_vmw_svga())
See the other ddraw_is_*() helpers for how to implement ddraw_is_vmw_svga().
I'm not sure. Francois, are fg-winxp-3sp, fg-winxp-3spie8, fg-winxp-last, and fg-winxp-lusr running on VMWare? And what graphics driver are they using? -Alex
On Thu, 21 Dec 2017, Alex Henrie wrote:
2017-12-21 7:03 GMT-07:00 Henri Verbeet <hverbeet(a)gmail.com>:
On 20 December 2017 at 07:02, Alex Henrie <alexhenrie24(a)gmail.com> wrote:
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes several test.winehq.org failures on Windows XP virtual machines. --- Is that on VMware? Could you make the broken() a bit more specific? E.g:
broken(hr == E_NOTIMPL && ddraw_is_vmw_svga())
See the other ddraw_is_*() helpers for how to implement ddraw_is_vmw_svga().
I'm not sure. Francois, are fg-winxp-3sp, fg-winxp-3spie8, fg-winxp-last, and fg-winxp-lusr running on VMWare? And what graphics driver are they using?
Yep they are running on VMware. For instance: https://test.winehq.org/data/68cff26b1b2d9d83b5f0a16b16f78c1b57f62ebd/xp_fg-... Description Compaq's English Windows XP SP1; cleaned up and moved to VMware + Creative AudioPCI + VMware Tools. Then upgraded to SP2, Internet Explorer 7.0 and finally SP3 via Windows Update. VMware emulates its own graphics card and I installed VMware's driver on Windows XP: VMware SVGA II. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A black hole is just God dividing by zero.
2017-12-21 17:55 GMT-07:00 Francois Gouget <fgouget(a)free.fr>:
On Thu, 21 Dec 2017, Alex Henrie wrote:
2017-12-21 7:03 GMT-07:00 Henri Verbeet <hverbeet(a)gmail.com>:
On 20 December 2017 at 07:02, Alex Henrie <alexhenrie24(a)gmail.com> wrote:
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes several test.winehq.org failures on Windows XP virtual machines. --- Is that on VMware? Could you make the broken() a bit more specific? E.g:
broken(hr == E_NOTIMPL && ddraw_is_vmw_svga())
See the other ddraw_is_*() helpers for how to implement ddraw_is_vmw_svga().
I'm not sure. Francois, are fg-winxp-3sp, fg-winxp-3spie8, fg-winxp-last, and fg-winxp-lusr running on VMWare? And what graphics driver are they using?
Yep they are running on VMware. For instance: https://test.winehq.org/data/68cff26b1b2d9d83b5f0a16b16f78c1b57f62ebd/xp_fg-...
Description Compaq's English Windows XP SP1; cleaned up and moved to VMware + Creative AudioPCI + VMware Tools. Then upgraded to SP2, Internet Explorer 7.0 and finally SP3 via Windows Update.
VMware emulates its own graphics card and I installed VMware's driver on Windows XP: VMware SVGA II.
Thank you Francois! I've sent new patches. -Alex
participants (3)
-
Alex Henrie -
Francois Gouget -
Henri Verbeet