commit 68df9182825ee82793bc8fb76dd0ae7409fbd384
author Alexandre Julliard <julliard@winehq.org> Mon Dec 19 21:25:23 2005 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 19 21:25:23 2005 +0100
tree 8c123e988f216a9a849d1f00d729cafdb8d4acde
parent 4f46232368fbfbac621bda169bb19a65622a6f78

kernel32: Check for tabs too when extracting the program name
(reported by Vitaliy Margolen).

dlls/kernel/process.c

diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index e75fccb..19d945b 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -1736,6 +1736,7 @@
 
     WCHAR *name, *pos, *ret = NULL;
     const WCHAR *p;
+    BOOL got_space;
 
     /* if we have an app name, everything is easy */
 
@@ -1780,26 +1781,27 @@
         return NULL;
     pos = name;
     p = cmdline;
+    got_space = FALSE;
 
     while (*p)
     {
-        do *pos++ = *p++; while (*p && *p != ' ');
+        do *pos++ = *p++; while (*p && *p != ' ' && *p != '\t');
         *pos = 0;
         if (find_exe_file( name, buffer, buflen, handle ))
         {
             ret = cmdline;
             break;
         }
+        if (*p) got_space = TRUE;
     }
 
-    if (!ret || !strchrW( name, ' ' )) goto done;  /* no change necessary */
-
-    /* now build a new command-line with quotes */
-
-    if (!(ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(cmdline) + 3) * sizeof(WCHAR) )))
-        goto done;
-    sprintfW( ret, quotesW, name );
-    strcatW( ret, p );
+    if (ret && got_space)  /* now build a new command-line with quotes */
+    {
+        if (!(ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(cmdline) + 3) * sizeof(WCHAR) )))
+            goto done;
+        sprintfW( ret, quotesW, name );
+        strcatW( ret, p );
+    }
 
  done:
     HeapFree( GetProcessHeap(), 0, name );