Win32: Switch to a UNICODE build. This took quite a bit of fixing.

This commit is contained in:
Henrik Rydgard committed 2013-08-26 19:00:16 +02:00
1 parent fdaff2af98
commit 55aa3d13c7
63 files changed
+572 -517

No files matched your search

+10 -8
View File
@@ -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);
@@ -164,12 +167,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);