Skip to content

Commit a2ce8e7

Browse files
committed
mingw: use ANSI or Unicode functions explicitly
For many Win32 functions, there actually exist two variants: one with the `A` suffix that takes ANSI parameters (`char *` or `const char *`) and one with the `W` suffix that takes Unicode parameters (`wchar_t *` or `const wchar_t *`). Let's be precise what we want to use. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 32e9c90 commit a2ce8e7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

compat/mingw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
14071407
do_unset_environment_variables();
14081408

14091409
/* Determine whether or not we are associated to a console */
1410-
cons = CreateFile("CONOUT$", GENERIC_WRITE,
1410+
cons = CreateFileA("CONOUT$", GENERIC_WRITE,
14111411
FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
14121412
FILE_ATTRIBUTE_NORMAL, NULL);
14131413
if (cons == INVALID_HANDLE_VALUE) {
@@ -1952,7 +1952,7 @@ struct passwd *getpwuid(int uid)
19521952
return p;
19531953

19541954
len = sizeof(user_name);
1955-
if (!GetUserName(user_name, &len)) {
1955+
if (!GetUserNameA(user_name, &len)) {
19561956
initialized = 1;
19571957
return NULL;
19581958
}

compat/poll/poll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ win32_compute_revents (HANDLE h, int *p_sought)
150150
if (!once_only)
151151
{
152152
NtQueryInformationFile = (PNtQueryInformationFile)
153-
GetProcAddress (GetModuleHandle ("ntdll.dll"),
153+
GetProcAddress (GetModuleHandleA ("ntdll.dll"),
154154
"NtQueryInformationFile");
155155
once_only = TRUE;
156156
}

compat/winansi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,12 +620,12 @@ void winansi_init(void)
620620

621621
/* create a named pipe to communicate with the console thread */
622622
xsnprintf(name, sizeof(name), "\\\\.\\pipe\\winansi%lu", GetCurrentProcessId());
623-
hwrite = CreateNamedPipe(name, PIPE_ACCESS_OUTBOUND,
623+
hwrite = CreateNamedPipeA(name, PIPE_ACCESS_OUTBOUND,
624624
PIPE_TYPE_BYTE | PIPE_WAIT, 1, BUFFER_SIZE, 0, 0, NULL);
625625
if (hwrite == INVALID_HANDLE_VALUE)
626626
die_lasterr("CreateNamedPipe failed");
627627

628-
hread = CreateFile(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
628+
hread = CreateFileA(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
629629
if (hread == INVALID_HANDLE_VALUE)
630630
die_lasterr("CreateFile for named pipe failed");
631631

0 commit comments

Comments
 (0)