[NTOSKRNL]

- Remove nasty hack to make Windows PCI driver load. This may not be required after the fixes that were committed after this hack. If it is still necessary then please fix whatever issue makes the PCI driver crash instead of relying on a return from bugcheck call to work...

[DDK]
- Mark KeBugCheckEx as noreturn again. Should fix Prefast issues where it thought execution could return from the call and would warn about false issues.

svn path=/trunk/; revision=55840

diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index 5daea6d..4763352 100644 (file)
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -10206,7 +10206,7 @@ KeInitializeSpinLock(_Out_ PKSPIN_LOCK SpinLock)
 }
 #endif
 
 }
 #endif
 

-//DECLSPEC_NORETURN
+DECLSPEC_NORETURN

 NTKERNELAPI
 VOID
 NTAPI
 NTKERNELAPI
 VOID
 NTAPI

diff --git a/reactos/ntoskrnl/ke/bug.c b/reactos/ntoskrnl/ke/bug.c
index 1097cc8..8d4470e 100644 (file)
--- a/reactos/ntoskrnl/ke/bug.c
+++ b/reactos/ntoskrnl/ke/bug.c
@@ -1432,18 +1432,13 @@ KeBugCheckEx(IN ULONG BugCheckCode,
              IN ULONG_PTR BugCheckParameter3,
              IN ULONG_PTR BugCheckParameter4)
 {
              IN ULONG_PTR BugCheckParameter3,
              IN ULONG_PTR BugCheckParameter4)
 {

-    /* Workaround for Windows Server 2003 Checked PCI Driver issue */
-    if (!((BugCheckCode == PCI_BUS_DRIVER_INTERNAL) &&
-          (BugCheckParameter1 == 0xDEAD0010)))
-    {
-        /* Call the internal API */
-        KeBugCheckWithTf(BugCheckCode,
-                         BugCheckParameter1,
-                         BugCheckParameter2,
-                         BugCheckParameter3,
-                         BugCheckParameter4,
-                         NULL);
-    }
+    /* Call the internal API */
+    KeBugCheckWithTf(BugCheckCode,
+                     BugCheckParameter1,
+                     BugCheckParameter2,
+                     BugCheckParameter3,
+                     BugCheckParameter4,
+                     NULL);

 }
 
 /*
 }
 
 /*