Fix missing ';' in cw.c and unwrap the render wrapper properly.

3 files changed, 24 insertions, 5 deletions

diff --git a/miext/cw/cw.c b/miext/cw/cw.c
index e0b7467ed..708ebe323 100644
--- a/miext/cw/cw.c
+++ b/miext/cw/cw.c
@@ -685,7 +685,7 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
 
 #ifdef RENDER
     if (GetPictureScreen (pScreen))
-	cwInitializeRender(pScreen)
+	cwInitializeRender(pScreen);
 #endif
 }
 
@@ -707,10 +707,8 @@ cwCloseScreen (int i, ScreenPtr pScreen)
     pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder;
 
 #ifdef RENDER
-    if (ps) {
-	ps->Composite = pScreenPriv->Composite;
-	ps->Glyphs = pScreenPriv->Glyphs;
-    }
+    if (ps)
+	cwFiniRender(pScreen);
 #endif
 
     xfree((pointer)pScreenPriv);
diff --git a/miext/cw/cw.h b/miext/cw/cw.h
index 0fb626d11..3871d9ec0 100644
--- a/miext/cw/cw.h
+++ b/miext/cw/cw.h
@@ -137,6 +137,9 @@ cwGetBackingDrawable(DrawablePtr pDrawable, int *x_off, int *y_off);
 void
 cwInitializeRender (ScreenPtr pScreen);
 
+void
+cwFiniRender (ScreenPtr pScreen);
+
 /* cw.c */
 void
 miInitializeCompositeWrapper(ScreenPtr pScreen);
diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c
index 2db90b759..9e9ad3a3f 100644
--- a/miext/cw/cw_render.c
+++ b/miext/cw/cw_render.c
@@ -455,4 +455,22 @@ cwInitializeRender (ScreenPtr pScreen)
     cwPsWrap(TriFan, cwTriFan);
 }
 
+void
+cwFiniRender (ScreenPtr pScreen)
+{
+    cwPsDecl (pScreen);
+
+    cwPsUnwrap(CreatePicture);
+    cwPsUnwrap(DestroyPicture);
+    cwPsUnwrap(ChangePicture);
+    cwPsUnwrap(ValidatePicture);
+    cwPsUnwrap(Composite);
+    cwPsUnwrap(Glyphs);
+    cwPsUnwrap(CompositeRects);
+    cwPsUnwrap(Trapezoids);
+    cwPsUnwrap(Triangles);
+    cwPsUnwrap(TriStrip);
+    cwPsUnwrap(TriFan);
+}
+
 #endif /* RENDER */