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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 072b73705949859db4ea81ecc7669f14dbe69269
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=072b73705949859db4ea81ecc7...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Oct 27 20:48:47 2009 +0100

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

---

 dlls/kernel32/process.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index c2e8e22..3f7ce12 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -917,6 +917,7 @@ static void start_wineboot( HANDLE handles[2] )
         PROCESS_INFORMATION pi;
         DWORD type;
         void *redir;
+        WCHAR app[MAX_PATH];
         WCHAR cmdline[MAX_PATH + (sizeof(wineboot) + sizeof(args)) / sizeof(WCHAR)];
 
         memset( &si, 0, sizeof(si) );
@@ -926,11 +927,11 @@ static void start_wineboot( HANDLE handles[2] )
         si.hStdOutput = 0;
         si.hStdError  = GetStdHandle( STD_ERROR_HANDLE );
 
-        GetSystemDirectoryW( cmdline, MAX_PATH );
-        lstrcatW( cmdline, wineboot );
+        GetSystemDirectoryW( app, MAX_PATH - sizeof(wineboot)/sizeof(WCHAR) );
+        lstrcatW( app, wineboot );
 
         Wow64DisableWow64FsRedirection( &redir );
-        if (GetBinaryTypeW( cmdline, &type ) && type != expected_type)
+        if (GetBinaryTypeW( app, &type ) && type != expected_type)
         {
             if (type == SCS_64BIT_BINARY)
                 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 );
         }
 
-        lstrcatW( cmdline, args );
-        if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ))
+        strcpyW( cmdline, app );
+        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 );
             CloseHandle( pi.hThread );