[PATCH 4/6] exa: fix unwrapping of ModifyPixmapHeader upon CloseScreen.
Maarten Maathuis
madman2003 at gmail.com
Sun Mar 1 09:42:37 PST 2009
- Cleanup wrapping too.
---
exa/exa.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/exa/exa.c b/exa/exa.c
index 37b7f74..6ebebf9 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -958,6 +958,8 @@ exaCloseScreen(int i, ScreenPtr pScreen)
unwrap(pExaScr, pScreen, CreatePixmap);
if (pExaScr->SavedDestroyPixmap)
unwrap(pExaScr, pScreen, DestroyPixmap);
+ if (pExaScr->SavedModifyPixmapHeader)
+ unwrap(pExaScr, pScreen, ModifyPixmapHeader);
unwrap(pExaScr, pScreen, CopyWindow);
unwrap(pExaScr, pScreen, ChangeWindowAttributes);
unwrap(pExaScr, pScreen, BitmapToRegion);
@@ -1084,7 +1086,6 @@ exaDriverInit (ScreenPtr pScreen,
#endif
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
-
if (!pExaScr) {
LogMessage(X_WARNING, "EXA(%d): Failed to allocate screen private\n",
pScreen->myNum);
@@ -1149,8 +1150,7 @@ exaDriverInit (ScreenPtr pScreen,
wrap(pExaScr, pScreen, CreatePixmap, exaCreatePixmap);
wrap(pExaScr, pScreen, DestroyPixmap, exaDestroyPixmap);
- pExaScr->SavedModifyPixmapHeader = pScreen->ModifyPixmapHeader;
- pScreen->ModifyPixmapHeader = exaModifyPixmapHeader;
+ wrap(pExaScr, pScreen, ModifyPixmapHeader, exaModifyPixmapHeader);
if (!pExaScr->info->CreatePixmap) {
LogMessage(X_INFO, "EXA(%d): Offscreen pixmap area of %lu bytes\n",
pScreen->myNum,
--
1.6.1.3
More information about the xorg-devel
mailing list