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

winex11: Pass a display parameter when destroying glxpixmaps.

This commit is contained in:
Chris Robinson 2007-09-26 01:03:39 -07:00 committed by Alexandre Julliard
parent 00633e37bc
commit 86a9b76076
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/winex11.drv/bitmap.c
View File

@ -431,7 +431,8 @@ BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap )
if (GetObjectW( hbitmap, sizeof(dib), &dib ) == sizeof(dib))
X11DRV_DIB_DeleteDIBSection( physBitmap, &dib );
if (physBitmap->glxpixmap) destroy_glxpixmap(physBitmap->glxpixmap);
if (physBitmap->glxpixmap)
destroy_glxpixmap( gdi_display, physBitmap->glxpixmap );
wine_tsx11_lock();
if (physBitmap->pixmap) XFreePixmap( gdi_display, physBitmap->pixmap );
XDeleteContext( gdi_display, (XID)hbitmap, bitmap_context );

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

@ -3187,10 +3187,10 @@ Drawable get_glxdrawable(X11DRV_PDEVICE *physDev)
return ret;
}
BOOL destroy_glxpixmap(XID glxpixmap)
BOOL destroy_glxpixmap(Display *display, XID glxpixmap)
{
wine_tsx11_lock();
pglXDestroyGLXPixmap(gdi_display, glxpixmap);
pglXDestroyGLXPixmap(display, glxpixmap);
wine_tsx11_unlock();
return TRUE;
}
@ -3436,7 +3436,7 @@ Drawable get_glxdrawable(X11DRV_PDEVICE *physDev)
return 0;
}
BOOL destroy_glxpixmap(XID glxpixmap)
BOOL destroy_glxpixmap(Display *display, XID glxpixmap)
{
return FALSE;
}

2
dlls/winex11.drv/x11drv.h
View File

@ -273,7 +273,7 @@ extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev);
extern XVisualInfo *X11DRV_setup_opengl_visual(Display *display);
extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev);
extern BOOL destroy_glxpixmap(XID glxpixmap);
extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap);
/* XIM support */
extern XIC X11DRV_CreateIC(XIM xim, Display *display, Window win);