[ros-diffs] [janderwald] 47035: [USERINIT] - Fix Startup Folder - ShellExecuteEx needs lots of work See issue #4568 for more details.

Author: janderwald
Date: Mon Apr 26 15:58:09 2010
New Revision: 47035

URL: http://svn.reactos.org/svn/reactos?rev=47035&view=rev
Log:
[USERINIT]
- Fix Startup Folder
- ShellExecuteEx needs lots of work
See issue #4568 for more details.

Modified:
    trunk/reactos/base/system/userinit/userinit.c

Modified: trunk/reactos/base/system/userinit/userinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri…
==============================================================================
--- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Mon Apr 26 15:58:09 2010
@@ -212,7 +212,6 @@
         WARN("FindFirstFile(%s) failed with error %lu\n", debugstr_w(szPath),
GetLastError());
         return;
     }
-    szPath[len] = L'\0';
 
     do
     {
@@ -220,9 +219,10 @@
         {
             memset(&ExecInfo, 0x0, sizeof(SHELLEXECUTEINFOW));
             ExecInfo.cbSize = sizeof(ExecInfo);
+            wcscpy(&szPath[len+1], findData.cFileName);
             ExecInfo.lpVerb = L"open";
-            ExecInfo.lpFile = findData.cFileName;
-            ExecInfo.lpDirectory = szPath;
+            ExecInfo.lpFile = szPath;
+            ExecInfo.lpDirectory = NULL;
             TRACE("Executing %s in directory %s\n",
                 debugstr_w(findData.cFileName), debugstr_w(szPath));
             ShellExecuteExW(&ExecInfo);