--- ./programs/Xserver/hw/xwin/save_winmultiwindowwndproc.c	2007-02-20 23:34:22.000000000 +0000
+++ ./programs/Xserver/hw/xwin/winmultiwindowwndproc.c	2007-02-20 23:35:00.000000000 +0000
@@ -444,7 +446,7 @@
       /* Avoid the BitBlt's if the PAINTSTRUCT is bogus */
       if (ps.rcPaint.right==0 && ps.rcPaint.bottom==0 && ps.rcPaint.left==0 && ps.rcPaint.top==0)
       {
-	EndPaint (hwndScreen, &ps);
+	EndPaint (hwnd, &ps);
 	return 0;
       }
 
@@ -474,7 +476,7 @@
 	}
 
       /* EndPaint frees the DC */
-      EndPaint (hwndScreen, &ps);
+      EndPaint (hwnd, &ps);
       return 0;
 
     case WM_MOUSEMOVE: