diff --git a/src/CxbxKrnl/EmuXapi.cpp b/src/CxbxKrnl/EmuXapi.cpp index 6b4583b91..3ff9b16d5 100644 --- a/src/CxbxKrnl/EmuXapi.cpp +++ b/src/CxbxKrnl/EmuXapi.cpp @@ -118,39 +118,6 @@ DWORD WINAPI XTL::EmuGetTimeZoneInformation RETURN(dwRet); } -// ****************************************************************** -// * func: EmuQueryPerformanceCounter -// ****************************************************************** -BOOL WINAPI XTL::EmuQueryPerformanceCounter -( - PLARGE_INTEGER lpPerformanceCount -) -{ - LOG_FUNC_ONE_ARG(lpPerformanceCount); - - BOOL bRet = QueryPerformanceCounter(lpPerformanceCount); - - // debug - 4x speed - //lpPerformanceCount->QuadPart *= 4; - - RETURN(bRet); -} - -// ****************************************************************** -// * func: EmuQueryPerformanceFrequency -// ****************************************************************** -BOOL WINAPI XTL::EmuQueryPerformanceFrequency -( - PLARGE_INTEGER lpFrequency -) -{ - LOG_FUNC_ONE_ARG(lpFrequency); - - BOOL bRet = QueryPerformanceFrequency(lpFrequency); - - RETURN(bRet); -} - // ****************************************************************** // * func: EmuXMountUtilityDrive // ****************************************************************** diff --git a/src/CxbxKrnl/EmuXapi.h b/src/CxbxKrnl/EmuXapi.h index 6f1faf1be..99c9de0ef 100644 --- a/src/CxbxKrnl/EmuXapi.h +++ b/src/CxbxKrnl/EmuXapi.h @@ -392,22 +392,6 @@ SIZE_T WINAPI EmuRtlSizeHeap IN PVOID lpMem ); -// ****************************************************************** -// * func: EmuQueryPerformanceCounter -// ****************************************************************** -BOOL WINAPI EmuQueryPerformanceCounter -( - PLARGE_INTEGER lpPerformanceCount -); - -// ****************************************************************** -// * func: EmuQueryPerformanceCounter -// ****************************************************************** -BOOL WINAPI EmuQueryPerformanceFrequency -( - PLARGE_INTEGER lpFrequency -); - // ****************************************************************** // * func: EmuXMountUtilityDrive // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl index 571eb9e98..354b8015b 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl @@ -334,10 +334,6 @@ OOVPATable XAPI_1_0_4134[] = { OOVPA_TABLE_PATCH(XInputGetCapabilities_1_0_3911, XTL::EmuXInputGetCapabilities), // GetThreadPriority (* unchanged since 3911 *) OOVPA_TABLE_PATCH(GetThreadPriority_1_0_3911, XTL::EmuGetThreadPriority), - // QueryPerformanceCounter - OOVPA_TABLE_PATCH(QueryPerformanceCounter_1_0_4134, XTL::EmuQueryPerformanceCounter), - // QueryPerformanceFrequency - OOVPA_TABLE_PATCH(QueryPerformanceFrequency_1_0_4134, XTL::EmuQueryPerformanceFrequency), // XInputPoll OOVPA_TABLE_PATCH(XInputPoll_1_0_4134, XTL::EmuXInputPoll), // SetThreadPriorityBoost (* unchanged since 3911 *) diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl index a684fb818..18c6753d6 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl @@ -428,10 +428,6 @@ OOVPA_END; // ****************************************************************** OOVPATable XAPI_1_0_4361[] = { - // QueryPerformanceCounter - OOVPA_TABLE_PATCH(QueryPerformanceCounter_1_0_4361, XTL::EmuQueryPerformanceCounter), - // QueryPerformanceFrequency - OOVPA_TABLE_PATCH(QueryPerformanceFrequency_1_0_4361, XTL::EmuQueryPerformanceFrequency), // XInitDevices (* unchanged since 1.0.3911 *) OOVPA_TABLE_PATCH(XInitDevices_1_0_3911, XTL::EmuXInitDevices), // XGetDevices (* unchanged since 4134 *) diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl index 453d2e61b..73552c16e 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl @@ -748,10 +748,6 @@ OOVPATable XAPI_1_0_4627[] = { OOVPA_TABLE_PATCH(GetThreadPriority_1_0_4627, XTL::EmuGetThreadPriority), // XRegisterThreadNotifyRoutine (* unchanged since 3911 *) OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine), - // QueryPerformanceCounter (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(QueryPerformanceCounter_1_0_4361, XTL::EmuQueryPerformanceCounter), - // QueryPerformanceFrequency (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(QueryPerformanceFrequency_1_0_4361, XTL::EmuQueryPerformanceFrequency), // XMountUtilityDrive (* unchanged since 4432 *) OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive), // XInitDevices (* unchanged since 1.0.3911 *) diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl index 2829b7eb0..2a07692bb 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl @@ -121,10 +121,6 @@ OOVPATable XAPI_1_0_5233[] = { OOVPA_TABLE_PATCH(GetThreadPriority_1_0_4627, XTL::EmuGetThreadPriority), // XRegisterThreadNotifyRoutine (* unchanged since 3911 *) OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine), - // QueryPerformanceCounter (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(QueryPerformanceCounter_1_0_4361, XTL::EmuQueryPerformanceCounter), - // QueryPerformanceFrequency (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(QueryPerformanceFrequency_1_0_4361, XTL::EmuQueryPerformanceFrequency), // XMountUtilityDrive (* unchanged since 4432 *) OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive), // XInitDevices diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl index 9cc0429df..71f7e31aa 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl @@ -337,10 +337,6 @@ OOVPATable XAPI_1_0_5558[] = { OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority), // XRegisterThreadNotifyRoutine (* unchanged since 3911 *) OOVPA_TABLE_PATCH(XRegisterThreadNotifyRoutine_1_0_3911, XTL::EmuXRegisterThreadNotifyRoutine), - // QueryPerformanceCounter (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(QueryPerformanceCounter_1_0_4361, XTL::EmuQueryPerformanceCounter), - // QueryPerformanceFrequency (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(QueryPerformanceFrequency_1_0_4361, XTL::EmuQueryPerformanceFrequency), // XMountUtilityDrive (* unchanged since 4432 *) OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive), // XInitDevices (* unchanged since 5233 *) diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl index 512d1431f..5fc1e4433 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl @@ -149,10 +149,6 @@ OOVPATable XAPI_1_0_5849[] = { // SetThreadPriority (* unchanged since 3911 *) OOVPA_TABLE_PATCH(SetThreadPriority_1_0_3911, XTL::EmuSetThreadPriority), - // QueryPerformanceCounter (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(QueryPerformanceCounter_1_0_4361, XTL::EmuQueryPerformanceCounter), - // QueryPerformanceFrequency (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(QueryPerformanceFrequency_1_0_4361, XTL::EmuQueryPerformanceFrequency), // XMountUtilityDrive (* unchanged since 4432 *) OOVPA_TABLE_PATCH(XMountUtilityDrive_1_0_4432, XTL::EmuXMountUtilityDrive), // XInitDevices (* unchanged since 5233 *)