system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 17:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel32: Try to load a 32-bit builtin in WinExec16 if the file doesn't exist.

Browse source
This commit is contained in:
Alexandre Julliard 2009-07-21 12:22:01 +02:00
parent a77e369cfe
commit a9c33bbc4a
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
dlls/kernel32/ne_module.c
View file

@ -118,6 +118,15 @@ static inline void patch_code_segment( NE_MODULE *pModule )
}
/***********************************************************************
* contains_path
*/
static inline int contains_path( LPCSTR name )
{
return ((*name && (name[1] == ':')) || strchr(name, '/') || strchr(name, '\\'));
}
/***********************************************************************
* NE_strcasecmp
*
@ -1674,6 +1683,8 @@ HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow )
int arglen;
HINSTANCE16 ret;
char buffer[MAX_PATH];
LOADPARAMS16 params;
WORD showCmd[2];
if (*lpCmdLine == '"') /* has to be only one and only at beginning ! */
{
@ -1722,23 +1733,29 @@ HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow )
TRACE("name: '%s', cmdline: '%.*s'\n", name, cmdline[0], &cmdline[1]);
showCmd[0] = 2;
showCmd[1] = nCmdShow;
params.hEnvironment = 0;
params.cmdLine = MapLS( cmdline );
params.showCmd = MapLS( showCmd );
params.reserved = 0;
if (SearchPathA( NULL, name, ".exe", sizeof(buffer), buffer, NULL ))
{
LOADPARAMS16 params;
WORD showCmd[2];
showCmd[0] = 2;
showCmd[1] = nCmdShow;
params.hEnvironment = 0;
params.cmdLine = MapLS( cmdline );
params.showCmd = MapLS( showCmd );
params.reserved = 0;
ret = LoadModule16( buffer, &params );
UnMapLS( params.cmdLine );
UnMapLS( params.showCmd );
}
else ret = GetLastError();
else if (!contains_path( name )) /* try 16-bit builtin */
{
lstrcpynA( buffer, name, sizeof(buffer) );
if (strlen( buffer ) < sizeof(buffer) - 4 && !strchr( buffer, '.' )) strcat( buffer, ".exe" );
ret = LoadModule16( buffer, &params );
if (ret == ERROR_FILE_NOT_FOUND) ret = 21; /* it might be a 32-bit builtin too */
}
else ret = ERROR_FILE_NOT_FOUND;
UnMapLS( params.cmdLine );
UnMapLS( params.showCmd );
HeapFree( GetProcessHeap(), 0, cmdline );
if (name != lpCmdLine) HeapFree( GetProcessHeap(), 0, name );