Browse Source

Merge pull request #2648 from mtheall/master

Fix OutputDebugString syscall
pull/15/merge
bunnei 9 years ago
committed by GitHub
parent
commit
a377fea90f
  1. 4
      src/core/hle/function_wrappers.h
  2. 4
      src/core/hle/svc.cpp

4
src/core/hle/function_wrappers.h

@ -256,9 +256,9 @@ void Wrap() {
func(((s64)PARAM(1) << 32) | PARAM(0)); func(((s64)PARAM(1) << 32) | PARAM(0));
} }
template <void func(const char*)>
template <void func(const char*, int len)>
void Wrap() { void Wrap() {
func((char*)Memory::GetPointer(PARAM(0)));
func((char*)Memory::GetPointer(PARAM(0)), PARAM(1));
} }
template <void func(u8)> template <void func(u8)>

4
src/core/hle/svc.cpp

@ -467,8 +467,8 @@ static void Break(u8 break_reason) {
} }
/// Used to output a message on a debug hardware unit - does nothing on a retail unit /// Used to output a message on a debug hardware unit - does nothing on a retail unit
static void OutputDebugString(const char* string) {
LOG_DEBUG(Debug_Emulated, "%s", string);
static void OutputDebugString(const char* string, int len) {
LOG_DEBUG(Debug_Emulated, "%.*s", len, string);
} }
/// Get resource limit /// Get resource limit

Loading…
Cancel
Save