From 0de1f3e6293c0a91cf09f7ec16736422f71257fa Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Thu, 3 Nov 2005 09:55:21 +0000
Subject: [PATCH] Pass the correct verb. Add a space between extra parameters.
 Wait for ShellExecute to complete.

---
 dlls/shell32/shelllink.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index 71d666f5379..c2ee6776781 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -2466,6 +2466,7 @@ static HRESULT WINAPI
 ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici )
 {
     IShellLinkImpl *This = impl_from_IContextMenu(iface);
+    static const WCHAR szOpen[] = { 'O','p','e','n',0 };
     SHELLEXECUTEINFOW sei;
     HWND hwnd = NULL; /* FIXME: get using interface set from IObjectWithSite */
     LPWSTR args = NULL;
@@ -2500,7 +2501,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici )
          ( lpici->fMask & CMIC_MASK_UNICODE ) )
     {
         LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX) lpici;
-        DWORD len = 0;
+        DWORD len = 2;
 
         if ( This->sArgs )
             len += lstrlenW( This->sArgs );
@@ -2512,19 +2513,32 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici )
         if ( This->sArgs )
             lstrcatW( args, This->sArgs );
         if ( iciex->lpParametersW )
+        {
+            static const WCHAR space[] = { ' ', 0 };
+            lstrcatW( args, space );
             lstrcatW( args, iciex->lpParametersW );
+        }
     }
 
     memset( &sei, 0, sizeof sei );
     sei.cbSize = sizeof sei;
+    sei.fMask = SEE_MASK_UNICODE | SEE_MASK_NOCLOSEPROCESS;
     sei.lpFile = path;
     sei.nShow = This->iShowCmd;
     sei.lpIDList = This->pPidl;
     sei.lpDirectory = This->sWorkDir;
     sei.lpParameters = args;
+    sei.lpVerb = szOpen;
 
     if( ShellExecuteExW( &sei ) )
+    {
+        if ( sei.hProcess )
+        {
+            WaitForSingleObject( sei.hProcess, 10000 );
+            CloseHandle( sei.hProcess );
+        }
         r = S_OK;
+    }
     else
         r = E_FAIL;
 
-- 
2.11.4.GIT