Merge remote-tracking branch 'origin/main' into networking

Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp

@@ -198,7 +198,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 	else
 	{
 
-#if defined(__PS3__) || defined(__ORBIS__)|| defined(_DURANGO) || defined (__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__)|| defined(_DURANGO) || defined (__PSVITA__) || defined(_WINDOWS64)
 		// convert to utf16
 		uint16_t u16Message[MAX_SAVEFILENAME_LENGTH];
 		size_t srclen,dstlen;
@@ -209,7 +209,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 #elif defined(_DURANGO) 
 		// Already utf16 on durango
 		memcpy(u16Message,params->saveDetails->UTF16SaveFilename, MAX_SAVEFILENAME_LENGTH);
-#else // __ORBIS__
+#elif defined(__ORBIS__) // __ORBIS__
 		{
 			SceCesUcsContext Context;
 			sceCesUcsContextInit( &Context );
@@ -218,6 +218,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 		}
 #endif
 		m_thumbnailName = (wchar_t *)u16Message;
+#ifndef _WINDOWS64
 		if(params->saveDetails->pbThumbnailData)
 		{
 			m_pbThumbnailData = params->saveDetails->pbThumbnailData;
@@ -225,6 +226,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 			m_bSaveThumbnailReady = true;
 		}
 		else
+#endif
 		{
 			app.DebugPrintf("Requesting the save thumbnail\n");
 			// set the save to load
@@ -1444,6 +1446,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 // 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),NULL,0,false);
 			}
 #endif
+#ifndef _WINDOWS64
 			else
 			{
 #if defined(_WINDOWS64) || defined(DISABLE_PSN) || defined(_DISABLE_XBLIVE)
@@ -1453,6 +1456,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 				pClass->m_bRequestQuadrantSignin = true;
 #endif
 			}
+#endif
 		}
 	}
 	else