From bff71dc524898dfdaca9c4c05d69ba0db4c72f15 Mon Sep 17 00:00:00 2001 From: Rex Jolliff Date: Wed, 20 Oct 1999 23:09:26 +0000 Subject: [PATCH] Changed name to conform with kernel naming convention svn path=/trunk/; revision=714 --- reactos/ntoskrnl/ldr/init.c | 4 ++-- reactos/ntoskrnl/ldr/loader.c | 4 ++-- reactos/ntoskrnl/ldr/syspath.c | 6 +++--- reactos/ntoskrnl/ldr/syspath.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/reactos/ntoskrnl/ldr/init.c b/reactos/ntoskrnl/ldr/init.c index d251649da79..0c88a7c612c 100644 --- a/reactos/ntoskrnl/ldr/init.c +++ b/reactos/ntoskrnl/ldr/init.c @@ -116,7 +116,7 @@ NTSTATUS LdrLoadImage(HANDLE ProcessHandle, * Locate and open NTDLL to determine ImageBase * and LdrStartup */ - GetSystemDirectory(TmpNameBuffer, sizeof TmpNameBuffer); + LdrGetSystemDirectory(TmpNameBuffer, sizeof TmpNameBuffer); wcscat(TmpNameBuffer, L"\\ntdll.dll"); RtlInitUnicodeString(&DllPathname, TmpNameBuffer); InitializeObjectAttributes(&FileObjectAttributes, @@ -540,7 +540,7 @@ NTSTATUS LdrLoadInitialProcess (VOID) * Get the system directory's name (a DOS device * alias name which is in \\??\\). */ - GetSystemDirectory(TmpNameBuffer, sizeof TmpNameBuffer); + LdrGetSystemDirectory(TmpNameBuffer, sizeof TmpNameBuffer); // wcscat(TmpNameBuffer, L"\\shell.exe"); wcscat(TmpNameBuffer, L"\\smss.exe"); RtlInitUnicodeString(&ProcessName, TmpNameBuffer); diff --git a/reactos/ntoskrnl/ldr/loader.c b/reactos/ntoskrnl/ldr/loader.c index 43ea069d686..c32ee5f3c7d 100644 --- a/reactos/ntoskrnl/ldr/loader.c +++ b/reactos/ntoskrnl/ldr/loader.c @@ -1,4 +1,4 @@ -/* $Id: loader.c,v 1.32 1999/10/07 23:36:24 ekohl Exp $ +/* $Id: loader.c,v 1.33 1999/10/20 23:09:26 rex Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -171,7 +171,7 @@ LdrLoadAutoConfigDriver ( NTSTATUS Status; UNICODE_STRING DriverName; - GetSystemDirectory( + LdrGetSystemDirectory( TmpFileName, (MAX_PATH * sizeof(WCHAR)) ); diff --git a/reactos/ntoskrnl/ldr/syspath.c b/reactos/ntoskrnl/ldr/syspath.c index 09c3a710fc3..95360b96f78 100644 --- a/reactos/ntoskrnl/ldr/syspath.c +++ b/reactos/ntoskrnl/ldr/syspath.c @@ -1,4 +1,4 @@ -/* $Id: syspath.c,v 1.2 1999/10/07 23:36:25 ekohl Exp $ +/* $Id: syspath.c,v 1.3 1999/10/20 23:09:26 rex Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -32,7 +32,7 @@ * 19990717 (EA) */ LPWSTR -GetSystemDirectory ( +LdrGetSystemDirectory ( LPWSTR SystemDirectoryName, DWORD Size ) @@ -53,7 +53,7 @@ GetSystemDirectory ( ) ) { - DbgPrint("GetSystemDirectory() failed\n"); + DbgPrint("LdrGetSystemDirectory() failed\n"); return NULL; } /* diff --git a/reactos/ntoskrnl/ldr/syspath.h b/reactos/ntoskrnl/ldr/syspath.h index 3aa1b7bf6fd..300c4bd36dd 100644 --- a/reactos/ntoskrnl/ldr/syspath.h +++ b/reactos/ntoskrnl/ldr/syspath.h @@ -1,5 +1,5 @@ LPWSTR -GetSystemDirectory ( +LdrGetSystemDirectory ( LPWSTR SystemDirectoryName, DWORD Size );