Merge branch 'networking' from pieeebot/cafeberry

Merge the upstream pieeebot/cafeberry networking branch into the local
networking branch, incorporating the rebased mainline work (PS3/PSVita
networking, large-worlds defines, media rebuilds, workflow CI, renamed
WinsockNetLayer->NetworkSocketLayer / PlatformNetworkManagerStub->
PlatformNetworkManager refactors).

Conflict resolutions:
- NetworkSocketLayer.cpp / PlatformNetworkManager.{h,cpp}: took the
  remote's evolved implementations (connect retries, non-blocking
  connect, smallId assignment, GAME_PLAY state handling in DoWork).
- PS3-postbuild.ps1: kept the remote's approach of disabling the
  broken PSVita tutorial pack copy (softlocks game).
- Minecraft.Client.vcxproj: took the remote's restructured project.

The X360 offline-LAN pre-login grant (ClientConnection.cpp) is retained.

Minecraft.Client/Common/Consoles_App.cpp

@@ -127,7 +127,7 @@ CMinecraftApp::CMinecraftApp()
 	m_bChangingSessionType = false;
 	m_bReallyChangingSessionType = false;
 
-#ifdef _DEBUG
+#ifdef _DEBUG_MENUS_ENABLED
 
 #ifdef _CONTENT_PACKAGE
 	m_bDebugOptions=false; // make them off by default in a content package build
@@ -2386,7 +2386,7 @@ void CMinecraftApp::ClearGameSettingsChangedFlag(int iPad)
 // Remove the debug settings in the content package build
 //
 ////////////////////////////
-#ifdef _DEBUG
+#ifdef _DEBUG_MENUS_ENABLED
 unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
 {
 	return 0;
@@ -4419,7 +4419,7 @@ int CMinecraftApp::EthernetDisconnectReturned(void *pParam,int iPad,const C4JSto
 		//  4J-PB - turn off the PSN store icon just in case this happened when we were in one of the DLC menus
 #ifdef __ORBIS__
 		sceNpCommerceHidePsStoreIcon();
-#elif defined __PSVITA__
+#elif defined(__PSVITA__) && !defined(DISABLE_PSN)
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		app.SetAction(iPad,eAppAction_EthernetDisconnectedReturned_Menus);
@@ -6773,7 +6773,7 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
 #endif
 }
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
 unordered_map<PlayerUID, MOJANG_DATA *, PlayerUID::Hash> CMinecraftApp::MojangData;
 unordered_map<int, char * >  CMinecraftApp::DLCTextures_PackID;
 unordered_map<string, DLC_INFO * >  CMinecraftApp::DLCInfo;
@@ -6784,7 +6784,7 @@ unordered_map<int, wstring >  CMinecraftApp::DLCTextures_PackID; // for mash-up
 //unordered_map<ULONGLONG,DLC_INFO * > CMinecraftApp::DLCInfo_Trial; // full offerid, dlc_info
 unordered_map<wstring,DLC_INFO * > CMinecraftApp::DLCInfo_Full; // full offerid, dlc_info
 unordered_map<wstring, wstring >  CMinecraftApp::DLCInfo_SkinName; // skin name, full offer id
-#elif defined(DISABLE_PSN) && defined(__PS3__)
+#elif defined(DISABLE_PSN)
 unordered_map<PlayerUID, MOJANG_DATA *, PlayerUID::Hash> CMinecraftApp::MojangData;
 unordered_map<int, ULONGLONG >  CMinecraftApp::DLCTextures_PackID;
 unordered_map<ULONGLONG, DLC_INFO * >  CMinecraftApp::DLCInfo_Trial;
@@ -6889,12 +6889,20 @@ HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGe
 	// ignore the names if we don't recognize them
 	if(pBannerName!=L"")
 	{	
+#ifdef __PSVITA__
+		wcsncpy_s( pDLCData->wchBanner, MAX_BANNERNAME_SIZE, pBannerName, MAX_BANNERNAME_SIZE);
+#else
 		wcsncpy_s( pDLCData->wchBanner, pBannerName, MAX_BANNERNAME_SIZE);
+#endif
 	}
 
 	if(pDataFile[0]!=0)
 	{	
+#ifdef __PSVITA__
+		wcsncpy_s( pDLCData->wchDataFile, MAX_BANNERNAME_SIZE, pDataFile, MAX_BANNERNAME_SIZE);
+#else
 		wcsncpy_s( pDLCData->wchDataFile, pDataFile, MAX_BANNERNAME_SIZE);
+#endif
 	}
 #endif
 
@@ -7064,7 +7072,7 @@ HRESULT CMinecraftApp::RegisterDLCData(char *pchDLCName, unsigned int uiSortInde
 
 
 
-#if !defined(DISABLE_PSN) && defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
 bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal)
 {
 	AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin));
@@ -7332,7 +7340,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForProductName(WCHAR *pwchProductName)
 	return NULL;
 }
 
-#elif !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#elif !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
 #else
 
 DLC_INFO *CMinecraftApp::GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full)
@@ -9443,7 +9451,7 @@ byteArray CMinecraftApp::getArchiveFile(const wstring &filename)
 
 // DLC
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
 int CMinecraftApp::GetDLCInfoCount() 
 { 
 	return (int)DLCInfo.size();