From 3a42901a8092933ed8d700812e919a994319ec44 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 24 Aug 2001 05:45:55 +0000 Subject: * dln.c (dln_strerror): fix a bug that sometimes made null message on win32 (Tietew 's patch). * win32/win32.c (mystrerror): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ dln.c | 2 +- win32/win32.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0493973641..c6518a7741 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Aug 24 14:38:17 2001 Usaku Nakamura + + * dln.c (dln_strerror): fix a bug that sometimes made null message on + win32 (Tietew 's patch). + + * win32/win32.c (mystrerror): ditto. + Thu Aug 23 21:59:38 2001 Nobuyoshi Nakada * enum.c (sort_by_i): fix typo. diff --git a/dln.c b/dln.c index 2dd7b87cf7..cbb267f6c3 100644 --- a/dln.c +++ b/dln.c @@ -1153,7 +1153,7 @@ dln_strerror() char *p = message; p += sprintf(message, "%d: ", error); FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM, + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), diff --git a/win32/win32.c b/win32/win32.c index 27f425e005..52c361d27d 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1832,7 +1832,8 @@ mystrerror(int e) if (e < 0 || e > sys_nerr) { if (e < 0) e = GetLastError(); - if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, &source, e, 0, + if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, 0, buffer, 512, NULL) == 0) { strcpy(buffer, "Unknown Error"); } -- cgit v1.2.3