finally proper solution to the startup issue!

Author: p0358

src/main/origin_client_dll_patches.cpp

@@ -56,29 +56,113 @@ void*(__cdecl* readSetting_org)(void*, void*, int, void*);
 void* __cdecl readSetting_hook(void* out_qv, void* setting, int a3, void* a4)
 {
 	static auto QVariant_QVariant_from_bool = GetExport<void*(__thiscall*)(void*, bool)>(Qt5Core, "??0QVariant@@QAE@_N@Z");
+	static auto QVariant_QVariant_from_cchar = GetExport<void*(__thiscall*)(void*, const char*)>(Qt5Core, "??0QVariant@@QAE@PBD@Z");
+	static auto QVariant_destroy = GetExport<void*(__thiscall*)(void*)>(Qt5Core, "??1QVariant@@QAE@XZ");
+
 	static auto SETTING_MigrationDisabled = GetExport<void*>(OriginClient, "?SETTING_MigrationDisabled@Services@Origin@@3VSetting@12@A"); // non-const symbol
 	if (!SETTING_MigrationDisabled)
 		SETTING_MigrationDisabled = GetExport<void*>(OriginClient, "?SETTING_MigrationDisabled@Services@Origin@@3VSetting@12@B"); // const symbol
+	static auto SETTING_REMEMBER_ME_PROD = GetExport<void*>(OriginClient, "?SETTING_REMEMBER_ME_PROD@Services@Origin@@3VSetting@12@A"); // non-const symbol
+	if (!SETTING_REMEMBER_ME_PROD)
+		SETTING_REMEMBER_ME_PROD = GetExport<void*>(OriginClient, "?SETTING_REMEMBER_ME_PROD@Services@Origin@@3VSetting@12@B"); // const symbol
+
+	static auto Origin_Services_Variant_operator_QString = GetExport<void* (__thiscall*)(void*, void*)>(OriginClient, "??BVariant@Services@Origin@@QBE?AVQString@@XZ");
+	static auto QString_destroy = GetExport<void(__thiscall*)(void*)>(Qt5Core, "??1QString@@QAE@XZ");
+	static auto QString_toStdString = GetExport<void* (__thiscall*)(void*, std::string*)>(Qt5Core, "?toStdString@QString@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ");
 
 	static bool didWarnAboutMissingAlready = false;
-	if (!didWarnAboutMissingAlready && (!QVariant_QVariant_from_bool || !SETTING_MigrationDisabled)) [[unlikely]]
+	if (!didWarnAboutMissingAlready && (!QVariant_QVariant_from_bool || !QVariant_QVariant_from_cchar || !QVariant_destroy
+		|| !SETTING_MigrationDisabled || !SETTING_REMEMBER_ME_PROD || !Origin_Services_Variant_operator_QString || !QString_destroy
+		|| !QString_toStdString)) [[unlikely]]
 	{
 		didWarnAboutMissingAlready = true;
 		MessageBoxA(nullptr, ("Error in Origin::Services::readSetting: one of the exports could not have been resolved, we may crash\n"
-			"\nQVariant_QVariant_from_bool: " + std::to_string(uintptr_t(QVariant_QVariant_from_bool))
-			+ "\nSETTING_MigrationDisabled: " + std::to_string(uintptr_t(SETTING_MigrationDisabled))
+			"\nQVariant_QVariant_from_bool: " + std::format("{:#010x}", uintptr_t(QVariant_QVariant_from_bool))
+			+ "\nQVariant_QVariant_from_cchar: " + std::format("{:#010x}", uintptr_t(QVariant_QVariant_from_cchar))
+			+ "\nQVariant_destroy: " + std::format("{:#010x}", uintptr_t(QVariant_destroy))
+			+ "\nSETTING_MigrationDisabled: " + std::format("{:#010x}", uintptr_t(SETTING_MigrationDisabled))
+			+ "\nSETTING_REMEMBER_ME_PROD: " + std::format("{:#010x}", uintptr_t(SETTING_REMEMBER_ME_PROD))
+			+ "\nOrigin_Services_Variant_operator_QString: " + std::format("{:#010x}", uintptr_t(Origin_Services_Variant_operator_QString))
+			+ "\nQString_destroy: " + std::format("{:#010x}", uintptr_t(QString_destroy))
+			+ "\nQString_toStdString: " + std::format("{:#010x}", uintptr_t(QString_toStdString))
 			).c_str(),
 			ERROR_MSGBOX_CAPTION, MB_ICONERROR);
 	}
+
+	void* ret = readSetting_org(out_qv, setting, a3, a4);
+
+	if (IsDebuggerPresent())
+	{
+		
+		if (Origin_Services_Variant_operator_QString && QString_destroy && QString_toStdString)
+		{
+			char qs[4] = { 0 };
+			Origin_Services_Variant_operator_QString(ret, qs);
+
+			std::string qss;
+			QString_toStdString(qs, &qss);
+
+			std::string setting_name;
+			QString_toStdString((void*)(uintptr_t(setting) + 8), &setting_name);
+			OutputDebugStringA(("readSetting: " + setting_name + "=" + qss).c_str());
+
+			/*if (setting_name == "RememberMeProd")
+			{
+				QVariant_destroy(ret);
+				static auto QVariant_QVariant_from_cchar = GetExport<void* (__thiscall*)(void*, const char*)>(Qt5Core, "??0QVariant@@QAE@PBD@Z");
+				QVariant_QVariant_from_cchar(out_qv, "TUU...||accounts.ea.com||2025-03-11T21:21:02Z||/connect");
+				OutputDebugStringA("overriding!");
+			}*/
+
+			QString_destroy(qs);
+		}
+	}
 
 	if (setting == SETTING_MigrationDisabled)
 	{
 		// override to true
+		QVariant_destroy(ret);
 		QVariant_QVariant_from_bool(out_qv, true); // caller will destruct this
 		return out_qv;
 	}
+	
+	if (setting == SETTING_REMEMBER_ME_PROD)
+	{
+		OutputDebugStringA("[Origin::Services::readSetting] SETTING_REMEMBER_ME_PROD");
+		char qs[4] = { 0 };
+		Origin_Services_Variant_operator_QString(ret, qs);
+
+		std::string qss;
+		QString_toStdString(qs, &qss);
+		QString_destroy(qs);
+		//OutputDebugStringA(("[Origin::Services::readSetting] qss: " + qss).c_str());
+
+		std::vector<std::string> parts;
+		for (const auto word : std::views::split(qss, "||"sv))
+			parts.push_back(std::string{ word.begin(), word.end() });
+
+		if (parts.size() >= 2)
+		{
+			//OutputDebugStringA(("[Origin::Services::readSetting] parts[1]: " + parts[1]).c_str());
+			if (parts[1] == ".ea.com")
+			{
+				OutputDebugStringA("[Origin::Services::readSetting] Fixing domain name to accounts.ea.com for cookie remid");
+				parts[1] = "accounts.ea.com";
+
+				qss.clear();
+				for (auto word : parts)
+					qss += "||" + word;
+				qss.erase(0, 2);
+
+				QVariant_destroy(ret);
+				QVariant_QVariant_from_cchar(out_qv, qss.c_str()); // caller will destruct this
+				//OutputDebugStringA(("[Origin::Services::readSetting] final value: " + qss).c_str());
+				return out_qv;
+			}
+		}
+	}
 
-	return readSetting_org(out_qv, setting, a3, a4);
+	return ret;
 }
 
 // Origin::Engine::Content::LocalContent::treatUpdatesAsMandatory
