[Emacs-diffs] /srv/bzr/emacs/trunk r108045: Don't disable Unicode menus on Windows NT and later due to random errors.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108045
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2012-04-26 13:07:35 +0300
message:
  Don't disable Unicode menus on Windows NT and later due to random errors.
  
   src/w32menu.c: Include w32heap.h.
   (add_menu_item): If the call to AppendMenuW (via
   unicode_append_menu) fails, disable Unicode menus only if we are
   running on Windows 9X/Me.
modified:
  src/ChangeLog
  src/w32menu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-24 19:05:25 +0000
+++ b/src/ChangeLog     2012-04-26 10:07:35 +0000
@@ -1,3 +1,10 @@
+2012-04-26  Eli Zaretskii  <address@hidden>
+
+       * w32menu.c: Include w32heap.h.
+       (add_menu_item): If the call to AppendMenuW (via
+       unicode_append_menu) fails, disable Unicode menus only if we are
+       running on Windows 9X/Me.
+
 2012-04-24  Andreas Schwab  <address@hidden>
 
        * .gdbinit (xpr): Handle USE_2_TAGS_FOR_INTS.

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2012-04-01 16:55:30 +0000
+++ b/src/w32menu.c     2012-04-26 10:07:35 +0000
@@ -48,6 +48,8 @@
 
 #include "dispextern.h"
 
+#include "w32heap.h"   /* for osinfo_cache */
+
 #undef HAVE_DIALOGS /* TODO: Implement native dialogs.  */
 
 #ifndef TRUE
@@ -1498,8 +1500,11 @@
            AppendMenu (menu, fuFlags,
                        item != NULL ? (UINT) item: (UINT) wv->call_data,
                        out_string);
-         /* Don't use Unicode menus in future.  */
-         unicode_append_menu = NULL;
+         /* Don't use Unicode menus in future, unless this is Windows
+            NT or later, where a failure of AppendMenuW does NOT mean
+            Unicode menus are unsupported.  */
+         if (osinfo_cache.dwPlatformId != VER_PLATFORM_WIN32_NT)
+           unicode_append_menu = NULL;
        }
 
       if (unicode_append_menu && (fuFlags & MF_OWNERDRAW))