ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11.drv: Don't crash when called with a NULL gl context.

This commit is contained in:
Ulrich Czekalla 2006-12-19 11:02:56 -05:00 committed by Alexandre Julliard
parent 7329144c58
commit b2f33ffbbb
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/winex11.drv/opengl.c
View File

@ -1795,7 +1795,9 @@ static void WINAPI X11DRV_wglDisable(GLenum cap)
if (cap == GL_SCISSOR_TEST)
{
Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext;
ctx->scissor_enabled = FALSE;
if (ctx)
ctx->scissor_enabled = FALSE;
}
else
{
@ -1810,7 +1812,9 @@ static void WINAPI X11DRV_wglEnable(GLenum cap)
if (cap == GL_SCISSOR_TEST)
{
Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext;
ctx->scissor_enabled = TRUE;
if (ctx)
ctx->scissor_enabled = TRUE;
}
else
{
@ -1861,12 +1865,14 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params)
static GLboolean WINAPI X11DRV_wglIsEnabled(GLenum cap)
{
GLboolean enabled;
GLboolean enabled = False;
if (cap == GL_SCISSOR_TEST)
{
Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext;
enabled = ctx->scissor_enabled;
if (ctx)
enabled = ctx->scissor_enabled;
}
else
{
@ -1881,24 +1887,30 @@ static void WINAPI X11DRV_wglScissor(GLint x, GLint y, GLsizei width, GLsizei he
{
Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext;
ctx->scissor.left = x;
ctx->scissor.top = y;
ctx->scissor.right = x + width;
ctx->scissor.bottom = y + height;
if (ctx)
{
ctx->scissor.left = x;
ctx->scissor.top = y;
ctx->scissor.right = x + width;
ctx->scissor.bottom = y + height;
sync_current_drawable(TRUE);
sync_current_drawable(TRUE);
}
}
static void WINAPI X11DRV_wglViewport(GLint x, GLint y, GLsizei width, GLsizei height)
{
Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext;
ctx->viewport.left = x;
ctx->viewport.top = y;
ctx->viewport.right = x + width;
ctx->viewport.bottom = y + height;
if (ctx)
{
ctx->viewport.left = x;
ctx->viewport.top = y;
ctx->viewport.right = x + width;
ctx->viewport.bottom = y + height;
sync_current_drawable(TRUE);
sync_current_drawable(TRUE);
}
}
/**