Commit 9e7a9270 authored by Alexandre Julliard's avatar Alexandre Julliard

ntdll: Fall back to the current loader if the corresponding 32/64-bit loader isn't found.

parent ae8562ed
...@@ -1863,6 +1863,7 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) ...@@ -1863,6 +1863,7 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module )
NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset);
wow_peb = (PEB32 *)((char *)peb + page_size); wow_peb = (PEB32 *)((char *)peb + page_size);
set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() );
ERR( "starting %s in experimental wow64 mode\n", debugstr_us(&params->ImagePathName) );
} }
#endif #endif
......
...@@ -706,14 +706,9 @@ static NTSTATUS loader_exec( char **argv, WORD machine ) ...@@ -706,14 +706,9 @@ static NTSTATUS loader_exec( char **argv, WORD machine )
strcpy( argv[1], wineloader ); strcpy( argv[1], wineloader );
strcat( argv[1], "64" ); strcat( argv[1], "64" );
preloader_exec( argv ); preloader_exec( argv );
return STATUS_INVALID_IMAGE_FORMAT;
}
} }
else if ((argv[1] = remove_tail( wineloader, "64" )))
{
preloader_exec( argv );
return STATUS_INVALID_IMAGE_FORMAT;
} }
else if ((argv[1] = remove_tail( wineloader, "64" ))) preloader_exec( argv );
} }
argv[1] = strdup( wineloader ); argv[1] = strdup( wineloader );
......
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