From 2c533abf133bdc81c2d8f2d5cb62f7296edb9454 Mon Sep 17 00:00:00 2001 From: corinna Date: Sun, 26 Sep 2010 15:45:08 +0000 Subject: [PATCH] * uinfo.cc (cygheap_user::init): Call GetUserNameW and convert to multibyte here so as not to rely on the current ANSI page. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/uinfo.cc | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 82dc372d8f..dd71ff6d4d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2010-09-26 Corinna Vinschen + + * uinfo.cc (cygheap_user::init): Call GetUserNameW and convert to + multibyte here so as not to rely on the current ANSI page. + 2010-09-26 Christopher Faylor * dcrt0.cc (__main): Force signal synchronization. diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 2695d81761..60db38e763 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -37,10 +37,15 @@ details. */ void cygheap_user::init () { - char user_name[UNLEN + 1]; + WCHAR user_name[UNLEN + 1]; DWORD user_name_len = UNLEN + 1; - set_name (GetUserName (user_name, &user_name_len) ? user_name : "unknown"); + if (!GetUserNameW (user_name, &user_name_len)) + wcpcpy (user_name, L"unknown"); + + char mb_user_name[user_name_len = sys_wcstombs (NULL, 0, user_name)]; + sys_wcstombs (mb_user_name, user_name_len, user_name); + set_name (mb_user_name); DWORD siz; PSECURITY_DESCRIPTOR psd; -- 2.11.0