update for HEAD-2003091401

[reactos.git] / subsys / system / services / database.c

diff --git a/subsys/system/services/database.c b/subsys/system/services/database.c
index 2e9dce1..c6e2649 100644 (file)
--- a/subsys/system/services/database.c
+++ b/subsys/system/services/database.c
@@ -318,7 +318,7 @@ ScmCheckDriver(PSERVICE Service)
   UNICODE_STRING DirName;
   HANDLE DirHandle;
   NTSTATUS Status;
-  POBJDIR_INFORMATION DirInfo;
+  PDIRECTORY_BASIC_INFORMATION DirInfo;
   ULONG BufferLength;
   ULONG DataLength;
   ULONG Index;
@@ -352,7 +352,7 @@ ScmCheckDriver(PSERVICE Service)
       return(Status);
     }
 
-  BufferLength = sizeof(OBJDIR_INFORMATION) +
+  BufferLength = sizeof(DIRECTORY_BASIC_INFORMATION) +
                 2 * MAX_PATH * sizeof(WCHAR);
   DirInfo = HeapAlloc(GetProcessHeap(),
                      HEAP_ZERO_MEMORY,
@@ -505,7 +505,7 @@ ScmStartService(PSERVICE Service,
                                                        4,
                                                        30000,
                                                        NULL);
-         DPRINT1("CreateNamedPipeW() done\n");
+         DPRINT("CreateNamedPipeW() done\n");
          if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE)
            {
              DPRINT1("Failed to create control pipe!\n");
@@ -544,12 +544,12 @@ ScmStartService(PSERVICE Service,
            }
          else
            {
-             DPRINT1("Process Id: %lu  Handle %lx\n",
-                     ProcessInformation.dwProcessId,
-                     ProcessInformation.hProcess);
-             DPRINT1("Tread Id: %lu  Handle %lx\n",
-                     ProcessInformation.dwThreadId,
-                     ProcessInformation.hThread);
+             DPRINT("Process Id: %lu  Handle %lx\n",
+                    ProcessInformation.dwProcessId,
+                    ProcessInformation.hProcess);
+             DPRINT("Thread Id: %lu  Handle %lx\n",
+                    ProcessInformation.dwThreadId,
+                    ProcessInformation.hThread);
 
              /* Get process and thread ids */
              Service->ProcessId = ProcessInformation.dwProcessId;
@@ -561,7 +561,7 @@ ScmStartService(PSERVICE Service,
              /* FIXME: connect control pipe */
              if (ConnectNamedPipe(Service->ControlPipeHandle, NULL))
                {
-                 DPRINT1("Control pipe connected!\n");
+                 DPRINT("Control pipe connected!\n");
                  Status = STATUS_SUCCESS;
                }
              else