From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2019 22:16:49 +0000 (-0700)
Subject: Merge branch 'js/mingw-use-utf8'
X-Git-Tag: v2.23.0-rc0~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0a2ff7c6b5ec5e4301a9cfb3c0dd26590d70ad7a

Merge branch 'js/mingw-use-utf8'

Windows update.

* js/mingw-use-utf8:
mingw: fix possible buffer overrun when calling `GetUserNameW()`
mingw: use Unicode functions explicitly
mingw: get pw_name in UTF-8 format
---

0a2ff7c6b5ec5e4301a9cfb3c0dd26590d70ad7a
diff --cc compat/poll/poll.c
index 8b07edb0fe,8f24b80252..0e95dd493c
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@@ -149,8 -149,8 +149,8 @@@ win32_compute_revents (HANDLE h, int *p
      case FILE_TYPE_PIPE:
        if (!once_only)
  	{
 -	  NtQueryInformationFile = (PNtQueryInformationFile)
 +	  NtQueryInformationFile = (PNtQueryInformationFile)(void (*)(void))
- 	    GetProcAddress (GetModuleHandle ("ntdll.dll"),
+ 	    GetProcAddress (GetModuleHandleW (L"ntdll.dll"),
  			    "NtQueryInformationFile");
  	  once_only = TRUE;
  	}