Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch Linux HDID code to Qt shenanigans (#879)

Browse Source 
* Replace legacy Linux HDID code

This should, I guess, fix t

* Bump zlib version

* Libbass changed the folder structure, it seems.

* Should update the rest too.

* Add default HDID
This commit is contained in:
Salanto 2022-12-17 11:44:30 +01:00 committed by GitHub
parent 8a0404f424
commit 1aca9a19db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hardware_functions.cpp
View File

@ -36,7 +36,7 @@ QString get_hdid()
ConvertSidToStringSidW(pToken->User.Sid, &HDIDParam); ConvertSidToStringSidW(pToken->User.Sid, &HDIDParam);
QString returnHDID = QString::fromWCharArray(HDIDParam); QString returnHDID = QString::fromWCharArray(HDIDParam);
CloseHandle(hToken); CloseHandle(hToken);
return returnHDID; return returnHDID;
} }
#elif defined(ANDROID) #elif defined(ANDROID)
QString get_hdid() QString get_hdid()
@ -50,30 +50,18 @@ QString get_hdid()
} }
#elif QT_VERSION < QT_VERSION_CHECK(5, 11, 0) #elif QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
#if (defined(LINUX) || defined(__linux__)) #if (defined(LINUX) || defined(__linux__))
#include <QSysInfo>
#include <QFile> QByteArray machineId;
#include <QTextStream>
QString get_hdid() QString get_hdid()
{ {
QFile fstab_file("/etc/fstab"); machineId = QSysInfo::machineUniqueId();
if (!fstab_file.open(QIODevice::ReadOnly))
return "uxcps32sa9fnwic92mfbs0";
QTextStream in(&fstab_file); if (machineId.isEmpty()) {
return "gxsps32sa9fnwic92mfbs2";
while (!in.atEnd()) {
QString line = in.readLine();
if (line.startsWith("UUID")) {
QStringList line_elements = line.split("=");
if (line_elements.size() > 1)
return line_elements.at(1).left(23).trimmed();
}
} }
return QString(machineId);
return "uxcpz32sa9fnwic92mfbs1";
} }
#elif defined __APPLE__ #elif defined __APPLE__