Mercurial > vim
changeset 5549:32e50f85d2c7 v7.4.123
updated for version 7.4.123
Problem: Win32: Getting user name does not use wide function.
Solution: Use GetUserNameW() if possible. (Ken Takata)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 11 Dec 2013 18:18:06 +0100 |
| parents | 90f26849f78a |
| children | de073f33c3f2 |
| files | src/os_win32.c src/version.c |
| diffstat | 2 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -2768,6 +2768,26 @@ mch_get_user_name( char szUserName[256 + 1]; /* UNLEN is 256 */ DWORD cch = sizeof szUserName; +#ifdef FEAT_MBYTE + if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) + { + WCHAR wszUserName[256 + 1]; /* UNLEN is 256 */ + DWORD wcch = sizeof(wszUserName) / sizeof(WCHAR); + + if (GetUserNameW(wszUserName, &wcch)) + { + char_u *p = utf16_to_enc(wszUserName, NULL); + + if (p != NULL) + { + vim_strncpy(s, p, len - 1); + vim_free(p); + return OK; + } + } + /* Retry with non-wide function (for Windows 98). */ + } +#endif if (GetUserName(szUserName, &cch)) { vim_strncpy(s, szUserName, len - 1);