Merge changes from upstream.

Minecraft.Client/Common/DLC/DLCManager.cpp

@@ -10,6 +10,7 @@
 
 const WCHAR *DLCManager::wchTypeNamesA[]=
 {
+	L"XMLVERSION",
 	L"DISPLAYNAME",
 	L"THEMENAME",
 	L"FREE", 
@@ -387,41 +388,65 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 	// // unsigned long, p = number of parameters
 	// // p * DLC_FILE_PARAM describing each parameter for this file
 	// // ulFileSize bytes of data blob of the file added
-	unsigned int uiVersion=*(unsigned int *)pbData;
+	unsigned int uiVersion=readUInt32(pbData, false);
 	uiCurrentByte+=sizeof(int);
 
-	if(uiVersion < CURRENT_DLC_VERSION_NUM)
-	{
-		if(pbData!=nullptr) delete [] pbData;
-		app.DebugPrintf("DLC version of %d is too old to be read\n", uiVersion);
+	bool bSwapEndian = false;
+	unsigned int uiVersionSwapped = SwapInt32(uiVersion);
+	if (uiVersion >= 0 && uiVersion <= CURRENT_DLC_VERSION_NUM) {
+	    bSwapEndian = false;
+	} else if (uiVersionSwapped >= 0 && uiVersionSwapped <= CURRENT_DLC_VERSION_NUM) {
+	    bSwapEndian = true;
+	} else {
+	    if(pbData!=nullptr) delete [] pbData;
+		app.DebugPrintf("Unknown DLC version of %d\n", uiVersion);
 		return false;
 	}
 	pack->SetDataPointer(pbData);
-	unsigned int uiParameterCount=*(unsigned int *)&pbData[uiCurrentByte];
+	unsigned int uiParameterCount=readUInt32(&pbData[uiCurrentByte], bSwapEndian);
 	uiCurrentByte+=sizeof(int);
 	C4JStorage::DLC_FILE_PARAM *pParams = (C4JStorage::DLC_FILE_PARAM *)&pbData[uiCurrentByte];
+	bool bXMLVersion = false;
 	//DWORD dwwchCount=0;
 	for(unsigned int i=0;i<uiParameterCount;i++)
 	{
+		pParams->dwType = bSwapEndian ? SwapInt32(pParams->dwType) : pParams->dwType;
+		pParams->dwWchCount = bSwapEndian ? SwapInt32(pParams->dwWchCount) : pParams->dwWchCount;
+		char16_t* wchData = reinterpret_cast<char16_t*>(pParams->wchData);
+		if (bSwapEndian) {
+		    SwapUTF16Bytes(wchData, pParams->dwWchCount);
+		}
+
 		// Map DLC strings to application strings, then store the DLC index mapping to application index
 		wstring parameterName(static_cast<WCHAR *>(pParams->wchData));
 		EDLCParameterType type = getParameterType(parameterName);
 		if( type != e_DLCParamType_Invalid )
 		{
 			parameterMapping[pParams->dwType] = type;
+
+			if (type == e_DLCParamType_XMLVersion)
+			{
+				bXMLVersion = true;
+			}
 		}
 		uiCurrentByte+= sizeof(C4JStorage::DLC_FILE_PARAM)+(pParams->dwWchCount*sizeof(WCHAR));
 		pParams = (C4JStorage::DLC_FILE_PARAM *)&pbData[uiCurrentByte];
 	}
 	//ulCurrentByte+=ulParameterCount * sizeof(C4JStorage::DLC_FILE_PARAM);
 
-	unsigned int uiFileCount=*(unsigned int *)&pbData[uiCurrentByte];
+	if (bXMLVersion)
+	{
+		uiCurrentByte += sizeof(int);
+	}
+
+	unsigned int uiFileCount=readUInt32(&pbData[uiCurrentByte], bSwapEndian);
 	uiCurrentByte+=sizeof(int);
 	C4JStorage::DLC_FILE_DETAILS *pFile = (C4JStorage::DLC_FILE_DETAILS *)&pbData[uiCurrentByte];
 
 	DWORD dwTemp=uiCurrentByte;
 	for(unsigned int i=0;i<uiFileCount;i++)
 	{
+		pFile->dwWchCount = bSwapEndian ? SwapInt32(pFile->dwWchCount) : pFile->dwWchCount;
 		dwTemp+=sizeof(C4JStorage::DLC_FILE_DETAILS)+pFile->dwWchCount*sizeof(WCHAR);
 		pFile = (C4JStorage::DLC_FILE_DETAILS *)&pbData[dwTemp];
 	}
@@ -430,6 +455,13 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 
 	for(unsigned int i=0;i<uiFileCount;i++)
 	{
+		pFile->dwType = bSwapEndian ? SwapInt32(pFile->dwType) : pFile->dwType;
+		pFile->uiFileSize = bSwapEndian ? SwapInt32(pFile->uiFileSize) : pFile->uiFileSize;
+		char16_t* wchFile = reinterpret_cast<char16_t*>(pFile->wchFile);
+		if (bSwapEndian) {
+		    SwapUTF16Bytes(wchFile, pFile->dwWchCount);
+		}
+
 		EDLCType type = static_cast<EDLCType>(pFile->dwType);
 
 		DLCFile *dlcFile = nullptr;
@@ -445,12 +477,18 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 		}
 
 		// Params
-		uiParameterCount=*(unsigned int *)pbTemp;
+		uiParameterCount=readUInt32(pbTemp, bSwapEndian);
 		pbTemp+=sizeof(int);
 		pParams = (C4JStorage::DLC_FILE_PARAM *)pbTemp;
 		for(unsigned int j=0;j<uiParameterCount;j++)
 		{
 			//DLCManager::EDLCParameterType paramType = DLCManager::e_DLCParamType_Invalid;
+			pParams->dwType = bSwapEndian ? SwapInt32(pParams->dwType) : pParams->dwType;
+			pParams->dwWchCount = bSwapEndian ? SwapInt32(pParams->dwWchCount) : pParams->dwWchCount;
+			char16_t* wchData = reinterpret_cast<char16_t*>(pParams->wchData);
+			if (bSwapEndian) {
+			    SwapUTF16Bytes(wchData, pParams->dwWchCount);
+			}
 
 			auto it = parameterMapping.find(pParams->dwType);
 

Minecraft.Client/Common/DLC/DLCManager.h

@@ -31,7 +31,8 @@ public:
 	{
 		e_DLCParamType_Invalid = -1,
 
-		e_DLCParamType_DisplayName = 0,
+		e_DLCParamType_XMLVersion = 0,
+		e_DLCParamType_DisplayName,
 		e_DLCParamType_ThemeName,
 		e_DLCParamType_Free, // identify free skins
 		e_DLCParamType_Credit, // legal credits for DLC
@@ -94,6 +95,30 @@ public:
 	bool readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DLCPack *pack, bool fromArchive = false);
 	DWORD retrievePackIDFromDLCDataFile(const string &path, DLCPack *pack);
 
+	static unsigned short SwapInt16(unsigned short value) {
+		return (value >> 8) | (value << 8);
+	}
+	
+	static unsigned int SwapInt32(unsigned int value) {
+		return ((value & 0xFF) << 24) |
+			((value & 0xFF00) << 8) |
+			((value & 0xFF0000) >> 8) |
+			((value & 0xFF000000) >> 24);
+	}
+	
+	static void SwapUTF16Bytes(char16_t* buffer, size_t count) {
+		for (size_t i = 0; i < count; ++i) {
+			char16_t& c = buffer[i];
+			c = (c >> 8) | (c << 8);
+		}
+	}
+	
+	static unsigned int readUInt32(unsigned char* ptr, bool endian) {
+	    unsigned int val = *(unsigned int*)ptr;
+	    if (endian) val = SwapInt32(val);
+	    return val;
+	}
+
 private:
 	bool processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD dwLength, DLCPack *pack);
 

Minecraft.Client/Common/Network/GameNetworkManager.h

@@ -47,7 +47,8 @@ public:
 	{
 		JOINGAME_SUCCESS,
 		JOINGAME_FAIL_GENERAL,
-		JOINGAME_FAIL_SERVER_FULL
+		JOINGAME_FAIL_SERVER_FULL,
+		JOINGAME_PENDING
 	} eJoinGameResult;
 
 	void			Initialise();

Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp

@@ -173,6 +173,11 @@ bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkMa
 	m_bSearchPending = false;
 
 	m_bIsOfflineGame = false;
+#ifdef _WINDOWS64
+	m_bJoinPending = false;
+	m_joinLocalUsersMask = 0;
+	m_joinHostName[0] = 0;
+#endif
 	m_pSearchParam = nullptr;
 	m_SessionsUpdatedCallback = nullptr;
 
@@ -282,6 +287,38 @@ void CPlatformNetworkManagerStub::DoWork()
 			m_bLeaveGameOnTick = false;
 		}
 	}
