[Emacs-diffs] Changes to emacs/src/w32fns.c

[Jason Rumney]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.151 emacs/src/w32fns.c:1.152
*** emacs/src/w32fns.c:1.151    Wed Jan 23 16:52:41 2002
--- emacs/src/w32fns.c  Thu Jan 24 15:46:32 2002
***************
*** 4157,4162 ****
--- 4157,4163 ----
        {
        PAINTSTRUCT paintStruct;
          RECT update_rect;
+       bzero (&update_rect, sizeof (update_rect));
  
        f = x_window_to_frame (dpyinfo, hwnd);
        if (f == 0)
***************
*** 4168,4185 ****
          /* 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))
            {
              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;
  
  #if defined (W32_DEBUG_DISPLAY)
              DebPrint (("WM_PAINT (frame %p): painting %d,%d-%d,%d\n",
--- 4169,4183 ----
          /* MSDN Docs say not to call BeginPaint if GetUpdateRect
             fails.  Apparently this can happen under some
             circumstances.  */
!         if (GetUpdateRect (hwnd, &update_rect, FALSE) || !w32_strict_painting)
            {
              enter_crit ();
              BeginPaint (hwnd, &paintStruct);
  
!           /* 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",