diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 0c480730e6..42b8aa7e6d 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -134,10 +134,10 @@ bool Init(const SCoreStartupParameter _CoreParameter) PanicAlert("Failed to load video plugin %s", g_CoreStartupParameter.m_strVideoPlugin.c_str()); return false; } - /*if (!PluginWiimote::LoadPlugin(g_CoreStartupParameter.m_strWiimotePlugin.c_str())) { + if (!PluginWiimote::LoadPlugin(g_CoreStartupParameter.m_strWiimotePlugin.c_str())) { PanicAlert("Failed to load Wiimote plugin %s", g_CoreStartupParameter.m_strWiimotePlugin.c_str()); return false; - }*/ + } #ifdef _WIN32 if (PluginDSP::DllDebugger) diff --git a/Source/Core/Core/Src/HLE/HLE_OS.cpp b/Source/Core/Core/Src/HLE/HLE_OS.cpp index 3c0dae799e..203b0d30d9 100644 --- a/Source/Core/Core/Src/HLE/HLE_OS.cpp +++ b/Source/Core/Core/Src/HLE/HLE_OS.cpp @@ -73,10 +73,14 @@ void HLE_printf() void GetStringVA(std::string& _rOutBuffer) { + _rOutBuffer = ""; char ArgumentBuffer[256]; u32 ParameterCounter = 4; char* pString = (char*)Memory::GetPointer(GPR(3)); - + if (!pString) { + //PanicAlert("Invalid GetStringVA call"); + return; + } while(*pString) { if (*pString == '%') diff --git a/Source/Core/Core/Src/PowerPC/SymbolDB.cpp b/Source/Core/Core/Src/PowerPC/SymbolDB.cpp index 9817d4ca94..e4ba9dc2f1 100644 --- a/Source/Core/Core/Src/PowerPC/SymbolDB.cpp +++ b/Source/Core/Core/Src/PowerPC/SymbolDB.cpp @@ -21,6 +21,7 @@ #include #include +#include "../HW/Memmap.h" #include "SymbolDB.h" #include "SignatureDB.h" #include "PPCAnalyst.h" @@ -104,6 +105,8 @@ void SymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const char *name, int typ Symbol *SymbolDB::GetSymbolFromAddr(u32 addr) { + if (!Memory::IsRAMAddress(addr)) + return 0; XFuncMap::iterator it = functions.find(addr); if (it != functions.end()) return &it->second; diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp b/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp index b5d41fbd72..b2b58f6140 100644 --- a/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp +++ b/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp @@ -110,7 +110,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle break; case DLL_PROCESS_DETACH: - CloseConsole(); wxEntryCleanup(); //use wxUninitialize() if you don't want GUI break; default: @@ -265,6 +264,7 @@ void SendReportCoreAccelIr12() { pReport->a.x = 0x81; pReport->a.y = 0x78; pReport->a.z = 0xD9; + pReport->ir[0].x = 320 & 0xFF; pReport->ir[0].y = 240; pReport->ir[0].size = 10;