+
+	if (m_bJoinPending)
+	{
+		WinsockNetLayer::eJoinState state = WinsockNetLayer::GetJoinState();
+		if (state == WinsockNetLayer::eJoinState_Success)
+		{
+			WinsockNetLayer::FinalizeJoin();
+
+			BYTE localSmallId = WinsockNetLayer::GetLocalSmallId();
+
+			IQNet::m_player[localSmallId].m_smallId = localSmallId;
+			IQNet::m_player[localSmallId].m_isRemote = false;
+			IQNet::m_player[localSmallId].m_isHostPlayer = false;
+			IQNet::m_player[localSmallId].m_resolvedXuid = Win64Xuid::ResolvePersistentXuid();
+
+			Minecraft* pMinecraft = Minecraft::GetInstance();
+			wcscpy_s(IQNet::m_player[localSmallId].m_gamertag, 32, pMinecraft->user->name.c_str());
+			IQNet::s_playerCount = localSmallId + 1;
+
+			NotifyPlayerJoined(&IQNet::m_player[0]);
+			NotifyPlayerJoined(&IQNet::m_player[localSmallId]);
+
+			m_pGameNetworkManager->StateChange_AnyToStarting();
+			m_bJoinPending = false;
+		}
+		else if (state == WinsockNetLayer::eJoinState_Failed ||
+				 state == WinsockNetLayer::eJoinState_Rejected ||
+				 state == WinsockNetLayer::eJoinState_Cancelled)
+		{
+			m_bJoinPending = false;
+		}
+	}
 #endif
 }
 
