mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-03-12 14:46:49 +01:00
some nowx fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1431 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
41eabbf3d6
commit
7f00e271e5
@ -122,7 +122,7 @@ public:
|
|||||||
|
|
||||||
// Prepare the out buffer(s) with zeroes as a safety precaution
|
// Prepare the out buffer(s) with zeroes as a safety precaution
|
||||||
// to avoid returning bad values
|
// to avoid returning bad values
|
||||||
for(int i = 0; i < Buffer.NumberPayloadBuffer; i++)
|
for(u32 i = 0; i < Buffer.NumberPayloadBuffer; i++)
|
||||||
{
|
{
|
||||||
Memory::Memset(Buffer.PayloadBuffer[i].m_Address, 0,
|
Memory::Memset(Buffer.PayloadBuffer[i].m_Address, 0,
|
||||||
Buffer.PayloadBuffer[i].m_Size);
|
Buffer.PayloadBuffer[i].m_Size);
|
||||||
|
@ -82,7 +82,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
|
|||||||
|
|
||||||
// Prepare the out buffer(s) with zeroes as a safety precaution
|
// Prepare the out buffer(s) with zeroes as a safety precaution
|
||||||
// to avoid returning bad values
|
// to avoid returning bad values
|
||||||
for(int i = 0; i < CommandBuffer.NumberPayloadBuffer; i++)
|
for(u32 i = 0; i < CommandBuffer.NumberPayloadBuffer; i++)
|
||||||
{
|
{
|
||||||
Memory::Memset(CommandBuffer.PayloadBuffer[i].m_Address, 0,
|
Memory::Memset(CommandBuffer.PayloadBuffer[i].m_Address, 0,
|
||||||
CommandBuffer.PayloadBuffer[i].m_Size);
|
CommandBuffer.PayloadBuffer[i].m_Size);
|
||||||
|
@ -16,9 +16,10 @@
|
|||||||
// http://code.google.com/p/dolphin-emu/
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <wx/datetime.h> // for the timestamps
|
|
||||||
|
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
|
#include <wx/datetime.h> // for the timestamps
|
||||||
|
#endif
|
||||||
#include "StringUtil.h"
|
#include "StringUtil.h"
|
||||||
#include "LogManager.h"
|
#include "LogManager.h"
|
||||||
#include "PowerPC/PowerPC.h"
|
#include "PowerPC/PowerPC.h"
|
||||||
@ -229,8 +230,9 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
|
|||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
|
||||||
static u32 count = 0;
|
static u32 count = 0;
|
||||||
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
wxDateTime datetime = wxDateTime::UNow(); // get timestamp
|
wxDateTime datetime = wxDateTime::UNow(); // get timestamp
|
||||||
|
#endif
|
||||||
char* Msg2 = (char*)alloca(strlen(_fmt)+512);
|
char* Msg2 = (char*)alloca(strlen(_fmt)+512);
|
||||||
|
|
||||||
// Here's the old symbol request
|
// Here's the old symbol request
|
||||||
@ -267,7 +269,12 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
|
|||||||
sprintf(Msg2, "%i %02i:%02i:%03i: %x %s (%s, %08x) : %s%s",
|
sprintf(Msg2, "%i %02i:%02i:%03i: %x %s (%s, %08x) : %s%s",
|
||||||
//v,
|
//v,
|
||||||
++count,
|
++count,
|
||||||
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
datetime.GetMinute(), datetime.GetSecond(), datetime.GetMillisecond(),
|
datetime.GetMinute(), datetime.GetSecond(), datetime.GetMillisecond(),
|
||||||
|
#else
|
||||||
|
0, 0, 0,
|
||||||
|
// TODO get proper values
|
||||||
|
#endif
|
||||||
PowerPC::ppcState.DebugCount,
|
PowerPC::ppcState.DebugCount,
|
||||||
m_Log[_type]->m_szShortName_, // (CONSOLE etc)
|
m_Log[_type]->m_szShortName_, // (CONSOLE etc)
|
||||||
symbol.c_str(), PC, // current PC location (name, address)
|
symbol.c_str(), PC, // current PC location (name, address)
|
||||||
|
@ -26,8 +26,10 @@
|
|||||||
#include "SignatureDB.h"
|
#include "SignatureDB.h"
|
||||||
#include "PPCAnalyst.h"
|
#include "PPCAnalyst.h"
|
||||||
|
|
||||||
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
#include <wx/textdlg.h>
|
#include <wx/textdlg.h>
|
||||||
#include <wx/msgdlg.h>
|
#include <wx/msgdlg.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
SymbolDB g_symbolDB;
|
SymbolDB g_symbolDB;
|
||||||
|
|
||||||
@ -368,10 +370,12 @@ bool SymbolDB::SaveMap(const char *filename, bool WithCodes) const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// ---------------
|
// ---------------
|
||||||
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
// Show success message
|
// Show success message
|
||||||
wxMessageBox(wxString::Format(wxT("Saved %s"), mapFile.c_str()));
|
wxMessageBox(wxString::Format(wxT("Saved %s"), mapFile.c_str()));
|
||||||
|
#else
|
||||||
|
// Show message somewhere
|
||||||
|
#endif
|
||||||
// Close the file and return
|
// Close the file and return
|
||||||
fclose(f);
|
fclose(f);
|
||||||
return true;
|
return true;
|
||||||
|
@ -26,9 +26,9 @@
|
|||||||
#include "Volume.h"
|
#include "Volume.h"
|
||||||
#include "VolumeCreator.h"
|
#include "VolumeCreator.h"
|
||||||
#include "Config.h"
|
#include "Config.h"
|
||||||
#include "ConfigMain.h"
|
|
||||||
#include "Core.h"
|
#include "Core.h"
|
||||||
#if defined(HAVE_WX) && HAVE_WX
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
|
#include "ConfigMain.h"
|
||||||
#include "Frame.h"
|
#include "Frame.h"
|
||||||
#include "CodeWindow.h"
|
#include "CodeWindow.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,10 +1,13 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
//#include <curses.h>
|
//#include <curses.h>
|
||||||
#else
|
#else
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "Host.h"
|
#include "Host.h"
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user