ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Specify the full application path when starting wineboot.exe.

This commit is contained in:
Alexandre Julliard 2009-10-27 20:48:47 +01:00
parent aadf703fc0
commit 072b737059
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/kernel32/process.c
View File

@ -917,6 +917,7 @@ static void start_wineboot( HANDLE handles[2] )
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
DWORD type; DWORD type;
void *redir; void *redir;
WCHAR app[MAX_PATH];
WCHAR cmdline[MAX_PATH + (sizeof(wineboot) + sizeof(args)) / sizeof(WCHAR)]; WCHAR cmdline[MAX_PATH + (sizeof(wineboot) + sizeof(args)) / sizeof(WCHAR)];
memset( &si, 0, sizeof(si) ); memset( &si, 0, sizeof(si) );
@ -926,11 +927,11 @@ static void start_wineboot( HANDLE handles[2] )
si.hStdOutput = 0; si.hStdOutput = 0;
si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); si.hStdError = GetStdHandle( STD_ERROR_HANDLE );
GetSystemDirectoryW( cmdline, MAX_PATH ); GetSystemDirectoryW( app, MAX_PATH - sizeof(wineboot)/sizeof(WCHAR) );
lstrcatW( cmdline, wineboot ); lstrcatW( app, wineboot );
Wow64DisableWow64FsRedirection( &redir ); Wow64DisableWow64FsRedirection( &redir );
if (GetBinaryTypeW( cmdline, &type ) && type != expected_type) if (GetBinaryTypeW( app, &type ) && type != expected_type)
{ {
if (type == SCS_64BIT_BINARY) if (type == SCS_64BIT_BINARY)
MESSAGE( "wine: '%s' is a 64-bit prefix, it cannot be used with 32-bit Wine.\n", MESSAGE( "wine: '%s' is a 64-bit prefix, it cannot be used with 32-bit Wine.\n",
@ -941,8 +942,9 @@ static void start_wineboot( HANDLE handles[2] )
ExitProcess( 1 ); ExitProcess( 1 );
} }
lstrcatW( cmdline, args ); strcpyW( cmdline, app );
if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) strcatW( cmdline, args );
if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ))
{ {
TRACE( "started wineboot pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); TRACE( "started wineboot pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId );
CloseHandle( pi.hThread ); CloseHandle( pi.hThread );