suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: accept Unicode error-message strings from the system

Browse Source 
Closes PR 12559
This commit is contained in:
Matthew Flatt 2012-02-09 15:11:00 -07:00
parent 8000dd78ca
commit a08a22bedb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/racket/src/error.c
View File

@ -447,13 +447,17 @@ static intptr_t sch_vsprintf(char *s, intptr_t maxlen, const char *msg, va_list
es = "Unknown error"; es = "Unknown error";
#else #else
# ifdef DOS_FILE_SYSTEM # ifdef DOS_FILE_SYSTEM
char mbuf[256]; wchar_t mbuf[256];
int len;
if ((type != 'e') && !es) { if ((type != 'e') && !es) {
if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, if ((len = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL,
en, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), en, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
mbuf, 255, NULL)) { mbuf, 255, NULL))) {
int i; int i;
es = mbuf; i = scheme_utf8_encode((const unsigned int *)mbuf, 0, len, NULL, 0, 1);
es = (char *)scheme_malloc_atomic(i + 1);
(void)scheme_utf8_encode((const unsigned int *)mbuf, 0, len, es, 0, 1);
es[i] = 0;
/* Remove newlines: */ /* Remove newlines: */
for (i = strlen(es) - 1; i > 0; i--) { for (i = strlen(es) - 1; i > 0; i--) {
if (isspace(es[i])) if (isspace(es[i]))