winport - fix loading games named things like "Yokémorp". It was probably only open through drag and drop.

Probably broke japanese. If I did, write a bug so I can fix japanese and break latin characters again.

desmume/src/frontend/windows/FEX_Interface.cpp

@@ -20,6 +20,8 @@
 #include "FEX_Interface.h"
 #include "File_Extractor/fex/fex.h"
 
+#include "utils/xstring.h"
+
 #include <windows.h>
 #include <string>
 #include <vector>
@@ -117,24 +119,16 @@ ArchiveFile::ArchiveFile(const char* filename)
 	archiveType = NULL;
 	m_numItems = 0;
 	m_items = NULL;
-	m_filename = NULL;
 
-	FILE* file = fopen(filename, "rb");
+	//assuming filename is utf-8 because what the fuck else can we assume about it? geeze
+	auto fn = mbstowcs((std::string)filename);
+	FILE* file = _wfopen(fn.c_str(), L"rb");
 	if(!file)
 		return;
 
 	//TODO - maybe windows only check here if we ever drop fex into portable code. unfortunately this is probably too unwieldy to ever happen
 
-	//convert the filename to unicode
-	wchar_t temp_wchar[MAX_PATH*2];
-	char filename_utf8[MAX_PATH*4];
-	MultiByteToWideChar(CP_THREAD_ACP,0,filename,-1,temp_wchar,ARRAY_SIZE(temp_wchar));
-	//now convert it back to utf-8. is there a way to do this in one step?
-	WideCharToMultiByte(CP_UTF8,0,temp_wchar,-1,filename_utf8,ARRAY_SIZE(filename_utf8), NULL, NULL);
-
-
-	m_filename = new char[strlen(filename_utf8)+1];
-	strcpy(m_filename, filename_utf8);
+	m_filenameUtf8 = filename;
 
 	fex_err_t err = fex_identify_file(&archiveType, filename);
 
@@ -158,12 +152,12 @@ ArchiveFile::ArchiveFile(const char* filename)
 		m_items[0].name = new char[strlen(filename)+1];
 		strcpy(m_items[0].name, filename);
 
-		m_items[0].wname = _wcsdup(temp_wchar);
+		m_items[0].wname = fn;
 	}
 	else
 	{
 		fex_t * object;
-		fex_err_t err = fex_open_type( &object, m_filename, archiveType );
+		fex_err_t err = fex_open_type( &object, m_filenameUtf8.c_str(), archiveType );
 		if ( !err )
 		{
 			int numItems = 0;
@@ -227,10 +221,8 @@ ArchiveFile::~ArchiveFile()
 	for(int i = 0; i < m_numItems; i++)
 	{
 		delete[] m_items[i].name;
-		free(m_items[i].wname);
 	}
 	delete[] m_items;
-	delete[] m_filename;
 }
 
 const char* ArchiveFile::GetArchiveTypeName()
@@ -266,7 +258,7 @@ const wchar_t* ArchiveFile::GetItemNameW(int item)
 {
 	//assert(item >= 0 && item < m_numItems);
 	if(!(item >= 0 && item < m_numItems)) return L"";
-	return m_items[item].wname;
+	return m_items[item].wname.c_str();
 }
 
 
@@ -289,14 +281,15 @@ int ArchiveFile::ExtractItem(int index, unsigned char* outBuffer, int bufSize) c
 	if(archiveType == NULL)
 	{
 		// uncompressed
-		FILE* file = fopen(m_filename, "rb");
+		auto fn = mbstowcs(m_filenameUtf8);
+		FILE* file = _wfopen(fn.c_str(), L"rb");
 		fread(outBuffer, 1, item.size, file);
 		fclose(file);
 	}
 	else
 	{
 		fex_t * object;
-		fex_err_t err = fex_open_type( &object, m_filename, archiveType );
+		fex_err_t err = fex_open_type( &object, m_filenameUtf8.c_str(), archiveType );
 		if ( !err )
 		{
 			if ( index != 0 ) err = fex_seek_arc( object, item.offset );
@@ -336,13 +329,13 @@ int ArchiveFile::ExtractItem(int index, const char* outFilename) const
 	if(archiveType == NULL)
 	{
 		// uncompressed
-		if(!CopyFile(m_filename, outFilename, false))
+		if(!CopyFile(m_filenameUtf8.c_str(), outFilename, false))
 			rv = 0;
 	}
 	else
 	{
 		fex_t * object;
-		fex_err_t err = fex_open_type( &object, m_filename, archiveType );
+		fex_err_t err = fex_open_type( &object, m_filenameUtf8.c_str(), archiveType );
 		if ( !err )
 		{
 			if ( index != 0 ) err = fex_seek_arc( object, item.offset );

desmume/src/frontend/windows/FEX_Interface.h

@@ -18,6 +18,8 @@
 #ifndef _FEX_DEC_HEADER
 #define _FEX_DEC_HEADER
 
+#include <string>
+
 #include "types.h"
 
 // File_Extractor interface
@@ -53,13 +55,13 @@ protected:
 	{
 		int size;
 		char* name;
-		wchar_t* wname;
+		std::wstring wname;
 		s64 offset;
 	};
 	ArchiveItem* m_items;
 	int m_numItems;
 	fex_type_t archiveType;
-	char* m_filename;
+	std::string m_filenameUtf8;
 };
 
 #endif

desmume/src/frontend/windows/main.cpp

@@ -3548,6 +3548,15 @@ void SaveWindowPos(HWND hwnd)
 	WritePrivateProfileInt("Video", "WindowPosY", WndY/*MainWindowRect.top*/, IniName);
 }
 
+static BOOL OpenCoreSystemCP(const char* filename_syscp)
+{
+	wchar_t wgarbage[1024];
+	char garbage[1024];
+	MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, filename_syscp, -1, wgarbage, 1024);
+	int q = WideCharToMultiByte(CP_UTF8, 0, wgarbage, -1, garbage, 1024, NULL, NULL);
+	return OpenCore(garbage);
+}
+
 //========================================================================================
 LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 { 
@@ -4307,7 +4316,7 @@ DOKEYDOWN:
 			//Else load it as a ROM
 			//-------------------------------------------------------
 
-			else if(OpenCore(filename))
+			else if(OpenCoreSystemCP(filename))
 			{
 				romloaded = TRUE;
 			}