piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix wii iso name and comment loading for linux. You will have to delete your cache files to get your existing iso's information to be updated.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5857 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-07-08 17:46:32 +00:00
parent f1154f9146
commit 75871dab65
1 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
Source/Core/DiscIO/Src/BannerLoader.cpp
View File

@ -28,6 +28,11 @@
#include <Windows.h> #include <Windows.h>
#endif #endif
#ifdef __linux__
#include <iconv.h>
#include <errno.h>
#endif
namespace DiscIO namespace DiscIO
{ {
void IBannerLoader::CopyToStringAndCheck(std::string& _rDestination, const char* _src) void IBannerLoader::CopyToStringAndCheck(std::string& _rDestination, const char* _src)
@ -120,10 +125,68 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16
delete[] buffer; delete[] buffer;
} }
} }
#else #elif defined(__linux__)
// FIXME: Horribly broke on non win32 if (_src)
// _rDestination = _src; {
returnCode = false; 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, &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);
}
#elif defined(__APPLE__)
// TODO: Implement this (Maybe the linux code will work?)
#endif #endif
return returnCode; return returnCode;
} }