ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernelbase: Use LdrGetDllFullName() in GetModuleFileNameW(). 

Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2021-09-29 04:20:26 +03:00 committed by Alexandre Julliard
parent 39a3549093
commit 43d14fd808
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/kernelbase/loader.c
View File

@ -298,9 +298,9 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameA( HMODULE module, LPSTR filenam
DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameW( HMODULE module, LPWSTR filename, DWORD size )
{
ULONG len = 0;
ULONG_PTR magic;
LDR_DATA_TABLE_ENTRY *pldr;
WIN16_SUBSYSTEM_TIB *win16_tib;
UNICODE_STRING name;
NTSTATUS status;
if (!module && ((win16_tib = NtCurrentTeb()->Tib.SubSystemTib)) && win16_tib->exe_name)
{
@ -310,22 +310,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameW( HMODULE module, LPWSTR filena
goto done;
}
LdrLockLoaderLock( 0, NULL, &magic );
if (!module) module = NtCurrentTeb()->Peb->ImageBaseAddress;
if (set_ntstatus( LdrFindEntryForAddress( module, &pldr )))
{
len = min( size, pldr->FullDllName.Length / sizeof(WCHAR) );
memcpy( filename, pldr->FullDllName.Buffer, len * sizeof(WCHAR) );
if (len < size)
{
filename[len] = 0;
SetLastError( 0 );
}
else SetLastError( ERROR_INSUFFICIENT_BUFFER );
}
LdrUnlockLoaderLock( 0, magic );
name.Buffer = filename;
name.MaximumLength = size * sizeof(WCHAR);
status = LdrGetDllFullName( module, &name );
if (!status || status == STATUS_BUFFER_TOO_SMALL) len = name.Length / sizeof(WCHAR);
SetLastError( RtlNtStatusToDosError( status ));
done:
TRACE( "%s\n", debugstr_wn(filename, len) );
return len;