[ros-diffs] [gvg] 13447: - Prevent image loading and symbol loading getting each others way

- Prevent image loading and symbol loading getting each others way
- DPRINT1 is preferred over DbgPrint
Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c
Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c
  _____
Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c
--- trunk/reactos/ntoskrnl/dbg/kdb_symbols.c    2005-02-06 19:04:00 UTC
(rev 13446)
+++ trunk/reactos/ntoskrnl/dbg/kdb_symbols.c    2005-02-06 19:52:26 UTC
(rev 13447)
@@ -450,10 +450,10 @@
   DPRINT("Attempting to open image: %wZ\n", FileName);
   Status = ZwOpenFile(&FileHandle,
-                      FILE_ALL_ACCESS,
+                      FILE_READ_ACCESS,
                       &ObjectAttributes,
                       &IoStatusBlock,
-                      0,
+                      FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_SYNCHRONOUS_IO_NONALERT|FILE_NO_INTERMEDIATE_BUFFERING);
   if (!NT_SUCCESS(Status))
     {
  _____
Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c
--- trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-02-06 19:04:00 UTC (rev
13446)
+++ trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-02-06 19:52:26 UTC (rev
13447)
@@ -1,4 +1,4 @@
-/* $Id:$
+/* $Id$
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -93,14 +93,14 @@
                              NULL);
    DPRINT("Opening NTDLL\n");
    Status = ZwOpenFile(&FileHandle,
-                      FILE_ALL_ACCESS,
+                      FILE_READ_ACCESS,
                       &FileObjectAttributes,
                       &Iosb,
                       FILE_SHARE_READ,
                       FILE_SYNCHRONOUS_IO_NONALERT);
    if (!NT_SUCCESS(Status))
      {
-       DbgPrint("NTDLL open failed (Status %x)\n", Status);
+       DPRINT1("NTDLL open failed (Status %x)\n", Status);
        return Status;
      }
    Status = ZwReadFile(FileHandle,
@@ -114,7 +114,7 @@
                       0);
    if (!NT_SUCCESS(Status) || Iosb.Information != sizeof(BlockBuffer))
      {
-       DbgPrint("NTDLL header read failed (Status %x)\n", Status);
+       DPRINT1("NTDLL header read failed (Status %x)\n", Status);
        ZwClose(FileHandle);
        return Status;
      }
@@ -129,7 +129,7 @@
        || (DosHeader->e_lfanew == 0L)
        || (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE))
      {
-       DbgPrint("NTDLL format invalid\n");
+       DPRINT1("NTDLL format invalid\n");
        ZwClose(FileHandle);
        return(STATUS_UNSUCCESSFUL);
      }
@@ -149,7 +149,7 @@
                            FileHandle);
    if (!NT_SUCCESS(Status))
      {
-       DbgPrint("NTDLL create section failed (Status %x)\n", Status);
+       DPRINT1("NTDLL create section failed (Status %x)\n", Status);
        ZwClose(FileHandle);
        return(Status);
      }
@@ -172,7 +172,7 @@
                               PAGE_READWRITE);
    if (!NT_SUCCESS(Status))
      {
-       DbgPrint("NTDLL map view of secion failed (Status %x)", Status);
+       DPRINT1("NTDLL map view of secion failed (Status %x)", Status);
        ZwClose(NTDllSectionHandle);
        return(Status);
      }
@@ -186,7 +186,7 @@
                                      NULL);
    if (!NT_SUCCESS(Status))
      {
-       DbgPrint("ObReferenceObjectByProcess() failed (Status %x)\n",
Status);
+       DPRINT1("ObReferenceObjectByProcess() failed (Status %x)\n",
Status);
        return(Status);
      }
@@ -210,7 +210,7 @@
                                        &SystemDllEntryPoint);
        if (!NT_SUCCESS(Status))
         {
-          DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
+          DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
           if (Process != CurrentProcess)
             {
               KeDetachProcess();
@@ -235,7 +235,7 @@
                                        &SystemDllApcDispatcher);
        if (!NT_SUCCESS(Status))
         {
-          DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
+          DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
           if (Process != CurrentProcess)
             {
               KeDetachProcess();
@@ -259,7 +259,7 @@
                                        &SystemDllExceptionDispatcher);
        if (!NT_SUCCESS(Status))
         {
-          DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
+          DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
           if (Process != CurrentProcess)
             {
               KeDetachProcess();
@@ -283,7 +283,7 @@
                                        &SystemDllCallbackDispatcher);
        if (!NT_SUCCESS(Status))
         {
-          DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
+          DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
           if (Process != CurrentProcess)
             {
               KeDetachProcess();
@@ -307,7 +307,7 @@
&SystemDllRaiseExceptionDispatcher);
        if (!NT_SUCCESS(Status))
         {
-          DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
+          DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n",
Status);
           if (Process != CurrentProcess)
             {
               KeDetachProcess();