nobu	2010-10-16 08:39:16 +0900 (Sat, 16 Oct 2010)

  New Revision: 29514

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29514

  Log:
    * dln.c (dln_strerror): get English message first, instead of
      system default. see [ruby-dev:42358].

  Modified files:
    trunk/ChangeLog
    trunk/dln.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29513)
+++ ChangeLog	(revision 29514)
@@ -1,3 +1,8 @@
+Sat Oct 16 08:39:03 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* dln.c (dln_strerror): get English message first, instead of
+	  system default. see [ruby-dev:42358].
+
 Sat Oct 16 00:08:00 2010  Koichi Sasada  <ko1@a...>
 
 	* hash.c (rb_hash_aref): skip calling "default" method
Index: dln.c
===================================================================
--- dln.c	(revision 29513)
+++ dln.c	(revision 29514)
@@ -1127,10 +1127,12 @@
     char *p = message;
     size_t len = snprintf(message, size, "%d: ", error);
 
-    FormatMessage(
-	FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-	NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-	message + len, size - len, NULL);
+#define format_message(sublang) FormatMessage(\
+	FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,	\
+	NULL, error, MAKELANGID(LANG_NEUTRAL, sublang),			\
+	message + len, size - len, NULL)
+    if (format_message(SUBLANG_ENGLISH_US) == 0)
+	format_message(SUBLANG_DEFAULT);
     for (p = message + len; *p; p++) {
 	if (*p == '\n' || *p == '\r')
 	    *p = ' ';

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/