@@ -511,36 +548,22 @@ int CPlatformNetworkManagerStub::JoinGame(FriendSessionInfo* searchResult, int l
 	IQNet::m_player[0].m_smallId = 0;
 	IQNet::m_player[0].m_isRemote = true;
 	IQNet::m_player[0].m_isHostPlayer = true;
-	// Remote host still maps to legacy host XUID in mixed old/new sessions.
 	IQNet::m_player[0].m_resolvedXuid = Win64Xuid::GetLegacyEmbeddedHostXuid();
 	wcsncpy_s(IQNet::m_player[0].m_gamertag, 32, searchResult->data.hostName, _TRUNCATE);
 
 	WinsockNetLayer::StopDiscovery();
 
-	if (!WinsockNetLayer::JoinGame(hostIP, hostPort))
+	wcsncpy_s(m_joinHostName, 32, searchResult->data.hostName, _TRUNCATE);
+	m_joinLocalUsersMask = localUsersMask;
+
+	if (!WinsockNetLayer::BeginJoinGame(hostIP, hostPort))
 	{
 		app.DebugPrintf("Win64 LAN: Failed to connect to %s:%d\n", hostIP, hostPort);
 		return CGameNetworkManager::JOINGAME_FAIL_GENERAL;
 	}
 
-	BYTE localSmallId = WinsockNetLayer::GetLocalSmallId();
-
-	IQNet::m_player[localSmallId].m_smallId = localSmallId;
-	IQNet::m_player[localSmallId].m_isRemote = false;
-	IQNet::m_player[localSmallId].m_isHostPlayer = false;
-	// Local non-host identity is the persistent uid.dat XUID.
-	IQNet::m_player[localSmallId].m_resolvedXuid = Win64Xuid::ResolvePersistentXuid();
-
-	Minecraft* pMinecraft = Minecraft::GetInstance();
-	wcscpy_s(IQNet::m_player[localSmallId].m_gamertag, 32, pMinecraft->user->name.c_str());
-	IQNet::s_playerCount = localSmallId + 1;
-
-	NotifyPlayerJoined(&IQNet::m_player[0]);
-	NotifyPlayerJoined(&IQNet::m_player[localSmallId]);
-
-	m_pGameNetworkManager->StateChange_AnyToStarting();
-
-	return CGameNetworkManager::JOINGAME_SUCCESS;
+	m_bJoinPending = true;
+	return CGameNetworkManager::JOINGAME_PENDING;
 #else
 	return CGameNetworkManager::JOINGAME_SUCCESS;
 #endif

Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h

@@ -77,6 +77,12 @@ private:
 	bool			m_bIsPrivateGame;
 	int				m_flagIndexSize;
 
+#ifdef _WINDOWS64
+	bool			m_bJoinPending;
+	int				m_joinLocalUsersMask;
+	wchar_t			m_joinHostName[32];
+#endif
+
 	// This is only maintained by the host, and is not valid on client machines
 	GameSessionData m_hostGameSessionData;
 	CGameNetworkManager *m_pGameNetworkManager;

Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp

@@ -1,7 +1,17 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_ConnectingProgress.h"
-#include "../../Minecraft.h"
+#include "..\..\Minecraft.h"
+#ifdef _WINDOWS64
+#include "..\..\Windows64\Network\WinsockNetLayer.h"
+#include "..\..\..\Minecraft.World\DisconnectPacket.h"
+
+static int ConnectingProgress_OnRejectedDialogOK(LPVOID, int iPad, const C4JStorage::EMessageResult)
+{
+	ui.NavigateBack(iPad);
+	return 0;
+}
+#endif
 
 UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
@@ -43,6 +53,12 @@ UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData
 	m_cancelFuncParam = param->cancelFuncParam;
 	m_removeLocalPlayer = false;
 	m_showingButton = false;
+
+#ifdef _WINDOWS64
+	WinsockNetLayer::eJoinState initState = WinsockNetLayer::GetJoinState();
+	m_asyncJoinActive = (initState != WinsockNetLayer::eJoinState_Idle && initState != WinsockNetLayer::eJoinState_Cancelled);
+	m_asyncJoinFailed = false;
+#endif
 }
 
 UIScene_ConnectingProgress::~UIScene_ConnectingProgress()
