SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

friend with UNICODE macro on windows

Browse Source
This commit is contained in:
Пелипенко Иван
2022-12-07 09:33:46 +03:00
parent 3625627072
commit 0bd45ec49b
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/main/system/pilibrary.cpp
View File

@@ -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

12
libs/main/system/pisysteminfo.cpp
View File

@@ -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> 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