Backport 2011-03-08T01:52:20Z!lekktu@gmail.com from trunk.

* src/w32xfns.c (select_palette): Check success of RealizePalette against
  GDI_ERROR, not zero.

diff --git a/src/ChangeLog b/src/ChangeLog
index a4a80cbf9f5b3dbe2554a8c5e4e62b457b1157bf..759581699512bd516a930bcb5dfafc50cfb4b3a8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       Backport revno:103582 from trunk.
+       * w32xfns.c (select_palette): Check success of RealizePalette against
+       GDI_ERROR, not zero.
+
 2011-03-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * fringe.c (update_window_fringes): Remove unused variables.

diff --git a/src/w32xfns.c b/src/w32xfns.c
index 83ffc1c8b5fc5462f794eeac4c6cf373d2a89c8a..0472138e117311a3886e892e79ef70f9d98c9d1b 100644 (file)
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -98,7 +98,7 @@ select_palette (FRAME_PTR f, HDC hdc)
   else
     f->output_data.w32->old_palette = NULL;
 
-  if (RealizePalette (hdc))
+  if (RealizePalette (hdc) != GDI_ERROR)
   {
     Lisp_Object frame, framelist;
     FOR_EACH_FRAME (framelist, frame)