From abf5d21bc2a402c8c3ab1b6faf58d7c92baf24d6 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Fri, 7 Oct 2022 18:18:17 +0200 Subject: [PATCH] [0.4.10][OPENGL32] Remove Err Log Spam from wglMakeCurrent in nominal cases (#3096) CORE-17224 The log-spam was triggered at end of 2nd stage and within some games. fix picked from commit 0.4.15-dev-655-g ba006b3d497cade418ceae0d3fb4686d9eab3102 --- dll/opengl/opengl32/wgl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/opengl/opengl32/wgl.c b/dll/opengl/opengl32/wgl.c index a8547c15842..99c2dde16fc 100644 --- a/dll/opengl/opengl32/wgl.c +++ b/dll/opengl/opengl32/wgl.c @@ -735,9 +735,13 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) else { /* Winetest conformance */ - if (GetObjectType( hdc ) != OBJ_DC && GetObjectType( hdc ) != OBJ_MEMDC) + DWORD objType = GetObjectType(hdc); + if (objType != OBJ_DC && objType != OBJ_MEMDC) { - ERR( "Error: hdc is not a DC handle!\n"); + if (hdc) + { + ERR("hdc (%p) is not a DC handle (ObjectType: %d)!\n", hdc, objType); + } SetLastError( ERROR_INVALID_HANDLE ); return FALSE; }