lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 21:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Instead of SetLastError(0), try to restore the 'real' last error

Browse Source
This commit is contained in:
baldurk
2016-04-02 15:46:30 +02:00
parent 27696d9c7f
commit 1edb57b66d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_hooks_win32.cpp
+12 -4
View File
@@ -386,6 +386,8 @@ class OpenGLHook : LibraryHook
{
HGLRC ret = glhooks.wglCreateContext_hook()(dc);
DWORD err = GetLastError();
// don't recurse and don't continue if creation failed
if(glhooks.m_CreatingContext || ret == NULL)
return ret;
@@ -401,7 +403,7 @@ class OpenGLHook : LibraryHook
glhooks.m_HaveContextCreation = true;
SetLastError(0);
SetLastError(err);
glhooks.m_CreatingContext = false;
@@ -422,6 +424,8 @@ class OpenGLHook : LibraryHook
{
HGLRC ret = glhooks.wglCreateLayerContext_hook()(dc, iLayerPlane);
DWORD err = GetLastError();
// don't recurse and don't continue if creation failed
if(glhooks.m_CreatingContext || ret == NULL)
return ret;
@@ -437,7 +441,7 @@ class OpenGLHook : LibraryHook
glhooks.m_HaveContextCreation = true;
SetLastError(0);
SetLastError(err);
glhooks.m_CreatingContext = false;
@@ -517,6 +521,8 @@ class OpenGLHook : LibraryHook
HGLRC ret = glhooks.wglCreateContextAttribsARB_realfunc(dc, hShareContext, attribs);
DWORD err = GetLastError();
// don't continue if creation failed
if(ret == NULL)
return ret;
@@ -530,7 +536,7 @@ class OpenGLHook : LibraryHook
glhooks.m_HaveContextCreation = true;
SetLastError(0);
SetLastError(err);
glhooks.m_CreatingContext = false;
@@ -556,6 +562,8 @@ class OpenGLHook : LibraryHook
{
BOOL ret = glhooks.wglMakeCurrent_hook()(dc, rc);
DWORD err = GetLastError();
if(rc && glhooks.m_HaveContextCreation && glhooks.m_Contexts.find(rc) == glhooks.m_Contexts.end())
{
glhooks.m_Contexts.insert(rc);
@@ -571,7 +579,7 @@ class OpenGLHook : LibraryHook
if(glhooks.m_HaveContextCreation)
glhooks.GetDriver()->ActivateContext(data);
SetLastError(0);
SetLastError(err);
return ret;
}