Module: wine Branch: master Commit: 86a9b7607622b27d70a71e2d1844ae5bce1317d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a9b7607622b27d70a71e2d18...
Author: Chris Robinson chris.kcat@gmail.com Date: Wed Sep 26 01:03:39 2007 -0700
winex11: Pass a display parameter when destroying glxpixmaps.
---
dlls/winex11.drv/bitmap.c | 3 ++- dlls/winex11.drv/opengl.c | 6 +++--- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 053c959..6d4180b 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -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 ); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index eba5c26..780e7d6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -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; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 36c5853..55abffb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -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);