From fb44f02aa11674b5754f1053d40797ab6973b41d Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 12 Oct 2010 07:05:56 +0000 Subject: * win32/win32.c (rb_w32_strerror): get English message first, instead of system default. see [ruby-dev:42358]. [experimental] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ win32/win32.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index ccac024cbd..0e2158be2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Oct 12 16:04:37 2010 NAKAMURA Usaku + + * win32/win32.c (rb_w32_strerror): get English message first, instead + of system default. see [ruby-dev:42358]. + [experimental] + Tue Oct 12 15:52:35 2010 NAKAMURA Usaku * win32/win32.c (rb_w32_strerror): unmap some range of errno for diff --git a/win32/win32.c b/win32/win32.c index da4677bc4a..18b1dfb5af 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2214,6 +2214,10 @@ rb_w32_strerror(int e) } #endif if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, + MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), + buffer, sizeof(buffer), NULL) == 0 && + FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, 0, buffer, sizeof(buffer), NULL) == 0) strlcpy(buffer, "Unknown Error", sizeof(buffer)); -- cgit v1.2.3