[ros-diffs] [ion] 24733: - Apologies, forgot these two files for the Dbgk patch. - Adds PsNtDllPathName constant string since we use it in two place (PsLocateSystemDll and DbgkpCreateThread). - Adds PsImageNotifyEnabled boolean flag and sets it to true (although it should only be when a routine is installed, but ROS doesn't do this yet.

[ion at svn.reactos.org]

Author: ion
Date: Mon Nov 13 01:36:21 2006
New Revision: 24733

URL: http://svn.reactos.org/svn/reactos?rev=24733&view=rev
Log:
- Apologies, forgot these two files for the Dbgk patch.
- Adds PsNtDllPathName constant string since we use it in two place (PsLocateSystemDll and DbgkpCreateThread).
- Adds PsImageNotifyEnabled boolean flag and sets it to true (although it should only be when a routine is installed, but ROS doesn't do this yet.

Modified:
    trunk/reactos/ntoskrnl/ps/notify.c
    trunk/reactos/ntoskrnl/ps/psmgr.c

Modified: trunk/reactos/ntoskrnl/ps/notify.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/notify.c?rev=24733&r1=24732&r2=24733&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ps/notify.c (original)
+++ trunk/reactos/ntoskrnl/ps/notify.c Mon Nov 13 01:36:21 2006
@@ -11,10 +11,11 @@
 
 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 
+BOOLEAN PsImageNotifyEnabled = TRUE;
 ULONG PspThreadNotifyRoutineCount;
 PCREATE_THREAD_NOTIFY_ROUTINE
 PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY];

Modified: trunk/reactos/ntoskrnl/ps/psmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=24733&r1=24732&r2=24733&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ps/psmgr.c (original)
+++ trunk/reactos/ntoskrnl/ps/psmgr.c Mon Nov 13 01:36:21 2006
@@ -46,6 +46,9 @@
 ANSI_STRING FastName = RTL_CONSTANT_STRING("KiFastSystemCall");
 ANSI_STRING FastReturnName = RTL_CONSTANT_STRING("KiFastSystemCallRet");
 ANSI_STRING InterruptName = RTL_CONSTANT_STRING("KiIntSystemCall");
+
+UNICODE_STRING PsNtDllPathName =
+    RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\ntdll.dll");
 
 PHANDLE_TABLE PspCidTable;
 
@@ -159,7 +162,6 @@
 NTAPI
 PsLocateSystemDll(VOID)
 {
-    UNICODE_STRING DllName = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\ntdll.dll");
     OBJECT_ATTRIBUTES ObjectAttributes;
     IO_STATUS_BLOCK IoStatusBlock;
     HANDLE FileHandle, SectionHandle;
@@ -168,7 +170,11 @@
     ULONG HardErrorResponse;
 
     /* Locate and open NTDLL to determine ImageBase and LdrStartup */
-    InitializeObjectAttributes(&ObjectAttributes, &DllName, 0, NULL, NULL);
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &PsNtDllPathName,
+                               0,
+                               NULL,
+                               NULL);
     Status = ZwOpenFile(&FileHandle,
                         FILE_READ_ACCESS,
                         &ObjectAttributes,
@@ -186,7 +192,7 @@
     if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH)
     {
         /* Raise a hard error */
-        HardErrorParameters = (ULONG_PTR)&DllName;
+        HardErrorParameters = (ULONG_PTR)&PsNtDllPathName;
         NtRaiseHardError(Status,
                          1,
                          1,