X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fregtests%2Fshared%2Fregtests.c;h=3513911b60064cf88852bc3e378a4d0e7163375e;hp=b73ddc5834aabe76d96a2c124d0ffa25e89e1bca;hb=f0ac5c50825ea205077e71695753edffdd9e218f;hpb=c78d9b68e14b019e96e7355475443c29bee264fa

diff --git a/reactos/regtests/shared/regtests.c b/reactos/regtests/shared/regtests.c
index b73ddc5834a..3513911b600 100755
--- a/reactos/regtests/shared/regtests.c
+++ b/reactos/regtests/shared/regtests.c
@@ -6,8 +6,11 @@
  * UPDATE HISTORY:
  *      06-07-2003  CSH  Created
  */
+#define WIN32_NO_STATUS
 #include <windows.h>
-#include <pseh.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+#include <pseh/pseh.h>
 #include "regtests.h"
 
 #define NDEBUG
@@ -65,19 +68,13 @@ PerformTest(PVOID _arg)
   return 1;
 }
 
-BOOL
-IsContextChanged(LPCONTEXT context1, LPCONTEXT context2)
-{
-  return memcmp(context1, context2, sizeof(CONTEXT)) != 0;
-}
-
 VOID
 ControlNormalTest(HANDLE hThread,
             PERFORM_TEST_ARGS *Args,
             DWORD TimeOut)
 {
-  FILETIME time;
-  FILETIME executionTime;
+  _FILETIME time;
+  _FILETIME executionTime;
   DWORD status;
 
   status = _WaitForSingleObject(hThread, TimeOut);
@@ -94,55 +91,10 @@ ControlNormalTest(HANDLE hThread,
   Args->Time = executionTime.dwLowDateTime / 10000;
 }
 
-VOID
-ControlPerformanceTest(HANDLE hThread,
-            PERFORM_TEST_ARGS *Args,
-            DWORD TimeOut)
-{
-  DWORD status;
-  CONTEXT lastContext;
-  CONTEXT currentContext;
-
-  ZeroMemory(&lastContext, sizeof(CONTEXT));
-  lastContext.ContextFlags = CONTEXT_FULL;
-  ZeroMemory(&currentContext, sizeof(CONTEXT));
-  currentContext.ContextFlags = CONTEXT_FULL;
-
-  do {
-    _Sleep(1);
-
-    if (_SuspendThread(hThread) == -1)
-      break;
-
-    if (_GetThreadContext(hThread, &currentContext) == 0)
-      break;
-
-   if (IsContextChanged(&currentContext, &lastContext))
-     Args->Time++;
-
-    if (_ResumeThread(hThread) == -1)
-      break;
-
-    if (Args->Time >= TimeOut)
-      {
-        _TerminateThread(hThread, 0);
-        Args->Result = TS_TIMEDOUT;
-        break;
-      }
-
-    status = _WaitForSingleObject(hThread, 0);
-    if (status == WAIT_OBJECT_0 || status == WAIT_FAILED)
-      break;
-
-    lastContext = currentContext;
-  } while (TRUE);
-}
-
 VOID
 DisplayResult(PERFORM_TEST_ARGS* Args,
               LPSTR OutputBuffer)
 {
-  char Buffer[5000];
   char Format[100];
 
   if (Args->Result == TS_OK)
@@ -162,7 +114,7 @@ DisplayResult(PERFORM_TEST_ARGS* Args,
                                   Args->Time));
     }
   else
-      sprintf(OutputBuffer, "[%s] Failed (%s)\n", Args->TestName, Buffer);
+      sprintf(OutputBuffer, "[%s] Failed (%s)\n", Args->TestName, Args->Buffer);
 
   if (Args->OutputRoutine != NULL)
     (*Args->OutputRoutine)(OutputBuffer);
@@ -181,9 +133,6 @@ ControlTest(HANDLE hThread,
     case TT_NORMAL:
       ControlNormalTest(hThread, Args, TimeOut);
       break;
-    case TT_PERFORMANCE:
-      ControlPerformanceTest(hThread, Args, TimeOut);
-      break;
     default:
       printf("Unknown test type %ld\n", TestType);
       break;