diff --git a/libs/console/piterminal.cpp b/libs/console/piterminal.cpp index 623e09be..bde71d51 100644 --- a/libs/console/piterminal.cpp +++ b/libs/console/piterminal.cpp @@ -772,7 +772,7 @@ bool PITerminal::initialize() { destroy(); return false; } - PRIVATE->pipe = CreateNamedPipe((LPSTR)pname.dataAscii(), PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 2, PIPE_BUFFER_SIZE, PIPE_BUFFER_SIZE, 1000, NULL); + PRIVATE->pipe = CreateNamedPipeA((LPSTR)pname.dataAscii(), PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 2, PIPE_BUFFER_SIZE, PIPE_BUFFER_SIZE, 1000, NULL); if (PRIVATE->pipe == INVALID_HANDLE_VALUE) { piCoutObj << "CreateNamedPipe error," << errorString(); destroy(); diff --git a/libs/main/core/piinit.cpp b/libs/main/core/piinit.cpp index c0e70c84..8d39442d 100644 --- a/libs/main/core/piinit.cpp +++ b/libs/main/core/piinit.cpp @@ -137,7 +137,7 @@ PIInit::PIInit() { if (__pi_perf_freq == 0) __pi_perf_freq = -1; // Sleep precision init - PRIVATE->ntlib = LoadLibrary("ntdll.dll"); + PRIVATE->ntlib = LoadLibraryA("ntdll.dll"); if (PRIVATE->ntlib) { getTimerResolutionAddr = (PINtQueryTimerResolution)GetProcAddress(PRIVATE->ntlib, "NtQueryTimerResolution"); setTimerResolutionAddr = (PINtSetTimerResolution)GetProcAddress(PRIVATE->ntlib, "NtSetTimerResolution"); @@ -221,7 +221,7 @@ PIInit::PIInit() { LocalFree(argv_); memset(cbuff, 0, 1024); ulong unlen = 1023; - if (GetUserName(cbuff, &unlen) != 0) + if (GetUserNameA(cbuff, &unlen) != 0) sinfo->user = cbuff; #else //WINDOWS sinfo->processorsCount = piMaxi(1, int(sysconf(_SC_NPROCESSORS_ONLN))); diff --git a/libs/main/io_devices/pidir.cpp b/libs/main/io_devices/pidir.cpp index b8b6b8d8..c95133db 100644 --- a/libs/main/io_devices/pidir.cpp +++ b/libs/main/io_devices/pidir.cpp @@ -285,7 +285,7 @@ PIVector PIDir::entries() { if (dp == separator) { char letters[1024]; PIFile::FileInfo fi; - DWORD ll = GetLogicalDriveStrings(1023, letters); + DWORD ll = GetLogicalDriveStringsA(1023, letters); PIString clet; for (DWORD i = 0; i < ll; ++i) { if (letters[i] == '\0') { @@ -298,9 +298,9 @@ PIVector PIDir::entries() { clet += PIChar(letters[i]); } } else { - WIN32_FIND_DATA fd; memset(&fd, 0, sizeof(fd)); + WIN32_FIND_DATAA fd; memset(&fd, 0, sizeof(fd)); p += "\\*"; - void * hf = FindFirstFile((LPCTSTR)(p.data()), &fd); + void * hf = FindFirstFileA((LPCSTR)(p.data()), &fd); if (!hf) return l; bool hdd = false; do { @@ -308,7 +308,7 @@ PIVector PIDir::entries() { if (fn == "..") hdd = true; l << PIFile::fileInfo(dp + fn); memset(&fd, 0, sizeof(fd)); - } while (FindNextFile(hf, &fd) != 0); + } while (FindNextFileA(hf, &fd) != 0); FindClose(hf); l.sort(sort_compare); if (!hdd) { diff --git a/libs/main/io_devices/pifile.cpp b/libs/main/io_devices/pifile.cpp index 20dae7c3..81c81be3 100644 --- a/libs/main/io_devices/pifile.cpp +++ b/libs/main/io_devices/pifile.cpp @@ -301,7 +301,7 @@ bool PIFile::isExists(const PIString & path) { bool PIFile::remove(const PIString & path) { #ifdef WINDOWS if (PIDir::isExists(path)) - return RemoveDirectory(path.data()) > 0; + return RemoveDirectoryA(path.data()) > 0; else #endif return ::remove(path.data()) == 0; @@ -475,13 +475,13 @@ PIFile::FileInfo PIFile::fileInfo(const PIString & path) { PIString n = ret.name(); //piCout << "open" << path; #ifdef WINDOWS - DWORD attr = GetFileAttributes((LPCTSTR)(path.data())); + DWORD attr = GetFileAttributesA((LPCSTR)(path.data())); if (attr == 0xFFFFFFFF) return ret; HANDLE hFile = 0; if ((attr & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) { - hFile = CreateFile(path.data(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + hFile = CreateFileA(path.data(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); } else { - hFile = CreateFile(path.data(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + hFile = CreateFileA(path.data(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); } if (!hFile) return ret; BY_HANDLE_FILE_INFORMATION fi; @@ -557,19 +557,19 @@ bool PIFile::applyFileInfo(const PIString & path, const PIFile::FileInfo & info) PIString fp(path); if (fp.endsWith(PIDir::separator)) fp.pop_back(); #ifdef WINDOWS - DWORD attr = GetFileAttributes((LPCTSTR)(path.data())); + DWORD attr = GetFileAttributesA((LPCSTR)(path.data())); if (attr == 0xFFFFFFFF) return false; attr &= ~(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_READONLY); if (info.isHidden()) attr |= FILE_ATTRIBUTE_HIDDEN; if (!info.perm_user.write) attr |= FILE_ATTRIBUTE_READONLY; - if (SetFileAttributes((LPCTSTR)(fp.data()), attr) == 0) { + if (SetFileAttributesA((LPCSTR)(fp.data()), attr) == 0) { piCout << "[PIFile] applyFileInfo: \"SetFileAttributes\" error:" << errorString(); } HANDLE hFile = 0; if ((attr & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) { - hFile = CreateFile(path.data(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + hFile = CreateFileA(path.data(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); } else { - hFile = CreateFile(path.data(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0); + hFile = CreateFileA(path.data(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0); } if (!hFile) return false; FILETIME atime = PIDateTime2FILETIME(info.time_access), mtime = PIDateTime2FILETIME(info.time_modification); diff --git a/libs/main/io_devices/pisharedmemory.cpp b/libs/main/io_devices/pisharedmemory.cpp index a2354b09..c4a7933c 100644 --- a/libs/main/io_devices/pisharedmemory.cpp +++ b/libs/main/io_devices/pisharedmemory.cpp @@ -101,10 +101,10 @@ bool PISharedMemory::openDevice() { PRIVATE->name = ("PIP_SHM_" + path()).toByteArray(); PRIVATE->name.push_back(0); const char * nm = (const char *)PRIVATE->name.data(); - PRIVATE->map = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, nm); + PRIVATE->map = OpenFileMappingA(FILE_MAP_ALL_ACCESS, FALSE, nm); //piCoutObj << "open map =" << ullong(PRIVATE->map); if (!PRIVATE->map) { - PRIVATE->map = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, (DWORD)dsize, nm); + PRIVATE->map = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, (DWORD)dsize, nm); //piCoutObj << "create map =" << ullong(PRIVATE->map); if (!PRIVATE->map) { piCoutObj << "CreateFileMapping error," << errorString(); diff --git a/libs/main/system/pilibrary.cpp b/libs/main/system/pilibrary.cpp index ea377da5..42b5598a 100644 --- a/libs/main/system/pilibrary.cpp +++ b/libs/main/system/pilibrary.cpp @@ -211,7 +211,7 @@ bool PILibrary::loadInternal() { unload(); if (libpath.isEmpty()) return false; #ifdef WINDOWS - PRIVATE->hLib = LoadLibrary(libpath.data()); + PRIVATE->hLib = LoadLibraryA(libpath.data()); #else PRIVATE->hLib = dlopen(libpath.data(), RTLD_LAZY); #endif diff --git a/libs/main/system/pisysteminfo.cpp b/libs/main/system/pisysteminfo.cpp index 2bf5ae69..7b6f1bc7 100644 --- a/libs/main/system/pisysteminfo.cpp +++ b/libs/main/system/pisysteminfo.cpp @@ -43,7 +43,7 @@ PIStringList PISystemInfo::mountRoots() { PIStringList ret; #ifdef WINDOWS char letters[1024]; - DWORD ll = GetLogicalDriveStrings(1023, letters); + DWORD ll = GetLogicalDriveStringsA(1023, letters); PIString clet; for (uint i = 0; i < ll; ++i) { if (letters[i] == '\0') { @@ -93,26 +93,26 @@ PIVector PISystemInfo::mountInfo(bool ignore_cache) { MountInfo m; #ifdef WINDOWS char letters[1024], volname[1024], volfs[1024]; - DWORD ll = GetLogicalDriveStrings(1023, letters); + DWORD ll = GetLogicalDriveStringsA(1023, letters); PIString clet; for (DWORD i = 0; i < ll; ++i) { if (letters[i] == '\0') { - if (GetVolumeInformation(clet.data(), volname, 1023, 0, 0, 0, volfs, 1023)) { + if (GetVolumeInformationA(clet.data(), volname, 1023, 0, 0, 0, volfs, 1023)) { m.mount_point = clet; m.filesystem = volfs; m.label = volname; DWORD spc, bps, free_cl, all_cl; - if (GetDiskFreeSpace(clet.data(), &spc, &bps, &free_cl, &all_cl)) { + if (GetDiskFreeSpaceA(clet.data(), &spc, &bps, &free_cl, &all_cl)) { ullong bpc = ullong(spc) * ullong(bps); m.space_all = bpc * ullong(all_cl); m.space_free = bpc * ullong(free_cl); m.space_used = m.space_all - m.space_free; } else m.space_all = m.space_free = m.space_used = 0U; - if (GetDriveType(clet.dataAscii()) == DRIVE_REMOVABLE) + if (GetDriveTypeA(clet.dataAscii()) == DRIVE_REMOVABLE) m.removable = true; clet.cutRight(1); - int qdd = QueryDosDevice(clet.data(), volfs, 1023); + int qdd = QueryDosDeviceA(clet.data(), volfs, 1023); if (qdd > 0) m.device = volfs; else diff --git a/utils/piterminal/main.cpp b/utils/piterminal/main.cpp index 0256b9ce..db958cb4 100644 --- a/utils/piterminal/main.cpp +++ b/utils/piterminal/main.cpp @@ -233,7 +233,7 @@ void getCursor(int & x, int & y) { int main (int argc, char * argv[]) { //piCout << "start"; - STARTUPINFO si; + STARTUPINFOA si; PROCESS_INFORMATION pi; memset(&si, 0, sizeof(si)); memset(&pi, 0, sizeof(pi)); @@ -245,7 +245,7 @@ int main (int argc, char * argv[]) { return 1; } PISharedMemory shm("piterm_aux" + shmh, 1024*1024); - pipe = CreateFile((LPSTR)pname.dataAscii(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); + pipe = CreateFileA((LPSTR)pname.dataAscii(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); if (pipe == INVALID_HANDLE_VALUE) { return 1; }