WIP / Do not commit

ui/base/win/shell.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/win/shell.h"
 
 #include <shellapi.h>
 #include <shlobj.h>  // Must be before propkey.
 #include <propkey.h>
 
@@ skipping 59 matching lines @@
   }
 
   // Cleanup.
   base::UnloadNativeLibrary(shell32_library);
 }
 
 }  // namespace
 
 // Open an item via a shell execute command. Error code checking and casting
 // explanation: http://msdn2.microsoft.com/en-us/library/ms647732.aspx
-bool OpenItemViaShell(const FilePath& full_path) {
-  HINSTANCE h = ::ShellExecuteW(
-      NULL, NULL, full_path.value().c_str(), NULL,
-      full_path.DirName().value().c_str(), SW_SHOWNORMAL);
-
-  LONG_PTR error = reinterpret_cast<LONG_PTR>(h);
-  if (error > 32)
+bool OpenItemViaShell(const FilePath& full_path,
+                      base::ProcessHandle* process_handle) {
+  SHELLEXECUTEINFO sei = { sizeof(sei) };
+  if (process_handle)
+    sei.fMask = SEE_MASK_NOCLOSEPROCESS;
+  sei.nShow = SW_SHOWNORMAL;
+  sei.lpVerb = NULL;
+  sei.lpFile = full_path.value().c_str();
+  sei.lpDirectory = full_path.DirName().value().c_str();
+  if (::ShellExecuteExW(&sei)) {
+    process_handle = sei.hProcess;
     return true;
-
+  }
+  LONG_PTR error = reinterpret_cast<LONG_PTR>(sei.hInstApp);
   if ((error == SE_ERR_NOASSOC))
     return OpenItemWithExternalApp(full_path.value());
-
   return false;
 }
 
 bool OpenItemViaShellNoZoneCheck(const FilePath& full_path) {
   SHELLEXECUTEINFO sei = { sizeof(sei) };
   sei.fMask = SEE_MASK_NOZONECHECKS | SEE_MASK_FLAG_DDEWAIT;
   sei.nShow = SW_SHOWNORMAL;
   sei.lpVerb = NULL;
   sei.lpFile = full_path.value().c_str();
   if (::ShellExecuteExW(&sei))
@@ skipping 18 matching lines @@
 void SetAppIdForWindow(const string16& app_id, HWND hwnd) {
   SetAppIdAndIconForWindow(app_id, string16(), hwnd);
 }
 
 void SetAppIconForWindow(const string16& app_icon, HWND hwnd) {
   SetAppIdAndIconForWindow(string16(), app_icon, hwnd);
 }
 
 }  // namespace win
 }  // namespace ui