system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 07:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

It seems to be GetModuleFileName16 that checks exe version on whether

Browse source 
to return long or short paths, not GetModuleFileNameA.
This commit is contained in:
Andreas Mohr 2000-02-20 19:15:34 +00:00 committed by Alexandre Julliard
parent ec7d7fa380
commit 4654c32122
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
loader/module.c
View file

@ -1296,6 +1296,11 @@ HMODULE WINAPI GetModuleHandleW(LPCWSTR module)
/***********************************************************************
* GetModuleFileNameA (KERNEL32.235)
*
* GetModuleFileNameA seems to *always* return the long path;
* it's only GetModuleFileName16 that decides between short/long path
* by checking if exe version >= 4.0.
* (SDK docu doesn't mention this)
*/
DWORD WINAPI GetModuleFileNameA(
HMODULE hModule, /* [in] module handle (32bit) */
@ -1307,10 +1312,7 @@ DWORD WINAPI GetModuleFileNameA(
if (!wm) /* can happen on start up or the like */
return 0;
if (PE_HEADER(wm->module)->OptionalHeader.MajorOperatingSystemVersion >= 4.0)
lstrcpynA( lpFileName, wm->filename, size );
else
lstrcpynA( lpFileName, wm->short_filename, size );
lstrcpynA( lpFileName, wm->filename, size );
TRACE("%s\n", lpFileName );
return strlen(lpFileName);

7
loader/ne/module.c
View file

@ -1388,6 +1388,8 @@ WORD WINAPI GetExpWinVer16( HMODULE16 hModule )
/**********************************************************************
* GetModuleFileName16 (KERNEL.49)
*
* Comment: see GetModuleFileNameA
*/
INT16 WINAPI GetModuleFileName16( HINSTANCE16 hModule, LPSTR lpFileName,
INT16 nSize )
@ -1396,7 +1398,10 @@ INT16 WINAPI GetModuleFileName16( HINSTANCE16 hModule, LPSTR lpFileName,
if (!hModule) hModule = GetCurrentTask();
if (!(pModule = NE_GetPtr( hModule ))) return 0;
lstrcpynA( lpFileName, NE_MODULE_NAME(pModule), nSize );
if (pModule->expected_version >= 0x400)
GetLongPathNameA(NE_MODULE_NAME(pModule), lpFileName, nSize);
else
lstrcpynA( lpFileName, NE_MODULE_NAME(pModule), nSize );
TRACE("%s\n", lpFileName );
return strlen(lpFileName);
}