From 6922d2a9e5c44f122f2990dc71169e9ff938b46c Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 10 Feb 2001 22:29:35 +0000 Subject: [PATCH] GetModuleFileName[A/W] must cope with NULL module handles svn path=/trunk/; revision=1615 --- reactos/lib/kernel32/misc/ldr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/reactos/lib/kernel32/misc/ldr.c b/reactos/lib/kernel32/misc/ldr.c index 5d8b0a3d322..6fb1bdbae0a 100644 --- a/reactos/lib/kernel32/misc/ldr.c +++ b/reactos/lib/kernel32/misc/ldr.c @@ -1,4 +1,4 @@ -/* $Id: ldr.c,v 1.10 2001/01/24 04:41:58 phreak Exp $ +/* $Id: ldr.c,v 1.11 2001/02/10 22:29:35 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT : ReactOS user mode libraries @@ -194,6 +194,9 @@ GetModuleFileNameA ( Peb = NtCurrentPeb (); RtlEnterCriticalSection (Peb->LoaderLock); + if (hModule == NULL) + hModule = Peb->ImageBaseAddress; + ModuleListHead = &Peb->Ldr->InLoadOrderModuleList; Entry = ModuleListHead->Flink; @@ -234,7 +237,6 @@ GetModuleFileNameA ( SetLastErrorByStatus (STATUS_DLL_NOT_FOUND); RtlLeaveCriticalSection (Peb->LoaderLock); - return 0; } @@ -257,6 +259,9 @@ GetModuleFileNameW ( Peb = NtCurrentPeb (); RtlEnterCriticalSection (Peb->LoaderLock); + if (hModule == NULL) + hModule = Peb->ImageBaseAddress; + ModuleListHead = &Peb->Ldr->InLoadOrderModuleList; Entry = ModuleListHead->Flink; while (Entry != ModuleListHead)