Skip to content

mingw: safeguard against compiling with -DUNICODE #1958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 30, 2018
Merged

mingw: safeguard against compiling with -DUNICODE #1958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f48580
mingw: use ANSI or Unicode functions explicitly
dscho Nov 27, 2018
6a6158d
fixup! mingw: introduce code to detect whether we're inside a Windows…
dscho Nov 27, 2018
0f05a8c
fixup! mingw: kill child processes in a gentler way
dscho Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compat/mingw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1679,7 +1679,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
do_unset_environment_variables();

/* Determine whether or not we are associated to a console */
cons = CreateFile("CONOUT$", GENERIC_WRITE,
cons = CreateFileA("CONOUT$", GENERIC_WRITE,
FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
if (cons == INVALID_HANDLE_VALUE) {
Expand Down Expand Up @@ -2344,7 +2344,7 @@ struct passwd *getpwuid(int uid)
return p;

len = sizeof(user_name);
if (!GetUserName(user_name, &len)) {
if (!GetUserNameA(user_name, &len)) {
initialized = 1;
return NULL;
}
Expand Down Expand Up @@ -3270,7 +3270,7 @@ int is_inside_windows_container(void)
return inside_container;

inside_container = ERROR_SUCCESS ==
RegOpenKeyEx(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &handle);
RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &handle);
RegCloseKey(handle);

return inside_container;
Expand Down
2 changes: 1 addition & 1 deletion compat/poll/poll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ win32_compute_revents (HANDLE h, int *p_sought)
if (!once_only)
{
NtQueryInformationFile = (PNtQueryInformationFile)
GetProcAddress (GetModuleHandle ("ntdll.dll"),
GetProcAddress (GetModuleHandleA ("ntdll.dll"),
"NtQueryInformationFile");
once_only = TRUE;
}
Expand Down
2 changes: 1 addition & 1 deletion compat/win32/exit-process.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static int exit_process(HANDLE process, int exit_code)
HANDLE thread = NULL;

if (!initialized) {
HINSTANCE kernel32 = GetModuleHandle("kernel32");
HINSTANCE kernel32 = GetModuleHandleA("kernel32");
if (!kernel32)
die("BUG: cannot find kernel32");
exit_process_address = (LPTHREAD_START_ROUTINE)
Expand Down
4 changes: 2 additions & 2 deletions compat/winansi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,12 +629,12 @@ void winansi_init(void)

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

hread = CreateFile(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
hread = CreateFileA(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
if (hread == INVALID_HANDLE_VALUE)
die_lasterr("CreateFile for named pipe failed");

Expand Down