assorted changes to get parts of the game to run under Wine

Author: argentum

code/client/citicore/FileMapping.Win32.cpp

@@ -95,7 +95,9 @@ NTSTATUS NTAPI LdrLoadDllStub(const wchar_t* fileName, uint32_t* flags, UNICODE_
 	UNICODE_STRING newString;
 	std::wstring moduleNameStr(moduleName->Buffer, moduleName->Length / sizeof(wchar_t));
 
-	if (moduleNameStr.find(L"socialclub.dll") != std::string::npos)
+	if (moduleNameStr.find(L"socialclub.dll") != std::string::npos ||
+		// check .exe files as well for Wine GetFileVersionInfo* calls
+		moduleNameStr.find(L".exe") != std::string::npos)
 	{
 		moduleNameStr = MapRedirectedFilename(moduleNameStr.c_str());
 

code/client/citicore/SEHTableHandler.Win32.cpp

@@ -133,6 +133,22 @@ static void* RtlpxLookupFunctionTableOverrideDownLevel(void* exceptionAddress, P
 
 #include <winternl.h>
 
+static PVOID(*g_origRtlImageDirectoryEntryToData)(HMODULE hModule, BOOL a2, WORD directory, ULONG* a4);
+
+static PVOID RtlImageDirectoryEntryToDataStub(HMODULE hModule, BOOL a2, WORD directory, ULONG* size)
+{
+	if ((DWORD64)hModule == g_overrideStart)
+	{
+		if (directory == IMAGE_DIRECTORY_ENTRY_EXCEPTION)
+		{
+			*size = g_overriddenTable.Size;
+			return (PVOID)g_overriddenTable.TableAddress;
+		}
+	}
+
+	return g_origRtlImageDirectoryEntryToData(hModule, a2, directory, size);
+}
+
 extern "C" void DLL_EXPORT CoreRT_SetupSEHHandler(void* moduleBase, void* moduleEnd, PRUNTIME_FUNCTION runtimeFunctions, DWORD entryCount)
 {
 	// store passed data
@@ -162,42 +178,54 @@ extern "C" void DLL_EXPORT CoreRT_SetupSEHHandler(void* moduleBase, void* module
 
 	// find the location to hook (RtlpxLookupFunctionTable from RtlLookupFunctionTable)
 	void* baseAddress = GetProcAddress(GetModuleHandle(L"ntdll.dll"), "RtlLookupFunctionTable");
-	void* internalAddress = FindCallFromAddress(baseAddress);
 
-	void* patchFunction = RtlpxLookupFunctionTableOverride;
-	void** patchOriginal = (void**)&g_originalLookup;
-
-	// if we couldn't _reliably_ find it, error out
-	if (!internalAddress)
+	if (baseAddress)
 	{
-		// Windows 8 uses a Rtl*-style call for Rtlpx
-		if (!IsWindows8Point1OrGreater())
-		{
-			internalAddress = FindCallFromAddress(baseAddress, UD_Ijmp);
+		void* internalAddress = FindCallFromAddress(baseAddress);
 
-			patchFunction = RtlpxLookupFunctionTableOverrideDownLevel;
-			patchOriginal = (void**)&g_originalLookupDownLevel;
-		}
+		void* patchFunction = RtlpxLookupFunctionTableOverride;
+		void** patchOriginal = (void**)&g_originalLookup;
 
+		// if we couldn't _reliably_ find it, error out
 		if (!internalAddress)
 		{
-			// and 2k3 to 7 don't even _have_ Rtlpx - so we directly hook the Rtl* function
-			if (IsWindows8OrGreater())
+			// Windows 8 uses a Rtl*-style call for Rtlpx
+			if (!IsWindows8Point1OrGreater())
 			{
-				FatalError("Could not find RtlpxLookupFunctionTable - hooking RtlLookupFunctionTable directly. This will break on a Win8+ system since RtlpxLookupFunctionTable is supposed to exist!\n");
+				internalAddress = FindCallFromAddress(baseAddress, UD_Ijmp);
+
+				patchFunction = RtlpxLookupFunctionTableOverrideDownLevel;
+				patchOriginal = (void**)&g_originalLookupDownLevel;
 			}
 
-			internalAddress = baseAddress;
+			if (!internalAddress)
+			{
+				// and 2k3 to 7 don't even _have_ Rtlpx - so we directly hook the Rtl* function
+				if (IsWindows8OrGreater())
+				{
+					FatalError("Could not find RtlpxLookupFunctionTable - hooking RtlLookupFunctionTable directly. This will break on a Win8+ system since RtlpxLookupFunctionTable is supposed to exist!\n");
+				}
+
+				internalAddress = baseAddress;
 
-			patchFunction = RtlpxLookupFunctionTableOverrideDownLevel;
-			patchOriginal = (void**)&g_originalLookupDownLevel;
+				patchFunction = RtlpxLookupFunctionTableOverrideDownLevel;
+				patchOriginal = (void**)&g_originalLookupDownLevel;
+			}
 		}
+
+		// patch it
+		DisableToolHelpScope scope;
+		MH_CreateHook(internalAddress, patchFunction, patchOriginal);
+		MH_EnableHook(MH_ALL_HOOKS);
 	}
+	else
+	{
+		trace("Not running on Windows - no RtlLookupFunctionTable. Is this some fake OS?\n");
 
-	// patch it
-	DisableToolHelpScope scope;
-	MH_CreateHook(internalAddress, patchFunction, patchOriginal);
-	MH_EnableHook(MH_ALL_HOOKS);
+		DisableToolHelpScope scope;
+		MH_CreateHookApi(L"ntdll.dll", "RtlImageDirectoryEntryToData", RtlImageDirectoryEntryToDataStub, (void**)&g_origRtlImageDirectoryEntryToData);
+		MH_EnableHook(MH_ALL_HOOKS);
+	}
 }
 #else
 void DLL_EXPORT CoreRT_SetupSEHHandler(...)

code/client/launcher/ExecutableLoader.cpp

@@ -172,30 +172,33 @@ void ExecutableLoader::LoadExceptionTable(IMAGE_NT_HEADERS* ntHeader)
 		PLIST_ENTRY(NTAPI *rtlGetFunctionTableListHead)(VOID);
 		rtlGetFunctionTableListHead = (decltype(rtlGetFunctionTableListHead))GetProcAddress(GetModuleHandle(L"ntdll.dll"), "RtlGetFunctionTableListHead");
 
-		auto tableListHead = rtlGetFunctionTableListHead();
-		auto tableListEntry = tableListHead->Flink;
-
-		while (tableListEntry != tableListHead)
+		if (rtlGetFunctionTableListHead)
 		{
-			auto functionTable = CONTAINING_RECORD(tableListEntry, DYNAMIC_FUNCTION_TABLE, Links);
-			
-			if (functionTable->BaseAddress == (ULONG_PTR)m_module)
+			auto tableListHead = rtlGetFunctionTableListHead();
+			auto tableListEntry = tableListHead->Flink;
+
+			while (tableListEntry != tableListHead)
 			{
-				trace("Replacing function table list entry %p with %p\n", (void*)functionTable->FunctionTable, (void*)functionList);
+				auto functionTable = CONTAINING_RECORD(tableListEntry, DYNAMIC_FUNCTION_TABLE, Links);
 
-				if (functionTable->FunctionTable != functionList)
+				if (functionTable->BaseAddress == (ULONG_PTR)m_module)
 				{
-					DWORD oldProtect;
-					VirtualProtect(functionTable, sizeof(DYNAMIC_FUNCTION_TABLE), PAGE_READWRITE, &oldProtect);
+					trace("Replacing function table list entry %p with %p\n", (void*)functionTable->FunctionTable, (void*)functionList);
+
+					if (functionTable->FunctionTable != functionList)
+					{
+						DWORD oldProtect;
+						VirtualProtect(functionTable, sizeof(DYNAMIC_FUNCTION_TABLE), PAGE_READWRITE, &oldProtect);
 
-					functionTable->EntryCount = entryCount;
-					functionTable->FunctionTable = functionList;
+						functionTable->EntryCount = entryCount;
+						functionTable->FunctionTable = functionList;
 
-					VirtualProtect(functionTable, sizeof(DYNAMIC_FUNCTION_TABLE), oldProtect, &oldProtect);
+						VirtualProtect(functionTable, sizeof(DYNAMIC_FUNCTION_TABLE), oldProtect, &oldProtect);
+					}
 				}
-			}
 
-			tableListEntry = functionTable->Links.Flink;
+				tableListEntry = functionTable->Links.Flink;
+			}
 		}
 	}
 

code/components/citizen-scripting-lua/src/LuaScriptRuntime.cpp

@@ -296,7 +296,7 @@ static int Lua_SetTickRoutine(lua_State* L)
 	int ref = luaL_ref(L, LUA_REGISTRYINDEX);
 
 	// set the tick callback in the current routine
-	auto& luaRuntime = LuaScriptRuntime::GetCurrent();
+	auto luaRuntime = LuaScriptRuntime::GetCurrent().GetRef();
 
 	luaRuntime->SetTickRoutine([=] ()
 	{
@@ -340,7 +340,7 @@ static int Lua_SetEventRoutine(lua_State* L)
 	int ref = luaL_ref(L, LUA_REGISTRYINDEX);
 
 	// set the event callback in the current routine
-	auto& luaRuntime = LuaScriptRuntime::GetCurrent();
+	auto luaRuntime = LuaScriptRuntime::GetCurrent().GetRef();
 
 	luaRuntime->SetEventRoutine([=] (const char* eventName, const char* eventPayload, size_t payloadSize, const char* eventSource)
 	{
@@ -387,7 +387,7 @@ static int Lua_SetCallRefRoutine(lua_State* L)
 	int ref = luaL_ref(L, LUA_REGISTRYINDEX);
 
 	// set the event callback in the current routine
-	auto& luaRuntime = LuaScriptRuntime::GetCurrent();
+	auto luaRuntime = LuaScriptRuntime::GetCurrent().GetRef();
 
 	luaRuntime->SetCallRefRoutine([=] (int32_t refId, const char* argsSerialized, size_t argsSize, char** retval, size_t* retvalLength)
 	{
@@ -443,7 +443,7 @@ static int Lua_SetDeleteRefRoutine(lua_State* L)
 	int ref = luaL_ref(L, LUA_REGISTRYINDEX);
 
 	// set the event callback in the current routine
-	auto& luaRuntime = LuaScriptRuntime::GetCurrent();
+	auto luaRuntime = LuaScriptRuntime::GetCurrent().GetRef();
 
 	luaRuntime->SetDeleteRefRoutine([=] (int32_t refId)
 	{
@@ -483,7 +483,7 @@ static int Lua_SetDuplicateRefRoutine(lua_State* L)
 	int ref = luaL_ref(L, LUA_REGISTRYINDEX);
 
 	// set the event callback in the current routine
-	auto& luaRuntime = LuaScriptRuntime::GetCurrent();
+	auto luaRuntime = LuaScriptRuntime::GetCurrent().GetRef();
 
 	luaRuntime->SetDuplicateRefRoutine([=] (int32_t refId)
 	{

code/components/gta-streaming-five/component.json

@@ -7,7 +7,8 @@
 		"vendor:minhook",
 		"gta:core",
 		"vfs:core",
-		"rage:formats"
+		"rage:formats",
+		"vendor:tbb"
 	],
 	"provides": []
 }

code/components/gta-streaming-five/src/CfxCollection.cpp

@@ -24,7 +24,7 @@
 #define DEBUG_WAS_SET
 #endif
 
-#include <concurrent_unordered_map.h>
+#include <tbb/concurrent_unordered_map.h>
 #include <unordered_set>
 
 #ifdef DEBUG_WAS_SET
@@ -208,9 +208,9 @@ class CfxCollection : public rage::fiCollection
 
 	rage::fiCollection* m_parentCollection;
 
-	concurrency::concurrent_unordered_map<uint16_t, CollectionEntry> m_entries;
+	tbb::concurrent_unordered_map<uint16_t, CollectionEntry> m_entries;
 
-	concurrency::concurrent_unordered_map<std::string, uint16_t> m_reverseEntries;
+	tbb::concurrent_unordered_map<std::string, uint16_t> m_reverseEntries;
 
 	HandleEntry m_handles[512];
 
@@ -403,7 +403,12 @@ class CfxCollection : public rage::fiCollection
 
 		m_reverseEntries[name] = idx;
 
-		return m_entries.insert({ idx, newEntry }).first;
+		m_entries[idx] = newEntry;
+
+		auto it = m_entries.find(idx);
+		assert(it != m_entries.end());
+
+		return it;
 	}
 
 	auto AddEntry(uint16_t idx, const FileEntry* entry)
@@ -413,7 +418,12 @@ class CfxCollection : public rage::fiCollection
 		newEntry.valid = true;
 		memcpy(&newEntry.baseEntry, entry, sizeof(FileEntry));
 
-		return m_entries.insert({ idx, newEntry }).first;
+		m_entries[idx] = newEntry;
+
+		auto it = m_entries.find(idx);
+		assert(it != m_entries.end());
+
+		return it;
 	}
 
 	CollectionEntry* GetCfxEntry(uint16_t index)
@@ -449,7 +459,7 @@ class CfxCollection : public rage::fiCollection
 
 		if (it == m_entries.end() || !it->second.valid)
 		{
-			m_entries.unsafe_erase(index);
+			//m_entries.unsafe_erase(index);
 
 			char entryName[256] = { 0x1E };
 			PseudoCallContext(this)->GetEntryNameToBuffer(index, entryName, sizeof(entryName));
@@ -477,7 +487,8 @@ class CfxCollection : public rage::fiCollection
 				{
 					auto n = std::get<std::string>(rit->second);
 					m_resourceFlags[n] = std::get<rage::ResourceFlags>(rit->second);
-					m_reverseEntries.unsafe_erase(entryName);
+					//m_reverseEntries.unsafe_erase(entryName);
+					m_reverseEntries[entryName] = -1;
 
 					// ignore streaming entries insert was here
 
@@ -631,7 +642,7 @@ class CfxCollection : public rage::fiCollection
 	{
 		auto it = m_reverseEntries.find(name);
 
-		if (it == m_reverseEntries.end())
+		if (it == m_reverseEntries.end() || it->second == -1)
 		{
 			uint16_t index = PseudoCallContext(this)->GetEntryByName(name);
 
@@ -1078,7 +1089,7 @@ class CfxCollection : public rage::fiCollection
 			const char* colon = strchr(archive, ':');
 
 			// temporary: make citizen/ path manually
-			std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
+			static std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
 			basePath << converter.to_bytes(MakeRelativeCitPath(L"/"));
 
 			basePath << std::string(archive, colon);
@@ -1090,7 +1101,7 @@ class CfxCollection : public rage::fiCollection
 			const char* colon = strchr(archive, ':');
 
 			// temporary: make citizen/ path manually
-			std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
+			static std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
 			basePath << converter.to_bytes(MakeRelativeCitPath(L"citizen/"));
 
 			basePath << std::string(archive, colon);

code/components/ros-patches-five/include/ros/LoopbackTcpServer.h

@@ -126,6 +126,8 @@ class LoopbackTcpServerManager : public fwRefCountable
 
 	bool GetAddrInfoEx(const char* name, const wchar_t* serviceName, const ADDRINFOEXW* hints, ADDRINFOEXW** addrInfo, int* outValue);
 
+	bool GetAddrInfoA(const char* name, const char* serviceName, const addrinfo* hints, addrinfo** addrInfo, int* outValue);
+
 	bool Connect(SOCKET s, const sockaddr* name, int namelen, int* outValue);
 
 	bool Recv(SOCKET s, char* buf, int len, int flags, int* outValue);
@@ -159,4 +161,4 @@ class LoopbackTcpServerManager : public fwRefCountable
 	}
 };
 
-DECLARE_INSTANCE_TYPE(LoopbackTcpServerManager);
+DECLARE_INSTANCE_TYPE(LoopbackTcpServerManager);

code/components/ros-patches-five/src/LegitimacyChecking.cpp

@@ -751,6 +751,8 @@ bool VerifyRetailOwnership()
     return false;
 }
 
+#include <coreconsole.h>
+
 bool LegitimateCopy()
 {
     return LoadOwnershipTicket() || (VerifySteamOwnership() && SaveOwnershipTicket(g_entitlementSource)) || (VerifyRetailOwnership() && SaveOwnershipTicket(g_entitlementSource));
@@ -773,3 +775,13 @@ namespace ros
 		return g_entitlementSource;
 	}
 }
+
+static InitFunction initFunction([]()
+{
+	static ConVar<std::string> tokenVar("cl_ownershipTicket", ConVar_None, "");
+
+	if (!tokenVar.GetValue().empty())
+	{
+		SaveOwnershipTicket(tokenVar.GetValue());
+	}
+});

code/components/ros-patches-five/src/SCUIStub.cpp

@@ -212,6 +212,8 @@ class LoginHandler2 : public net::HttpHandler
         {
             if (r.error)
             {
+				trace("ROS error: %s\n", r.error.message);
+
                 cb("Error contacting Rockstar Online Services.", "");
             }
             else
@@ -296,6 +298,9 @@ class LoginHandler2 : public net::HttpHandler
         {
             if (r.error || r.status_code != 200)
             {
+				trace("ROS error: %s\n", r.error.message);
+				trace("ROS error text: %s\n", r.text);
+
                 cb("Error contacting Rockstar Online Services.", "");
             }
             else