From 9fcb1db34fccbe09de2850668ca6d793ba5b88f1 Mon Sep 17 00:00:00 2001
From: LPFaint99 <lpfaint99@gmail.com>
Date: Sun, 23 Aug 2009 21:20:08 +0000
Subject: [PATCH] unicode fixings, disable r3999 change, change filename for
 debug memcardmanager

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4041 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../Memcard Manager/Memcard Manager.vcproj    |  4 ++--
 .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp |  2 ++
 Source/Core/DolphinWX/Src/GameListCtrl.cpp    |  2 +-
 Source/Core/DolphinWX/Src/ISOProperties.cpp   | 24 +++++++++----------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Externals/Memcard Manager/Memcard Manager.vcproj b/Externals/Memcard Manager/Memcard Manager.vcproj
index 9ac003e286..c66a9eb806 100644
--- a/Externals/Memcard Manager/Memcard Manager.vcproj	
+++ b/Externals/Memcard Manager/Memcard Manager.vcproj	
@@ -322,7 +322,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib"
-				OutputFile="&quot;../../Binary/Win32/MemoryCardManager.exe&quot;"
+				OutputFile="&quot;../../Binary/Win32/MemoryCardManagerD.exe&quot;"
 				Version=""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -439,7 +439,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib rpcrt4.lib"
-				OutputFile="../../../Binary/x64/MemoryCardManager.exe"
+				OutputFile="../../../Binary/x64/MemoryCardManagerD.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
index 76e97e1cfe..0909a0bdba 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
@@ -423,8 +423,10 @@ void CEXIMemoryCard::TransferByte(u8 &byte)
 
 void CEXIMemoryCard::DoState(PointerWrap &p)
 {
+#if 0 // Makes savestates worse for 1st party games (SMS, ZWW) but better for third party games
 	int slot = 0;
 	if (GetFileName() == SConfig::GetInstance().m_strMemoryCardA)
 		slot = 1;
 	ExpansionInterface::ChangeDevice(slot, slot ? EXIDEVICE_MEMORYCARD_B : EXIDEVICE_MEMORYCARD_A, 0);
+#endif
 }
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index 3e674c0da8..4727842ecd 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -866,7 +866,7 @@ void CGameListCtrl::OnInstallWAD(wxCommandEvent& WXUNUSED (event))
 
 void CGameListCtrl::MultiCompressCB(const char* text, float percent, void* arg)
 {
-    wxString textString(wxString::Format(wxT("%s (%i/%i) - %s"), m_currentFilename.c_str(), (int)m_currentItem+1, (int)m_numberItem, text));
+	wxString textString(wxString::FromAscii(StringFromFormat("%s (%i/%i) - %s", m_currentFilename.c_str(), (int)m_currentItem+1, (int)m_numberItem, text).c_str()));
 
     percent = (((float)m_currentItem) + percent) / (float)m_numberItem;
     wxProgressDialog* pDialog = (wxProgressDialog*)arg;
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index 246905d742..11c86927e7 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -113,7 +113,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 		if (GameIni.Load(GameIniFile.c_str()))
 			LoadGameConfig();
 		else
-			wxMessageBox(wxString::Format(_("Could not create %s"), GameIniFile.c_str()), _("Error"), wxOK|wxICON_ERROR, this);
+			wxMessageBox(wxString::Format(_("Could not create %s"), wxString::FromAscii(GameIniFile.c_str()).c_str()), _("Error"), wxOK|wxICON_ERROR, this);
 	}
 
 	// Disk header and apploader
@@ -122,37 +122,37 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 	switch (OpenISO->GetCountry())
 	{
 	case DiscIO::IVolume::COUNTRY_EUROPE:
-		m_Country->SetValue(wxString::FromAscii("EUROPE"));
+		m_Country->SetValue(wxT("EUROPE"));
 		break;
 	case DiscIO::IVolume::COUNTRY_FRANCE:
-		m_Country->SetValue(wxString::FromAscii("FRANCE"));
+		m_Country->SetValue(wxT("FRANCE"));
 		break;
 	case DiscIO::IVolume::COUNTRY_ITALY:
-		m_Country->SetValue(wxString::FromAscii("ITALY"));
+		m_Country->SetValue(wxT("ITALY"));
 		break;
 	case DiscIO::IVolume::COUNTRY_USA:
-		m_Country->SetValue(wxString::FromAscii("USA"));
+		m_Country->SetValue(wxT("USA"));
 		break;
 	case DiscIO::IVolume::COUNTRY_JAPAN:
-		m_Country->SetValue(wxString::FromAscii("JAPAN"));
+		m_Country->SetValue(wxT("JAPAN"));
 		break;
 	case DiscIO::IVolume::COUNTRY_KOREA:
-		m_Country->SetValue(wxString::FromAscii("KOREA"));
+		m_Country->SetValue(wxT("KOREA"));
 		break;
 	case DiscIO::IVolume::COUNTRY_TAIWAN:
-		m_Country->SetValue(wxString::FromAscii("TAIWAN"));
+		m_Country->SetValue(wxT("TAIWAN"));
 		break;
 	case DiscIO::IVolume::COUNTRY_SDK:
-		m_Country->SetValue(wxString::FromAscii("No Country (SDK)"));
+		m_Country->SetValue(wxT("No Country (SDK)"));
 		break;
 	default:
-		m_Country->SetValue(wxString::FromAscii("UNKNOWN"));
+		m_Country->SetValue(wxT("UNKNOWN"));
 		break;
 	}
 	wxString temp;
 	temp = _T("0x") + wxString::FromAscii(OpenISO->GetMakerID().c_str());
 	m_MakerID->SetValue(temp);
-	m_Date->SetValue(wxString(OpenISO->GetApploaderDate().c_str(), wxConvUTF8));
+	m_Date->SetValue(wxString::FromAscii(OpenISO->GetApploaderDate().c_str()));
 	m_FST->SetValue(wxString::Format(_T("%u"), OpenISO->GetFSTSize()));
 
 	// Banner
@@ -526,7 +526,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event))
 {
 	if (!SaveGameConfig())
-		wxMessageBox(wxString::Format(_("Could not save %s"), GameIniFile.c_str()), _("Error"), wxOK|wxICON_ERROR, this);
+		wxMessageBox(wxString::Format(_("Could not save %s"), wxString::FromAscii(GameIniFile.c_str())), _("Error"), wxOK|wxICON_ERROR, this);
 
 	EndModal(bRefreshList ? wxID_OK : wxID_CANCEL);
 }