From e8444a2fb8f59a7a9062ce1a2ac4d05a80489420 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 19 Mar 2024 18:27:03 -0400 Subject: [PATCH] Fix logging in now that 32-bit support disappeared In the March 2024 the 32-bit client was removed, so we need to modify some of the boot targets that no longer exist. The DirectX 9 client is gone too, but that will be dealt with in a later commit. (cherry picked from commit 516c0926a67d86a502d8b99ee02803cd9adf3314) --- launcher/src/squareenixlogin.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/launcher/src/squareenixlogin.cpp b/launcher/src/squareenixlogin.cpp index a26a2c5..2e18125 100644 --- a/launcher/src/squareenixlogin.cpp +++ b/launcher/src/squareenixlogin.cpp @@ -18,6 +18,10 @@ #include "launchercore.h" #include "utility.h" +// Support for the 32-bit DX9 client was removed in March 2024 +// TODO: we should probably detect this automatically +#define SUPPORT_32BIT 0 + using namespace Qt::StringLiterals; SquareEnixLogin::SquareEnixLogin(LauncherCore &window, QObject *parent) @@ -374,12 +378,19 @@ QCoro::Task SquareEnixLogin::registerSession() QCoro::Task SquareEnixLogin::getBootHash() { +#if SUPPORT_32BIT const QList fileList = {QStringLiteral("ffxivboot.exe"), QStringLiteral("ffxivboot64.exe"), QStringLiteral("ffxivlauncher.exe"), QStringLiteral("ffxivlauncher64.exe"), QStringLiteral("ffxivupdater.exe"), QStringLiteral("ffxivupdater64.exe")}; +#else + const QList fileList = {QStringLiteral("ffxivboot.exe"), + QStringLiteral("ffxivboot64.exe"), + QStringLiteral("ffxivlauncher64.exe"), + QStringLiteral("ffxivupdater64.exe")}; +#endif const auto hashFuture = QtConcurrent::mapped(fileList, [this](const auto &filename) -> QString { return getFileHash(m_info->profile->gamePath() + QStringLiteral("/boot/") + filename);