Roderick Colenbrander : opengl32: Fix wglCreateContextAttribsARB test on vista/ win7 where Nvidia drivers return hresults instead of win32 errors.
Alexandre Julliard
julliard at winehq.org
Mon Nov 23 08:49:55 CST 2009
Module: wine
Branch: master
Commit: ca1d79b26c246fd669a8791e4984d9fa215bc8a7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1d79b26c246fd669a8791e4984d9fa215bc8a7
Author: Roderick Colenbrander <thunderbird2k at gmail.com>
Date: Mon Nov 23 14:04:31 2009 +0100
opengl32: Fix wglCreateContextAttribsARB test on vista/win7 where Nvidia drivers return hresults instead of win32 errors.
---
dlls/opengl32/tests/opengl.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c
index c216ed2..2850117 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);
}
More information about the wine-cvs
mailing list