Merge branch 'master' into wii-network

# By Ryan Houdek (185) and others
# Via degasus (12) and others
* master: (625 commits)
  Revert "Don't open/close file for every file operation." as it was crashing PokePark in Windows builds.
  Array overrun fixed in VertexShaderCache for the DX11 plugin.
  Fixed DSPTool build.
  Windows build fix
  Go back to assuming every HID device is a wiimote on Windows. Fixed issue 6117. Unfixed issue 6031.
  VideoSoftware: Improve fog range adjustment by using less magic and more comments.
  revert RasterFont for VideoSoftware
  ogl: fix virtual xfb
  Windows build fix from web interface...
  Adjusted the audio loop criteria, using >= on the Wii and == on GC.  This fixes the audio static that occurred in Wii games after hours of play.
  Forced the exception check only for ARAM DMA transfers. Removed the Eternal Darkness boot hack and replaced it with an exception check.
  VideoSoftware: Implement fog range adjustment, fixing issue 6147.
  implement 4xSSAA for OGL
  move ogl-only settings into backend
  Fix description of disable fog, and move it to enhancements tab.
  Reverted rd76ca5783743 as it was made obsolete by r1d550f4496e4.
  Removed the tracking of the FIFO Writes as it was made obsolete by r1d550f4496e4.
  Forced the external exception check to occur sooner by changing the downcount.
  Mark the Direct3D9 backend deprecated.
  Prefer D3D11 and OpenGL over D3D9 by default.
  ...

Conflicts:
	CMakeLists.txt
	Source/Core/Common/Common.vcxproj.filters
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/Core.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

1 files changed, 2 insertions, 174 deletions

diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp
index 6451c73670..d38c7e9ea4 100644
--- a/Source/Core/DiscIO/Src/BannerLoader.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoader.cpp
@@ -22,180 +22,8 @@
 #include "VolumeCreator.h"
 #include "FileUtil.h"
 
-// HyperIris: dunno if this suitable, may be need move.
-#ifdef _WIN32
-#include <Windows.h>
-#else
-#include <sys/param.h>
-#include <iconv.h>
-#include <errno.h>
-#endif
-
-#ifndef ICONV_CONST
-#if defined __FreeBSD__ || __NetBSD__
-#define ICONV_CONST const
-#else
-#define ICONV_CONST
-#endif
-#endif
-
 namespace DiscIO
 {
-void IBannerLoader::CopyToStringAndCheck(std::string& _rDestination, const char* _src)
-{
-	static bool bValidChars[256];
-	static bool bInitialized = false;
-
-	if (!bInitialized)
-	{
-		for (int i = 0; i < 0x20; i++)
-		{
-			bValidChars[i] = false;
-		}
-
-		// generate valid chars
-		for (int i = 0x20; i < 256; i++)
-		{
-			bValidChars[i] = true;
-		}
-
-		bValidChars[0x0a] = true;
-		//bValidChars[0xa9] = true;
-		//bValidChars[0xe9] = true;
-
-		bInitialized = true;
-	}
-
-	char destBuffer[2048] = {0};
-	char* dest = destBuffer;
-	const char* src = _src;
-
-	// copy the string and check for "unknown" characters
-	while (*src != 0x00)
-	{
-		u8 c = *src;
-
-		if (c == 0x0a){c = 0x20;}
-
-		if (bValidChars[c] == false)
-		{
-			src++;
-			continue;
-		}
-
-		*dest = c;
-		dest++;
-		src++;
-	}
-
-	// finalize the string
-	*dest = 0x00;
-
-	_rDestination = destBuffer;
-}
-
-bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16* _src, int length )
-{
-	bool returnCode = false;
-#ifdef WIN32
-	if (_src)
-	{
-		u16* buffer = new u16[length];
-		if (buffer)
-		{
-			memcpy(buffer, _src, sizeof(u16)*length);
-			for (int i = 0; i < length; i++)
-			{
-				buffer[i] = swap16(buffer[i]);
-			}
-			
-			u32 ansiNameSize = WideCharToMultiByte(932, 0, 
-				(LPCWSTR)buffer, (int)wcslen((LPCWSTR)buffer),
-				NULL, NULL, NULL, NULL);
-			if (ansiNameSize > 0)
-			{
-				char* pAnsiStrBuffer = new char[ansiNameSize + 1];
-				if (pAnsiStrBuffer)
-				{
-					memset(pAnsiStrBuffer, 0, (ansiNameSize + 1) * sizeof(char));
-					if (WideCharToMultiByte(932, 0, 
-						(LPCWSTR)buffer, (int)wcslen((LPCWSTR)buffer),
-						pAnsiStrBuffer, ansiNameSize, NULL, NULL))
-					{
-						_rDestination = pAnsiStrBuffer;
-						returnCode = true;
-					}
-					delete[] pAnsiStrBuffer;
-				}
-			}	
-			delete[] buffer;
-		}
-	}
-#else
-	if (_src)
-	{
-		iconv_t conv_desc = iconv_open("UTF-8", "CP932");
-		if (conv_desc == (iconv_t) -1)
-		{
-			// Initialization failure.
-			if (errno == EINVAL)
-			{
-				ERROR_LOG(DISCIO, "Conversion from CP932 to UTF-8 is not supported.");
-			}
-			else
-			{
-				ERROR_LOG(DISCIO, "Iconv initialization failure: %s\n", strerror (errno));
-			}
-			return false;
-		}
-
-		char* src_buffer = new char[length];
-		for (int i = 0; i < length; i++)
-			src_buffer[i] = swap16(_src[i]);
-
-		size_t inbytes = sizeof(char) * length;
-		size_t outbytes = 2 * inbytes;
-		char* utf8_buffer = new char[outbytes + 1];
-		memset(utf8_buffer, 0, (outbytes + 1) * sizeof(char));
-
-		// Save the buffer locations because iconv increments them
-		char* utf8_buffer_start = utf8_buffer;
-		char* src_buffer_start = src_buffer;
-
-		size_t iconv_size = iconv(conv_desc,
-			(ICONV_CONST char**)&src_buffer, &inbytes,
-			&utf8_buffer, &outbytes);
-
-		// Handle failures
-		if (iconv_size == (size_t) -1)
-		{
-			ERROR_LOG(DISCIO, "iconv failed.");
-			switch (errno) {
-				case EILSEQ:
-					ERROR_LOG(DISCIO, "Invalid multibyte sequence.");
-					break;
-				case EINVAL:
-					ERROR_LOG(DISCIO, "Incomplete multibyte sequence.");
-					break;
-				case E2BIG:
-					ERROR_LOG(DISCIO, "Insufficient space allocated for output buffer.");
-					break;
-				default:
-					ERROR_LOG(DISCIO, "Error: %s.", strerror(errno));
-			}
-		}
-		else
-		{
-			_rDestination = utf8_buffer_start;
-			returnCode = true;
-		}
-		delete[] utf8_buffer_start;
-		delete[] src_buffer_start;
-		iconv_close(conv_desc);
-	}
-#endif
-	return returnCode;
-}
 
 IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume)
 {
@@ -203,9 +31,9 @@ IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVo
 	{
 		return new CBannerLoaderWii(pVolume);
 	}
-	if (_rFileSystem.IsValid()) 
+	if (_rFileSystem.IsValid())
 	{
-		return new CBannerLoaderGC(_rFileSystem);
+		return new CBannerLoaderGC(_rFileSystem, pVolume);
 	}
 
 	return NULL;