From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 24 Jan 2002 20:20:36 +0000 (+0000)
Subject: (w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
X-Git-Tag: emacs-21.2~156
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cd80fd5c6117c81c217d0eac0827068bed0acfdb;p=emacs.git

(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Combine the regions returned by BeginPaint and GetUpdateRect.
---

diff --git a/src/w32fns.c b/src/w32fns.c
index 112e0ab2242..3ff0a49220a 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4101,6 +4101,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
       {
   	PAINTSTRUCT paintStruct;
         RECT update_rect;
+	bzero (&update_rect, sizeof (update_rect));
 
 	f = x_window_to_frame (dpyinfo, hwnd);
 	if (f == 0)
@@ -4112,18 +4113,15 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
         /* MSDN Docs say not to call BeginPaint if GetUpdateRect
            fails.  Apparently this can happen under some
            circumstances.  */
-        if (!w32_strict_painting || GetUpdateRect (hwnd, &update_rect, FALSE))
+        if (GetUpdateRect (hwnd, &update_rect, FALSE) || !w32_strict_painting)
           {
             enter_crit ();
             BeginPaint (hwnd, &paintStruct);
 
-	    if (w32_strict_painting)
-	      /* The rectangles returned by GetUpdateRect and BeginPaint
-		 do not always match.  GetUpdateRect seems to be the
-		 more reliable of the two.  */
-	      wmsg.rect = update_rect;
-	    else
-	      wmsg.rect = paintStruct.rcPaint;
+	    /* The rectangles returned by GetUpdateRect and BeginPaint
+	       do not always match.  Play it safe by assuming both areas
+	       are invalid.  */
+	    UnionRect (&(wmsg.rect), &update_rect, &(paintStruct.rcPaint));
 
 #if defined (W32_DEBUG_DISPLAY)
             DebPrint (("WM_PAINT (frame %p): painting %d,%d-%d,%d\n",