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

Removed patches on CreateWaitableTimer and SetWaitableTimer 

as NtCreateTimer and NtSetTimerEx are all that's needed for them.
This commit is contained in:
PatrickvL 2017-01-01 01:11:12 +01:00
parent 80eded53de
commit fa257e6be7
3 changed files with 0 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/CxbxKrnl/EmuXapi.cpp
View File

@ -1285,61 +1285,6 @@ DWORD WINAPI XTL::EmuXMountMUA
RETURN(E_FAIL);
}
// ******************************************************************
// func: EmuCreateWaitableTimer
// ******************************************************************
HANDLE WINAPI XTL::EmuCreateWaitableTimerA
(
LPVOID lpTimerAttributes, // SD
BOOL bManualReset, // reset type
LPCSTR lpTimerName // object name
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(lpTimerAttributes)
LOG_FUNC_ARG(bManualReset)
LOG_FUNC_ARG(lpTimerName)
LOG_FUNC_END;
// For Xbox titles, this param should always be NULL.
if(lpTimerAttributes)
EmuWarning("lpTimerAttributes != NULL");
HANDLE hRet = CreateWaitableTimerA( NULL, bManualReset, lpTimerName );
RETURN(hRet);
}
// ******************************************************************
// func: EmuSetWaitableTimer
// ******************************************************************
BOOL WINAPI XTL::EmuSetWaitableTimer
(
HANDLE hTimer, // handle to timer
const LARGE_INTEGER *pDueTime, // timer due time
LONG lPeriod, // timer interval
PTIMERAPCROUTINE pfnCompletionRoutine, // completion routine
LPVOID lpArgToCompletionRoutine, // completion routine parameter
BOOL fResume // resume state
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(hTimer)
LOG_FUNC_ARG(pDueTime)
LOG_FUNC_ARG(lPeriod)
LOG_FUNC_ARG(pfnCompletionRoutine)
LOG_FUNC_ARG(lpArgToCompletionRoutine)
LOG_FUNC_ARG(fResume)
LOG_FUNC_END;
BOOL Ret = SetWaitableTimer( hTimer, pDueTime, lPeriod, pfnCompletionRoutine,
lpArgToCompletionRoutine, fResume );
if(!Ret)
EmuWarning("SetWaitableTimer failed!");
RETURN(Ret);
}
// ******************************************************************
// * func: EmuXMountAlternateTitle
// ******************************************************************

23
src/CxbxKrnl/EmuXapi.h
View File

@ -791,29 +791,6 @@ DWORD WINAPI EmuXMountMURootA
PCHAR pchDrive
);
// ******************************************************************
// * func: EmuCreateWaitableTimerA
// ******************************************************************
HANDLE WINAPI EmuCreateWaitableTimerA
(
LPVOID lpTimerAttributes, // SD
BOOL bManualReset, // reset type
LPCSTR lpTimerName // object name
);
// ******************************************************************
// * func: EmuSetWaitableTimer
// ******************************************************************
BOOL WINAPI EmuSetWaitableTimer
(
HANDLE hTimer, // handle to timer
const LARGE_INTEGER *pDueTime, // timer due time
LONG lPeriod, // timer interval
PTIMERAPCROUTINE pfnCompletionRoutine, // completion routine
LPVOID lpArgToCompletionRoutine, // completion routine parameter
BOOL fResume // resume state
);
// ******************************************************************
// * func: EmuXMountAlternateTitle
// ******************************************************************

32
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl
View File

@ -423,34 +423,6 @@ OOVPA_NO_XREF(XMountMUA_1_0_4361, 8)
{ 0xFE, 0x09 },
OOVPA_END;
// ******************************************************************
// * CreateWaitableTimerA
// ******************************************************************
OOVPA_NO_XREF(CreateWaitableTimerA_1_0_4361, 7)
{ 0x0A, 0x74 },
{ 0x16, 0x50 },
{ 0x22, 0x39 },
{ 0x2E, 0xFF },
{ 0x3A, 0x00 },
{ 0x46, 0x6A },
{ 0x52, 0x50 },
OOVPA_END;
// ******************************************************************
// * SetWaitableTimer
// ******************************************************************
OOVPA_NO_XREF(SetWaitableTimer_1_0_4361, 7)
{ 0x07, 0x10 },
{ 0x10, 0xFF },
{ 0x19, 0xFF },
{ 0x22, 0x0A },
{ 0x2B, 0xEB },
{ 0x34, 0x6A },
{ 0x3F, 0x33 },
OOVPA_END;
// ******************************************************************
// * XAPI_1_0_4361
// ******************************************************************
@ -506,10 +478,6 @@ OOVPATable XAPI_1_0_4361[] = {
OOVPA_TABLE_PATCH(GetFileAttributesA_1_0_4134, XTL::EmuGetFileAttributesA),
// XMountMUA
OOVPA_TABLE_PATCH(XMountMUA_1_0_4361, XTL::EmuXMountMUA),
// CreateWaitableTimerA
OOVPA_TABLE_PATCH(CreateWaitableTimerA_1_0_4361, XTL::EmuCreateWaitableTimerA),
// SetWaitableTimer
OOVPA_TABLE_PATCH(SetWaitableTimer_1_0_4361, XTL::EmuSetWaitableTimer),
};
// ******************************************************************