[ros-diffs] [sginsberg] 55840: [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...

Author: sginsberg
Date: Fri Feb 24 13:51:52 2012
New Revision: 55840

URL: http://svn.reactos.org/svn/reactos?rev=55840&view=rev
Log:
[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.

Modified:
    trunk/reactos/include/ddk/wdm.h
    trunk/reactos/ntoskrnl/ke/bug.c

Modified: trunk/reactos/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5584…
==============================================================================
--- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Feb 24 13:51:52 2012
@@ -10206,7 +10206,7 @@
 }
 #endif
 
-//DECLSPEC_NORETURN
+DECLSPEC_NORETURN
 NTKERNELAPI
 VOID
 NTAPI

Modified: trunk/reactos/ntoskrnl/ke/bug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=5584…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Fri Feb 24 13:51:52 2012
@@ -1432,18 +1432,13 @@
              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);
 }
 
 /*