@@ -97,129 +181,6 @@ void __fastcall checkForUpdate_hook(void* thisptr /*ecx*/)
 	// downloaded upon next Origin launch by thin setup.
 }
 
-#if 0
-// NOTE: This hook is completely broken, but also not needed...
-// QString::compare
-bool(__thiscall* qstring_compare_org)(void*, void*, int);
-bool __fastcall qstring_compare_hook(void* thisptr /*ecx*/, void* /*edx*/, void* comparee, int a3)
-{
-	if (a3 == 1)
-	{
-		static auto QString_startsWith = GetExport<void* (__thiscall*)(void*, void*, int)>(Qt5Core, "?startsWith@QString@@QBE_NABV1@W4CaseSensitivity@Qt@@@Z");
-		static auto QString_QString = GetExport<void* (__thiscall*)(void*, const char*)>(Qt5Core, "??0QString@@QAE@PBD@Z");
-		static int ten = 0;
-		static int twelve = 0;
-		if (ten == 0) QString_QString(&twelve, "10.5.");
-		if (twelve == 0) QString_QString(&twelve, "12.");
-		if (QString_startsWith(comparee, &twelve, 0) && QString_startsWith(thisptr, &ten, 0))
-			return 0;
-	}
-	return qstring_compare_org(thisptr, comparee, a3);
-}
-#endif
-
-#if 0
-// Origin::Client::LoginViewController::init
-void(__thiscall* loginViewController_init_org)(void*, DWORD*, /* Origin::Client::AuthenticationJsHelper* */ void*, int);
-void __fastcall loginViewController_init_hook(void* thisptr /*ecx*/, void* /*edx*/, DWORD* a2, void* a3, int a4)
-{
-	loginViewController_init_org(thisptr, a2, a3, a4);
-	////*(bool*)((uintptr_t)thisptr + 166) = true; // make it think we've loaded all cookies already
-	//*(bool*)((uintptr_t)thisptr + 167) = true; // make it think Trusted Clock is already initialized
-	loginViewController_init_org(thisptr, a2, a3, a4);
-
-	// this does NOT seem to work here!
-	// Origin::Client::LoginViewController::killSplashScreenAndShowLoginWindow
-	//static auto killSplashScreenAndShowLoginWindow = GetExport<void(__thiscall*)(void*)>(OriginClient, "?killSplashScreenAndShowLoginWindow@LoginViewController@Client@Origin@@AAEXXZ");
-	//killSplashScreenAndShowLoginWindow(thisptr);
-}
-
-// Origin::Services::TrustedClock::isInitialized
-bool(__thiscall* trustedClock_isInitialized_org)(void*);
-bool __fastcall trustedClock_isInitialized_hook(void* thisptr /*ecx*/)
-{
-	return true;
-}
-
-// Origin::Client::LoginViewController::loadLoginPage
-void(__thiscall* loginViewController_loadLoginPage_org)(void*, int);
-void __fastcall loginViewController_loadLoginPage_hook(void* thisptr /*ecx*/, void* /*edx*/, int a2)
-{
-	loginViewController_loadLoginPage_org(thisptr, a2);
-
-	static auto killSplashScreenAndShowLoginWindow = GetExport<void(__thiscall*)(void*)>(OriginClient, "?killSplashScreenAndShowLoginWindow@LoginViewController@Client@Origin@@AAEXXZ");
-	
-	static bool didWarnAboutMissingAlready = false;
-	if (!didWarnAboutMissingAlready && (!killSplashScreenAndShowLoginWindow)) [[unlikely]]
-	{
-		didWarnAboutMissingAlready = true;
-		MessageBoxA(nullptr, "Error in Origin::Client::LoginViewController::loadLoginPage: killSplashScreenAndShowLoginWindow was not found, your Origin client will probably be stuck on splash screen\n"
-			"\nRight-click Origin icon in your tray and click Open Origin as a workaround.",
-			ERROR_MSGBOX_CAPTION, MB_ICONERROR);
-	}
-
-	// well it seems someone forgot to call this func in a reasonable place like here
-	if (killSplashScreenAndShowLoginWindow)
-		killSplashScreenAndShowLoginWindow(thisptr);
-}
-#endif
-
-// QWebEngineCookieStore::setCookie
-void(__thiscall* QWebEngineCookieStore_setCookie_org)(void*, /* QNetworkCookie */ void*, /* QUrl */ void*);
-void __fastcall QWebEngineCookieStore_setCookie_hook(void* thisptr /*ecx*/, void* /*edx*/, void* cookie, void* url)
-{
-	static auto QString_destroy = GetExport<void(__thiscall*)(void*)>(Qt5Core, "??1QString@@QAE@XZ");
-	static auto QString_QString_from_cchar = GetExport<void* (__thiscall*)(void*, const char*)>(Qt5Core, "??0QString@@QAE@PBD@Z");
-	static auto QString_toStdString = GetExport<void* (__thiscall*)(void*, std::string*)>(Qt5Core, "?toStdString@QString@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ");
-	static auto QByteArray_toStdString = GetExport<void* (__thiscall*)(void*, std::string*)>(Qt5Core, "?toStdString@QByteArray@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ");
-	static auto QByteArray_destroy = GetExport<void* (__thiscall*)(void*)>(Qt5Core, "??1QByteArray@@QAE@XZ");
-	static auto QNetworkCookie_setDomain = GetExport<void(__thiscall*)(void*, void*)>(Qt5Network, "?setDomain@QNetworkCookie@@QAEXABVQString@@@Z");
-	static auto QNetworkCookie_domain = GetExport<void(__thiscall*)(void*, void*)>(Qt5Network, "?domain@QNetworkCookie@@QBE?AVQString@@XZ");
-	static auto QNetworkCookie_name = GetExport<void(__thiscall*)(void*, void*)>(Qt5Network, "?name@QNetworkCookie@@QBE?AVQByteArray@@XZ");
-
-	OutputDebugStringA("[QWebEngineCookieStore::setCookie] Howdy");
-
-	if (QString_destroy && QString_QString_from_cchar && QString_toStdString && QByteArray_toStdString && QByteArray_destroy && QNetworkCookie_setDomain && QNetworkCookie_domain)
-	{
-		char qs_cookie_domain[4] = { 0 };
-		char qba_cookie_name[4] = { 0 };
-		std::string cookie_domain;
-		std::string cookie_name;
-
-		QNetworkCookie_domain(cookie, qs_cookie_domain);
-		QString_toStdString(qs_cookie_domain, &cookie_domain);
-		
-		QNetworkCookie_name(cookie, qba_cookie_name);
-		QByteArray_toStdString(qba_cookie_name, &cookie_name);
-
-		OutputDebugStringA(("[QWebEngineCookieStore::setCookie] name=" + cookie_name + " domain=" + cookie_domain).c_str());
-		//__debugbreak();
-
-		if (cookie_name == "remid" && cookie_domain == "")
-		{
-			OutputDebugStringA("[QWebEngineCookieStore::setCookie] Fixing domain name to accounts.ea.com for cookie remid");
-			char qs_cookie_domain_new[4] = { 0 };
-			QString_QString_from_cchar(qs_cookie_domain_new, "accounts.ea.com");
-			QNetworkCookie_setDomain(cookie, qs_cookie_domain_new);
-			QString_destroy(qs_cookie_domain_new);
-		}
-
-		QString_destroy(qs_cookie_domain);
-		QByteArray_destroy(qba_cookie_name);
-	}
-	else
-	{
-		static bool didWarnAboutMissingAlready = false;
-		if (!didWarnAboutMissingAlready) [[unlikely]]
-		{
-			didWarnAboutMissingAlready = true;
-			MessageBoxA(nullptr, "Error in QWebEngineCookieStore::setCookie: one of the exports could not have been resolved!", ERROR_MSGBOX_CAPTION, MB_ICONERROR);
-		}
-	}
-
-	QWebEngineCookieStore_setCookie_org(thisptr, cookie, url);
-}
-
 void DoOriginClientDllPatches()
 {
 	{
@@ -259,13 +220,4 @@ void DoOriginClientDllPatches()
 
 	// This checks for update to nag the user in the UI and auto-download the update zip, we don't ever need that
 	CreateHookNamed("OriginClient", "?checkForUpdate@SelfUpdateService@Services@Origin@@QAEXXZ", checkForUpdate_hook, reinterpret_cast<LPVOID*>(&checkForUpdate_org));
-	//CreateHookNamed("Qt5Core", "?compare@QString@@QBEHABV1@W4CaseSensitivity@Qt@@@Z", qstring_compare_hook, reinterpret_cast<LPVOID*>(&qstring_compare_org));
-
-	// Patches around broken login screen due to missing cookie (hopefully it's a temporary thing?)
-	///CreateHookNamed("OriginClient", "?init@LoginViewController@Client@Origin@@QAEXABW4StartupState@@W4IconType@OriginBanner@UIToolkit@3@ABVQString@@@Z", loginViewController_init_hook, reinterpret_cast<LPVOID*>(&loginViewController_init_org));
-	//CreateHookNamed("OriginClient", "?isInitialized@TrustedClock@Services@Origin@@QBE_NXZ", trustedClock_isInitialized_hook, reinterpret_cast<LPVOID*>(&trustedClock_isInitialized_org));
-	///CreateHookNamed("OriginClient", "?loadLoginPage@LoginViewController@Client@Origin@@IAEX_N@Z", loginViewController_loadLoginPage_hook, reinterpret_cast<LPVOID*>(&loginViewController_loadLoginPage_org));
-
-	// 
-	//CreateHookNamed("Qt5WebEngineCore", "?setCookie@QWebEngineCookieStore@@QAEXABVQNetworkCookie@@ABVQUrl@@@Z", QWebEngineCookieStore_setCookie_hook, reinterpret_cast<LPVOID*>(&QWebEngineCookieStore_setCookie_org));
 }

src/main/pch.hpp

@@ -10,10 +10,13 @@
 #include <string>
 #include <vector>
 #include <iterator>
+#include <ranges>
 #include <regex>
 #include <filesystem>
 namespace fs = std::filesystem;
 
+using std::operator""sv;
+
 #include <MinHook.h>
 
 #include <silver-bun/memaddr.h>