Add PhDelayExecutionEx, Move PhDelayExecution

Author: dmex

phlib/basesup.c

@@ -430,28 +430,6 @@ VOID PhLocalTimeToSystemTime(
     SystemTime->QuadPart = LocalTime->QuadPart + timeZoneBias.QuadPart;
 }
 
-NTSTATUS PhDelayExecution(
-    _In_ LONGLONG Interval
-    )
-{
-    if (Interval == INFINITE) // HACK (dmex)
-    {
-        LARGE_INTEGER interval;
-
-        interval.QuadPart = LLONG_MIN;
-
-        return NtDelayExecution(FALSE, &interval);
-    }
-    else
-    {
-        LARGE_INTEGER interval;
-
-        interval.QuadPart = -(LONGLONG)UInt32x32To64(Interval, PH_TIMEOUT_MS);
-
-        return NtDelayExecution(FALSE, &interval);
-    }
-}
-
 /**
  * Allocates a block of memory.
  *

phlib/include/phbasesup.h

@@ -89,13 +89,6 @@ PhLocalTimeToSystemTime(
     _Out_ PLARGE_INTEGER SystemTime
     );
 
-PHLIBAPI
-NTSTATUS
-NTAPI
-PhDelayExecution(
-    _In_ LONGLONG Interval
-    );
-
 // Heap
 
 _May_raise_

phlib/include/phutil.h

@@ -1509,6 +1509,13 @@ PhFreeLibraryAsImageResource(
     _In_ PVOID BaseAddress
     );
 
+PHLIBAPI
+NTSTATUS
+NTAPI
+PhDelayExecution(
+    _In_ LONGLONG Interval
+    );
+
 #ifdef __cplusplus
 }
 #endif

phlib/util.c

@@ -7934,3 +7934,56 @@ NTSTATUS PhFreeLibraryAsImageResource(
 {
     return NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress);
 }
+
+NTSTATUS PhDelayExecutionEx(
+    _In_ BOOLEAN Alertable,
+    _In_opt_ PLARGE_INTEGER DelayInterval
+    )
+{
+    static PH_INITONCE initOnce = PH_INITONCE_INIT;
+    static NTSTATUS (NTAPI* RtlDelayExecution_I)(
+        _In_ BOOLEAN Alertable,
+        _In_opt_ PLARGE_INTEGER DelayInterval
+        ) = NULL;
+
+    if (PhBeginInitOnce(&initOnce))
+    {
+        PVOID ntdll;
+
+        if (ntdll = PhGetLoaderEntryDllBase(L"ntdll.dll"))
+        {
+            RtlDelayExecution_I = PhGetDllBaseProcedureAddress(ntdll, "RtlDelayExecution", 0);
+        }
+
+        PhEndInitOnce(&initOnce);
+    }
+
+    if (RtlDelayExecution_I)
+    {
+        return RtlDelayExecution_I(Alertable, DelayInterval);
+    }
+
+    return NtDelayExecution(Alertable, DelayInterval);
+}
+
+NTSTATUS PhDelayExecution(
+    _In_ LONGLONG Interval
+    )
+{
+    if (Interval == INFINITE) // HACK (dmex)
+    {
+        LARGE_INTEGER interval;
+
+        interval.QuadPart = LLONG_MIN;
+
+        return PhDelayExecutionEx(FALSE, &interval);
+    }
+    else
+    {
+        LARGE_INTEGER interval;
+
+        interval.QuadPart = -(LONGLONG)UInt32x32To64(Interval, PH_TIMEOUT_MS);
+
+        return PhDelayExecutionEx(FALSE, &interval);
+    }
+}