[PATCH 0/1] MR7592: d3dx9/tests: Skip some shader tests if we can't create a D3D object.
Hopefully it should help with some crashes on Rémi's test machines -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7592
From: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 93a81dd4214..ab61c8d2f8a 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -350,8 +350,12 @@ static bool init_test_context(struct d3d9_test_context *context) memset(context, 0, sizeof(*context)); context->window = create_window(); - context->d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!context->d3d, "Failed to create a D3D object.\n"); + if (!(context->d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create a D3D object.\n"); + DestroyWindow(context->window); + return false; + } if (!(context->device = create_device(context->d3d, context->window, context->window, TRUE))) { skip("Failed to create a D3D device.\n"); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7592
This merge request was approved by Matteo Bruni. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7592
participants (2)
-
Matteo Bruni -
Matteo Bruni (@Mystral)