[OPENGL32_WINETEST] Sync with Wine Staging 2.9. CORE-13362

svn path=/trunk/; revision=74834
This commit is contained in:
Amine Khaldi 2017-06-03 22:34:42 +00:00
parent 9b660289c6
commit 28c0ee0f60

View file

@ -713,6 +713,9 @@ static void test_bitmap_rendering( BOOL use_dib )
glGetIntegerv( GL_VIEWPORT, viewport );
ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12,
"wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] );
wglDeleteContext(hglrc2);
wglDeleteContext(hglrc);
}
}
@ -927,10 +930,11 @@ static void test_opengl3(HDC hdc)
{
HGLRC gl3Ctx;
DWORD error;
SetLastError(0xdeadbeef);
gl3Ctx = pwglCreateContextAttribsARB((HDC)0xdeadbeef, 0, 0);
ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n");
error = GetLastError();
todo_wine ok(error == ERROR_DC_NOT_FOUND ||
ok(error == ERROR_DC_NOT_FOUND ||
broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */
"Expected ERROR_DC_NOT_FOUND, got error=%x\n", error);
wglDeleteContext(gl3Ctx);
@ -940,11 +944,12 @@ static void test_opengl3(HDC hdc)
{
HGLRC gl3Ctx;
DWORD error;
SetLastError(0xdeadbeef);
gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0);
ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n");
error = GetLastError();
/* The Nvidia implementation seems to return hresults instead of win32 error codes */
todo_wine ok(error == ERROR_INVALID_OPERATION ||
ok(error == ERROR_INVALID_OPERATION ||
error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error);
wglDeleteContext(gl3Ctx);
}