commit 15aef00f29b7aa933ad8c051ae829686e5c65a4c
author Alexandre Julliard <julliard@winehq.org> Mon Jul 31 21:02:53 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 31 21:02:53 2000 +0000
tree 5e11c702e262d31563fac8ac9c486a7eba5df606
parent 128843046dc60e35b1f4842abf17fd74cb35bc00

Skip quoted program name when building command line.

loader/task.c

diff --git a/loader/task.c b/loader/task.c
index 1134b7e..13ab07c 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -295,6 +295,9 @@
     if (!cmdline)
     {
         cmdline = pdb32->env_db->cmd_line;
+        /* remove the first word (program name) */
+        if (*cmdline == '"')
+            if (!(cmdline = strchr( cmdline+1, '"' ))) cmdline = pdb32->env_db->cmd_line;
         while (*cmdline && (*cmdline != ' ') && (*cmdline != '\t')) cmdline++;
         while ((*cmdline == ' ') || (*cmdline == '\t')) cmdline++;
         len = strlen(cmdline);
@@ -304,6 +307,8 @@
     memcpy( pTask->pdb.cmdLine + 1, cmdline, len );
     /* pTask->pdb.cmdLine[len+1] = 0; */
 
+    TRACE("module='%s' cmdline='%.*s' task=%04x\n", name, len, cmdline, hTask );
+
       /* Get the compatibility flags */
 
     pTask->compat_flags = GetProfileIntA( "Compatibility", name, 0 );
@@ -336,8 +341,6 @@
     teb->htask16 = hTask;
     if (!initial_task) initial_task = hTask;
 
-    TRACE("module='%s' cmdline='%.*s' task=%04x\n", name, *cmdline, cmdline+1, hTask );
-
     /* Add the task to the linked list */
 
     SYSLEVEL_EnterWin16Lock();