ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a crash caused by SHA1 Context being interpreted as a string by the logging code & similar change to KeDelayExecutionThread 

Not sure if this is really the right thing to do, but the Dashboard runs again
This commit is contained in:
Luke Usher 2016-11-21 20:23:59 +00:00
parent af52e2db35
commit b08f2af659
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CxbxKrnl/EmuKrnlKe.cpp
View File

@ -101,9 +101,9 @@ XBSYSAPI EXPORTNUM(99) xboxkrnl::NTSTATUS NTAPI xboxkrnl::KeDelayExecutionThread
) )
{ {
LOG_FUNC_BEGIN LOG_FUNC_BEGIN
LOG_FUNC_ARG(WaitMode) LOG_FUNC_ARG_OUT(WaitMode)
LOG_FUNC_ARG(Alertable) LOG_FUNC_ARG(Alertable)
LOG_FUNC_ARG(Interval) LOG_FUNC_ARG_OUT(Interval)
LOG_FUNC_END; LOG_FUNC_END;
NTSTATUS ret = NtDll::NtDelayExecution(Alertable, (NtDll::LARGE_INTEGER*)Interval); NTSTATUS ret = NtDll::NtDelayExecution(Alertable, (NtDll::LARGE_INTEGER*)Interval);

10
src/CxbxKrnl/EmuKrnlXc.cpp
View File

@ -54,7 +54,7 @@ XBSYSAPI EXPORTNUM(335) VOID NTAPI xboxkrnl::XcSHAInit
UCHAR *pbSHAContext UCHAR *pbSHAContext
) )
{ {
LOG_FUNC_ONE_ARG(pbSHAContext); LOG_FUNC_ONE_ARG_OUT(pbSHAContext);
UNIMPLEMENTED(); UNIMPLEMENTED();
@ -72,8 +72,8 @@ XBSYSAPI EXPORTNUM(336) VOID NTAPI xboxkrnl::XcSHAUpdate
) )
{ {
LOG_FUNC_BEGIN LOG_FUNC_BEGIN
LOG_FUNC_ARG(pbSHAContext) LOG_FUNC_ARG_OUT(pbSHAContext)
LOG_FUNC_ARG(pbInput) LOG_FUNC_ARG_OUT(pbInput)
LOG_FUNC_ARG(dwInputLength) LOG_FUNC_ARG(dwInputLength)
LOG_FUNC_END; LOG_FUNC_END;
@ -92,8 +92,8 @@ XBSYSAPI EXPORTNUM(337) VOID NTAPI xboxkrnl::XcSHAFinal
) )
{ {
LOG_FUNC_BEGIN LOG_FUNC_BEGIN
LOG_FUNC_ARG(pbSHAContext) LOG_FUNC_ARG_OUT(pbSHAContext)
LOG_FUNC_ARG(pbDigest) LOG_FUNC_ARG_OUT(pbDigest)
LOG_FUNC_END; LOG_FUNC_END;
// for now, we dont care about the digest // for now, we dont care about the digest