Merge branch 'js/mingw-use-utf8'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2019 22:16:49 +0000 (15:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2019 22:16:49 +0000 (15:16 -0700)
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

1  2 
compat/mingw.c
compat/poll/poll.c
compat/winansi.c

diff --cc compat/mingw.c
Simple merge
@@@ -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;
        }
Simple merge