From ca1d79b26c246fd669a8791e4984d9fa215bc8a7 Mon Sep 17 00:00:00 2001 From: Roderick Colenbrander Date: Mon, 23 Nov 2009 14:04:31 +0100 Subject: [PATCH] opengl32: Fix wglCreateContextAttribsARB test on vista/win7 where Nvidia drivers return hresults instead of win32 errors. --- dlls/opengl32/tests/opengl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index c216ed20232..285011711ae 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -581,7 +581,9 @@ static void test_opengl3(HDC hdc) gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); todo_wine ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); - todo_wine ok(error == ERROR_INVALID_OPERATION, "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + /* The Nvidia implementation seems to return hresults instead of win32 error codes */ + todo_wine ok(error == ERROR_INVALID_OPERATION || + error == HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); wglDeleteContext(gl3Ctx); }