Merge branch 'master' of https://github.com/hrydgard/ppsspp into MemView

Conflicts:
	Windows/Debugger/CtrlMemView.cpp

Windows/Debugger/Debugger_MemoryDlg.cpp

@@ -4,13 +4,15 @@
 #include <windowsx.h>
 #include "..\resource.h"
 
-#include "../../Core/Debugger/SymbolMap.h"
-#include "Debugger_MemoryDlg.h"
+#include "util/text/utf8.h"
 
+#include "Core/Debugger/SymbolMap.h"
+#include "Core/MIPS/MIPSDebugInterface.h" //	BAD
+
+#include "Debugger_MemoryDlg.h"
 #include "CtrlMemView.h"
 #include "DebuggerShared.h"
 
-#include "../../Core/MIPS/MIPSDebugInterface.h" //	BAD
 
 RECT CMemoryDlg::slRect;
 
@@ -48,9 +50,10 @@ LRESULT CALLBACK AddressEditProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 CMemoryDlg::CMemoryDlg(HINSTANCE _hInstance, HWND _hParent, DebugInterface *_cpu) : Dialog((LPCSTR)IDD_MEMORY, _hInstance,_hParent)
 {
   cpu = _cpu;
-	TCHAR temp[256];
-	sprintf(temp,"Memory Viewer - %s",cpu->GetName());
+	wchar_t temp[256];
+	wsprintf(temp,L"Memory Viewer - %s",cpu->GetName());
 	SetWindowText(m_hDlg,temp);
+
 	ShowWindow(m_hDlg,SW_HIDE);
 	CtrlMemView *ptr = CtrlMemView::getFrom(GetDlgItem(m_hDlg,IDC_MEMVIEW));
   ptr->setDebugger(_cpu);
@@ -157,12 +160,11 @@ BOOL CMemoryDlg::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
 	case WM_DEB_GOTOADDRESSEDIT:
 	{
 		CtrlMemView *mv = CtrlMemView::getFrom(GetDlgItem(m_hDlg,IDC_MEMVIEW));
-		char temp[256];
+		wchar_t temp[256];
 		u32 addr;
 		GetWindowText(GetDlgItem(m_hDlg,IDC_ADDRESS),temp,255);
 
-		if (parseExpression(temp,cpu,addr) == false)
-		{
+		if (parseExpression(ConvertWStringToUTF8(temp).c_str(),cpu,addr) == false) {
 			displayExpressionError(m_hDlg);
 		} else {
 			mv->gotoAddr(addr);