- Rename KiCheckForKernelApcDelivery

svn path=/trunk/; revision=18977

diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index 373c46c..3cccbea 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -58,7 +58,7 @@ extern ULONG_PTR KERNEL_BASE;
         if (!IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode]) && \
             (_Thread->SpecialApcDisable == 0)) \
         { \
         if (!IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode]) && \
             (_Thread->SpecialApcDisable == 0)) \
         { \

-            KiKernelApcDeliveryCheck(); \
+            KiCheckForKernelApcDelivery(); \

         } \
     } \
 }
         } \
     } \
 }


@@ -413,7 +413,7 @@ KiDeliverApc(
 
 VOID
 STDCALL
 
 VOID
 STDCALL

-KiKernelApcDeliveryCheck(VOID);
+KiCheckForKernelApcDelivery(VOID);

 
 LONG
 STDCALL
 
 LONG
 STDCALL

diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c
index d1aae5b..2c4ebf3 100644 (file)
--- a/reactos/ntoskrnl/ke/apc.c
+++ b/reactos/ntoskrnl/ke/apc.c
@@ -17,10 +17,10 @@
 /* FUNCTIONS *****************************************************************/
 
 /*++
 /* FUNCTIONS *****************************************************************/
 
 /*++

- * KiKernelApcDeliveryCheck
+ * KiCheckForKernelApcDelivery

  * @implemented NT 5.2
  *
  * @implemented NT 5.2
  *

- *     The KiKernelApcDeliveryCheck routine is called whenever APCs have just
+ *     The KiCheckForKernelApcDelivery routine is called whenever APCs have just

  *     been re-enabled in Kernel Mode, such as after leaving a Critical or
  *     Guarded Region. It delivers APCs if the environment is right.
  *
  *     been re-enabled in Kernel Mode, such as after leaving a Critical or
  *     Guarded Region. It delivers APCs if the environment is right.
  *


@@ -38,7 +38,7 @@
  *--*/
 VOID
 STDCALL
  *--*/
 VOID
 STDCALL

-KiKernelApcDeliveryCheck(VOID)
+KiCheckForKernelApcDelivery(VOID)

 {
     /* We should only deliver at passive */
     if (KeGetCurrentIrql() == PASSIVE_LEVEL)
 {
     /* We should only deliver at passive */
     if (KeGetCurrentIrql() == PASSIVE_LEVEL)


@@ -127,7 +127,7 @@ KeLeaveCriticalRegion (VOID)
             (Thread->SpecialApcDisable == 0))
         {
             /* Check for the right environment */
             (Thread->SpecialApcDisable == 0))
         {
             /* Check for the right environment */

-            KiKernelApcDeliveryCheck();
+            KiCheckForKernelApcDelivery();

         }
     }
 }
         }
     }
 }

diff --git a/reactos/ntoskrnl/ke/gmutex.c b/reactos/ntoskrnl/ke/gmutex.c
index ffdd3ed..e0707d9 100644 (file)
--- a/reactos/ntoskrnl/ke/gmutex.c
+++ b/reactos/ntoskrnl/ke/gmutex.c
@@ -59,7 +59,7 @@ KeLeaveGuardedRegion(VOID)
         if (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode]))
         {
             /* Check for APC Delivery */
         if (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode]))
         {
             /* Check for APC Delivery */

-            KiKernelApcDeliveryCheck();
+            KiCheckForKernelApcDelivery();

         }
     }
 }
         }
     }
 }

diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def
index d29a3ad..f8d5085 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.def
+++ b/reactos/ntoskrnl/ntoskrnl.def
@@ -653,8 +653,8 @@ KeWaitForSingleObject@20
 @KiAcquireSpinLock@4
 ;KiBugCheckData DATA
 KiCoprocessorError@0
 @KiAcquireSpinLock@4
 ;KiBugCheckData DATA
 KiCoprocessorError@0

+KiCheckForKernelApcDelivery@0

 KiDeliverApc@12
 KiDeliverApc@12

-KiKernelApcDeliveryCheck@0

 KiDispatchInterrupt@0
 KiEnableTimerWatchdog
 KiInterruptDispatch2@8
 KiDispatchInterrupt@0
 KiEnableTimerWatchdog
 KiInterruptDispatch2@8