From 1aca9a19dbc9f2c83de39f71fc2ff284ca33984d Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Sat, 17 Dec 2022 11:44:30 +0100 Subject: [PATCH] Switch Linux HDID code to Qt shenanigans (#879) * 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 --- src/hardware_functions.cpp | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/hardware_functions.cpp b/src/hardware_functions.cpp index 233318e..1429680 100644 --- a/src/hardware_functions.cpp +++ b/src/hardware_functions.cpp @@ -36,7 +36,7 @@ QString get_hdid() ConvertSidToStringSidW(pToken->User.Sid, &HDIDParam); QString returnHDID = QString::fromWCharArray(HDIDParam); CloseHandle(hToken); - return returnHDID; + return returnHDID; } #elif defined(ANDROID) QString get_hdid() @@ -50,30 +50,18 @@ QString get_hdid() } #elif QT_VERSION < QT_VERSION_CHECK(5, 11, 0) #if (defined(LINUX) || defined(__linux__)) +#include -#include -#include +QByteArray machineId; QString get_hdid() { - QFile fstab_file("/etc/fstab"); - if (!fstab_file.open(QIODevice::ReadOnly)) - return "uxcps32sa9fnwic92mfbs0"; + machineId = QSysInfo::machineUniqueId(); - QTextStream in(&fstab_file); - - 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(); - } + if (machineId.isEmpty()) { + return "gxsps32sa9fnwic92mfbs2"; } - - return "uxcpz32sa9fnwic92mfbs1"; + return QString(machineId); } #elif defined __APPLE__