From 0a13dea32ea19deb0f6885a40723a8f75de22888 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Wed, 2 Jul 2008 20:08:10 -0700 Subject: [PATCH] wined3d: Fix a deadlock that may occur during initialization --- dlls/wined3d/directx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index acb147e..7a663c6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5,7 +5,7 @@ * Copyright 2003-2004 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2007-2008 Stefan Dösinger for CodeWeavers + * Copyright 2007-2008 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -770,6 +770,9 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } } } + + LEAVE_GL(); + /* Now work out what GL support this card really has */ #define USE_GL_FUNC(type, pfn, ext, replace) { \ DWORD ver = ver_for_ext(ext); \ @@ -784,6 +787,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { WGL_EXT_FUNCS_GEN; #undef USE_GL_FUNC + ENTER_GL(); /* Now mark all the extensions supported which are included in the opengl core version. Do this *after* * loading the functions, otherwise the code above will load the extension entry points instead of the * core functions, which may not work -- 1.5.4.1