Skip to content

W
wine-winehq
Commit 1cef2974 authored by Joshua Thielen's avatar Joshua Thielen Committed by Alexandre Julliard
Browse files
Options

Changed GetModuleFileNameA to use GetCurrentTask instead of

MODULE32_LookupHMODULE when called by a 16-bit task.
parent 7c4cb515
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
loader/module.c
View file @ 1cef2974
......@@ -1033,13 +1033,20 @@ DWORD WINAPI GetModuleFileNameA(
LPSTR lpFileName, /* [out] filenamebuffer */
DWORD size ) /* [in] size of filenamebuffer */
{
WINE_MODREF *wm;
RtlEnterCriticalSection( &loader_section );
lpFileName[0] = 0;
if ((wm = MODULE32_LookupHMODULE( hModule )))
lstrcpynA( lpFileName, wm->filename, size );
if (!hModule && !(NtCurrentTeb()->tibflags & TEBF_WIN32))
{
/* 16-bit task - get current NE module name */
NE_MODULE *pModule = NE_GetPtr( GetCurrentTask() );
if (pModule) GetLongPathNameA(NE_MODULE_NAME(pModule), lpFileName, size);
}
else
{
WINE_MODREF *wm = MODULE32_LookupHMODULE( hModule );
if (wm) lstrcpynA( lpFileName, wm->filename, size );
}
RtlLeaveCriticalSection( &loader_section );
TRACE("%s\n", lpFileName );
......@@ -1694,4 +1701,3 @@ SEGPTR WINAPI HasGPHandler16( SEGPTR address )
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment