From 8d9250fa70af00b5f40a58b0729588616bef94fa Mon Sep 17 00:00:00 2001 From: Subv Date: Tue, 9 Jan 2018 11:53:50 -0500 Subject: SVC: Fixed WaitSynchronization with multiple handles when at least one of them is ready. --- src/core/hle/kernel/svc_wrap.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/core/hle/kernel/svc_wrap.h') diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h index bffa2f7f8..16c834cf3 100644 --- a/src/core/hle/kernel/svc_wrap.h +++ b/src/core/hle/kernel/svc_wrap.h @@ -80,9 +80,12 @@ void SvcWrap() { FuncReturn(func(PARAM(0), PARAM(1), PARAM(2)).raw); } -template +template void SvcWrap() { - FuncReturn(func(PARAM(1), PARAM(2), (s64)PARAM(3)).raw); + u32 param_1 = 0; + ResultCode retval = func(¶m_1, PARAM(1), (u32)(PARAM(2) & 0xFFFFFFFF), (s64)PARAM(3)); + Core::CPU().SetReg(1, param_1); + FuncReturn(retval.raw); } template -- cgit v1.2.3