winevdm: Move the DOS memory range check to not trigger for Win16 apps.
This commit is contained in:
parent
d760cba090
commit
f315d0291d
@ -409,11 +409,6 @@ int main( int argc, char *argv[] )
|
|||||||
WINE_MESSAGE( "winevdm: unable to exec '%s': DOS support unavailable\n", appname );
|
WINE_MESSAGE( "winevdm: unable to exec '%s': DOS support unavailable\n", appname );
|
||||||
ExitProcess(1);
|
ExitProcess(1);
|
||||||
}
|
}
|
||||||
if (!VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) || mem_info.State == MEM_FREE)
|
|
||||||
{
|
|
||||||
WINE_MESSAGE( "winevdm: unable to exec '%s': DOS memory range unavailable\n", appname );
|
|
||||||
ExitProcess(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*first_arg) first_arg++; /* skip program name */
|
if (*first_arg) first_arg++; /* skip program name */
|
||||||
cmdline = build_command_line( first_arg );
|
cmdline = build_command_line( first_arg );
|
||||||
@ -458,9 +453,17 @@ int main( int argc, char *argv[] )
|
|||||||
if( ( p = strrchr( appname, '.' )) && !strcasecmp( p, ".pif"))
|
if( ( p = strrchr( appname, '.' )) && !strcasecmp( p, ".pif"))
|
||||||
pif_cmd( appname, cmdline + 1);
|
pif_cmd( appname, cmdline + 1);
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (!VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) || mem_info.State == MEM_FREE)
|
||||||
|
{
|
||||||
|
WINE_MESSAGE( "winevdm: unable to exec '%s': DOS memory range unavailable\n", appname );
|
||||||
|
ExitProcess(1);
|
||||||
|
}
|
||||||
|
|
||||||
/* try DOS format */
|
/* try DOS format */
|
||||||
/* loader expects arguments to be regular C strings */
|
/* loader expects arguments to be regular C strings */
|
||||||
wine_load_dos_exe( appname, cmdline + 1 );
|
wine_load_dos_exe( appname, cmdline + 1 );
|
||||||
|
}
|
||||||
/* if we get back here it failed */
|
/* if we get back here it failed */
|
||||||
instance = GetLastError();
|
instance = GetLastError();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user