Change KEBUGCHECK -> KEBUGCHECKEX

[reactos.git] / reactos / ntoskrnl / ex / work.c

diff --git a/reactos/ntoskrnl/ex/work.c b/reactos/ntoskrnl/ex/work.c
index 0a5f82f..5001689 100644 (file)
--- a/reactos/ntoskrnl/ex/work.c
+++ b/reactos/ntoskrnl/ex/work.c
@@ -3,7 +3,7 @@
  * PROJECT:            ReactOS kernel
  * FILE:               ntoskrnl/ex/work.c
  * PURPOSE:            Manage system work queues
- * 
+ *
  * PROGRAMMERS:        Alex Ionescu - Used correct work queue array and added some fixes and checks.
  *                     Gunnar Dalsnes - Implemented
  */
@@ -38,7 +38,7 @@ EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue];
  * calls PsTerminateSystemThread
  */
 static
-VOID 
+VOID
 STDCALL
 ExpWorkerThreadEntryPoint(IN PVOID Context)
 {
@@ -46,53 +46,59 @@ ExpWorkerThreadEntryPoint(IN PVOID Context)
     PLIST_ENTRY QueueEntry;
     WORK_QUEUE_TYPE WorkQueueType;
     PEX_WORK_QUEUE WorkQueue;
-   
+
     /* Get Queue Type and Worker Queue */
     WorkQueueType = (WORK_QUEUE_TYPE)Context;
     WorkQueue = &ExWorkerQueue[WorkQueueType];
-    
+
     /* Loop forever */
     while (TRUE) {
-        
+
         /* Wait for Something to Happen on the Queue */
         QueueEntry = KeRemoveQueue(&WorkQueue->WorkerQueue, KernelMode, NULL);
-      
+
         /* Can't happen since we do a KernelMode wait (and we're a system thread) */
         ASSERT((NTSTATUS)QueueEntry != STATUS_USER_APC);
-      
+
         /* this should never happen either, since we wait with NULL timeout,
          * but there's a slight possibility that STATUS_TIMEOUT is returned
          * at queue rundown in NT (unlikely) -Gunnar
          */
         ASSERT((NTSTATUS)QueueEntry != STATUS_TIMEOUT);
-    
+
         /* Increment Processed Work Items */
-        InterlockedIncrement(&WorkQueue->WorkItemsProcessed);
+        InterlockedIncrement((PLONG)&WorkQueue->WorkItemsProcessed);
 
         /* Get the Work Item */
         WorkItem = CONTAINING_RECORD(QueueEntry, WORK_QUEUE_ITEM, List);
-        
+
         /* Call the Worker Routine */
         WorkItem->WorkerRoutine(WorkItem->Parameter);
-    
+
         /* Make sure it returned at right IRQL */
         if (KeGetCurrentIrql() != PASSIVE_LEVEL) {
-        
-            /* FIXME: Make this an Ex */
-            KEBUGCHECK(WORKER_THREAD_RETURNED_AT_BAD_IRQL);
+
+            KEBUGCHECKEX(WORKER_THREAD_RETURNED_AT_BAD_IRQL,
+                         (ULONG_PTR)WorkItem->WorkerRoutine,
+                         KeGetCurrentIrql(),
+                         (ULONG_PTR)WorkItem->Parameter,
+                         (ULONG_PTR)WorkItem);
         }
-    
+
         /* Make sure it returned with Impersionation Disabled */
         if (PsGetCurrentThread()->ActiveImpersonationInfo) {
-            
-            /* FIXME: Make this an Ex */
-            KEBUGCHECK(IMPERSONATING_WORKER_THREAD);
+
+            KEBUGCHECKEX(IMPERSONATING_WORKER_THREAD,
+                         (ULONG_PTR)WorkItem->WorkerRoutine,
+                         (ULONG_PTR)WorkItem->Parameter,
+                         (ULONG_PTR)WorkItem,
+                         0);
         }
     }
 }
 
-static 
-VOID 
+static
+VOID
 STDCALL
 ExpInitializeWorkQueue(WORK_QUEUE_TYPE WorkQueueType,
                        KPRIORITY Priority)
@@ -100,10 +106,10 @@ ExpInitializeWorkQueue(WORK_QUEUE_TYPE WorkQueueType,
     ULONG i;
     PETHREAD Thread;
     HANDLE hThread;
-   
+
     /* Loop through how many threads we need to create */
     for (i = 0; i < NUMBER_OF_WORKER_THREADS; i++) {
-        
+
         /* Create the System Thread */
         PsCreateSystemThread(&hThread,
                              THREAD_ALL_ACCESS,
@@ -112,7 +118,7 @@ ExpInitializeWorkQueue(WORK_QUEUE_TYPE WorkQueueType,
                              NULL,
                              ExpWorkerThreadEntryPoint,
                              (PVOID)WorkQueueType);
-        
+
         /* Get the Thread */
         ObReferenceObjectByHandle(hThread,
                                   THREAD_SET_INFORMATION,
@@ -120,29 +126,30 @@ ExpInitializeWorkQueue(WORK_QUEUE_TYPE WorkQueueType,
                                   KernelMode,
                                   (PVOID*)&Thread,
                                   NULL);
-        
+
         /* Set the Priority */
         KeSetPriorityThread(&Thread->Tcb, Priority);
-        
+
         /* Dereference and close handle */
         ObDereferenceObject(Thread);
         ZwClose(hThread);
     }
 }
 
-VOID 
+VOID
 INIT_FUNCTION
+STDCALL
 ExpInitializeWorkerThreads(VOID)
 {
     ULONG WorkQueueType;
-    
+
     /* Initialize the Array */
     for (WorkQueueType = 0; WorkQueueType < MaximumWorkQueue; WorkQueueType++) {
-    
+
         RtlZeroMemory(&ExWorkerQueue[WorkQueueType], sizeof(EX_WORK_QUEUE));
         KeInitializeQueue(&ExWorkerQueue[WorkQueueType].WorkerQueue, 0);
     }
-    
+
     /* Create the built-in worker threads for each work queue */
     ExpInitializeWorkQueue(CriticalWorkQueue, LOW_REALTIME_PRIORITY);
     ExpInitializeWorkQueue(DelayedWorkQueue, LOW_PRIORITY);
@@ -158,7 +165,7 @@ ExpInitializeWorkerThreads(VOID)
  *        WorkItem = Item to insert
  *        QueueType = Queue to insert it in
  */
-VOID 
+VOID
 STDCALL
 ExQueueWorkItem(PWORK_QUEUE_ITEM WorkItem,
                 WORK_QUEUE_TYPE QueueType)
@@ -166,7 +173,7 @@ ExQueueWorkItem(PWORK_QUEUE_ITEM WorkItem,
     ASSERT(WorkItem!=NULL);
     ASSERT_IRQL(DISPATCH_LEVEL);
     ASSERT(WorkItem->List.Flink == NULL);
-    
+
     /* Insert the Queue */
     KeInsertQueue(&ExWorkerQueue[QueueType].WorkerQueue, &WorkItem->List);
 }