Fix opening multi-files on Notepad++ multi-instance mode regression

Fix #36, fix notepad-plus-plus/notepad-plus-plus#13778, close #37

Author: donho

BaseNppExplorerCommandHandler.cpp

@@ -124,44 +124,48 @@ IFACEMETHODIMP BaseNppExplorerCommandHandler::Invoke(IShellItemArray* psiItemArr
     RETURN_IF_FAILED(psiItemArray->GetCount(&count));
 
     IShellItem* psi = nullptr;
-    LPWSTR itemName;
+    LPWSTR file2OpenPath;
+    
+    wstring appPath = L"\"";
+    appPath += GetNppExecutableFullPath().c_str();
+    appPath += L"\"";
+
+    wstring filePathsArg = appPath;
+    filePathsArg += L" ";
 
     for (DWORD i = 0; i < count; ++i)
     {
         psiItemArray->GetItemAt(i, &psi);
-        RETURN_IF_FAILED(psi->GetDisplayName(SIGDN_FILESYSPATH, &itemName));
+        RETURN_IF_FAILED(psi->GetDisplayName(SIGDN_FILESYSPATH, &file2OpenPath));
+        // Release the IShellItem pointer, since we are done with it as well.
+        psi->Release();
 
-        const wstring applicationName = GetNppExecutableFullPath();
-        const wstring commandLine = GetCommandLine(itemName);
+        filePathsArg += L"\"";
+        filePathsArg += file2OpenPath;
+        filePathsArg += L"\" ";
 
         // Cleanup itemName, since we are done with it.
-        if (itemName)
+        if (file2OpenPath)
         {
-            CoTaskMemFree(itemName);
+            CoTaskMemFree(file2OpenPath);
         }
+    }
 
-        // Release the IShellItem pointer, since we are done with it as well.
-        psi->Release();
-
-        STARTUPINFO si;
-        PROCESS_INFORMATION pi;
-
-        ZeroMemory(&si, sizeof(si));
-        si.cb = sizeof(si);
-        ZeroMemory(&pi, sizeof(pi));
-
-        wchar_t* application = (LPWSTR)applicationName.c_str();
-        wchar_t* command = (LPWSTR)commandLine.c_str();
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
 
-        if (!CreateProcessW(application, command, nullptr, nullptr, false, CREATE_NEW_PROCESS_GROUP, nullptr, nullptr, &si, &pi))
-        {
-            return S_OK;
-        }
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+    ZeroMemory(&pi, sizeof(pi));
 
-        CloseHandle(pi.hProcess);
-        CloseHandle(pi.hThread);
+    if (!CreateProcessW(GetNppExecutableFullPath().c_str(), (LPWSTR)filePathsArg.c_str(), nullptr, nullptr, false, CREATE_NEW_PROCESS_GROUP, nullptr, nullptr, &si, &pi))
+    {
+        return S_OK;
     }
 
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+
     return S_OK;
 }
 CATCH_RETURN();