@@ -53,6 +69,18 @@ UIScene_ConnectingProgress::~UIScene_ConnectingProgress()
 
 void UIScene_ConnectingProgress::updateTooltips()
 {
+#ifdef _WINDOWS64
+	if (m_asyncJoinActive)
+	{
+		ui.SetTooltips( m_iPad, -1, IDS_TOOLTIPS_BACK);
+		return;
+	}
+	if (m_asyncJoinFailed)
+	{
+		ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT, -1);
+		return;
+	}
+#endif
 	// 4J-PB - removing the option of cancel join, since it didn't work anyway
 	//ui.SetTooltips( m_iPad, -1, m_showTooltips?IDS_TOOLTIPS_CANCEL_JOIN:-1);
 	ui.SetTooltips( m_iPad, -1, -1);
@@ -62,6 +90,85 @@ void UIScene_ConnectingProgress::tick()
 {
 	UIScene::tick();
 
+#ifdef _WINDOWS64
+	if (m_asyncJoinActive)
+	{
+		WinsockNetLayer::eJoinState state = WinsockNetLayer::GetJoinState();
+		if (state == WinsockNetLayer::eJoinState_Connecting)
+		{
+			// connecting.............
+			int attempt = WinsockNetLayer::GetJoinAttempt();
+			int maxAttempts = WinsockNetLayer::GetJoinMaxAttempts();
+			char buf[128];
+			if (attempt <= 1)
+				sprintf_s(buf, "Connecting...");
+			else
+				sprintf_s(buf, "Connecting failed, trying again (%d/%d)", attempt, maxAttempts);
+			wchar_t wbuf[128];
+			mbstowcs(wbuf, buf, 128);
+			m_labelTitle.setLabel(wstring(wbuf));
+		}
+		else if (state == WinsockNetLayer::eJoinState_Success)
+		{
+			m_asyncJoinActive = false;
+			// go go go
+		}
+		else if (state == WinsockNetLayer::eJoinState_Cancelled)
+		{
+			// cancel
+			m_asyncJoinActive = false;
+			navigateBack();
+		}
+		else if (state == WinsockNetLayer::eJoinState_Rejected)
+		{
+			// server full and banned are passed differently compared to other disconnects it seems
+			m_asyncJoinActive = false;
+			DisconnectPacket::eDisconnectReason reason = WinsockNetLayer::GetJoinRejectReason();
+			int exitReasonStringId;
+			switch (reason)
+			{
+			case DisconnectPacket::eDisconnect_ServerFull:
+				exitReasonStringId = IDS_DISCONNECTED_SERVER_FULL;
+				break;
+			case DisconnectPacket::eDisconnect_Banned:
+				exitReasonStringId = IDS_DISCONNECTED_KICKED;
+				break;
+			default:
+				exitReasonStringId = IDS_CONNECTION_LOST_SERVER;
+				break;
+			}
+			UINT uiIDA[1];
+			uiIDA[0] = IDS_CONFIRM_OK;
+			ui.RequestErrorMessage(IDS_CONNECTION_FAILED, exitReasonStringId, uiIDA, 1, ProfileManager.GetPrimaryPad(), ConnectingProgress_OnRejectedDialogOK, nullptr, nullptr);
+		}
+		else if (state == WinsockNetLayer::eJoinState_Failed)
+		{
+			// FAIL
+			m_asyncJoinActive = false;
+			m_asyncJoinFailed = true;
+
+			int maxAttempts = WinsockNetLayer::GetJoinMaxAttempts();
+			char buf[256];
+			sprintf_s(buf, "Failed to connect after %d attempts. The server may be unavailable.", maxAttempts);
+			wchar_t wbuf[256];
+			mbstowcs(wbuf, buf, 256);
+
+			// TIL that these exist
+			// not going to use a actual popup due to it requiring messing with strings which can really mess things up
+			// i dont trust myself with that
+			// these need to be touched up later as teh button is a bit offset
+			m_labelTitle.setLabel(L"Unable to connect to server");
+			m_progressBar.setLabel(wstring(wbuf));
+			m_progressBar.showBar(false);
+			m_progressBar.setVisible(true);
+			m_buttonConfirm.setVisible(true);
+			m_showingButton = true;
+			m_controlTimer.setVisible(false);
+		}
+		return;
+	}
+#endif
+
 	if( m_removeLocalPlayer )
 	{
 		m_removeLocalPlayer = false;
@@ -94,6 +201,8 @@ void UIScene_ConnectingProgress::handleGainFocus(bool navBack)
 
 void UIScene_ConnectingProgress::handleLoseFocus()
 {
+	if (!m_runFailTimer) return;
+
 	int millisecsLeft = getTimer(0)->targetTime - System::currentTimeMillis();
 	int millisecsTaken = getTimer(0)->duration - millisecsLeft;
 	app.DebugPrintf("\n");
@@ -208,6 +317,17 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
 		switch(key)
 		{
 // 4J-PB - Removed the option to cancel join - it didn't work anyway
+#ifdef _WINDOWS64
+		case ACTION_MENU_CANCEL:
+			if (pressed && m_asyncJoinActive)
+			{
+				m_asyncJoinActive = false;
+				WinsockNetLayer::CancelJoinGame();
+				navigateBack();
+				handled = true;
+			}
+			break;
+#endif
 // 		case ACTION_MENU_CANCEL:
 // 			{
 // 				if(m_cancelFunc != nullptr)
@@ -250,6 +370,13 @@ void UIScene_ConnectingProgress::handlePress(F64 controlId, F64 childId)
 	case eControl_Confirm:
 		if(m_showingButton)
 		{
+#ifdef _WINDOWS64
+			if (m_asyncJoinFailed)
+			{
+				navigateBack();
+			}
+			else
+#endif
 			if( m_iPad != ProfileManager.GetPrimaryPad() && g_NetworkManager.IsInSession() )
 			{
 				// The connection failed if we see the button, so the temp player should be removed and the viewports updated again

Minecraft.Client/Common/UI/UIScene_ConnectingProgress.h

@@ -13,6 +13,11 @@ private:
 	void (*m_cancelFunc)(LPVOID param);
 	LPVOID m_cancelFuncParam;
 
+#ifdef _WINDOWS64
+	bool m_asyncJoinActive;
+	bool m_asyncJoinFailed;
+#endif
+
 	enum EControls
 	{
 		eControl_Confirm

Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp

@@ -583,6 +583,24 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 		// Alert the app the we no longer want to be informed of ethernet connections
 		app.SetLiveLinkRequired( false );
 
+#ifdef _WINDOWS64
+		if (result == CGameNetworkManager::JOINGAME_PENDING)
+		{
+			pClass->m_bIgnoreInput = false;
+
+			ConnectionProgressParams *param = new ConnectionProgressParams();
+			param->iPad = ProfileManager.GetPrimaryPad();
+			param->stringId = -1;
+			param->showTooltips = true;
+			param->setFailTimer = false;
+			param->timerTime = 0;
+			param->cancelFunc = nullptr;
+			param->cancelFuncParam = nullptr;
+			ui.NavigateToScene(ProfileManager.GetPrimaryPad(), eUIScene_ConnectingProgress, param);
+			return;
+		}
+#endif
+
 		if( result != CGameNetworkManager::JOINGAME_SUCCESS )
 		{
 			int exitReasonStringId = -1;

Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp

@@ -557,8 +557,8 @@ int UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback(LPVOID lpParam,b
 		uint16_t pchText[128];
 		ZeroMemory(pchText, 128 * sizeof(uint16_t));
 		Win64_GetKeyboardText(pchText, 128);
-		pClass->m_editSeed.setLabel((wchar_t *)pchText);
-		pClass->m_params->seed = (wchar_t *)pchText;
+		pClass->m_editSeed.setLabel(reinterpret_cast<wchar_t*>(pchText));
+		pClass->m_params->seed = static_cast<wstring>(reinterpret_cast<wchar_t*>(pchText));
 #else
 #ifdef __PSVITA__
 		uint16_t pchText[2048];
@@ -584,7 +584,7 @@ void UIScene_LaunchMoreOptionsMenu::getDirectEditInputs(vector<UIControl_TextInp
 void UIScene_LaunchMoreOptionsMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
 {
 	if (result == UIControl_TextInput::eDirectEdit_Confirmed)
-		m_params->seed = input->getEditBuffer();
+		m_params->seed = static_cast<wstring>(input->getEditBuffer());
 }
 #endif