patch 8.2.3870: MS-Windows: wrong dir when using right-click context menu
Problem: MS-Windows: wrong working directory when opening two files with
right-click context menu. (Gabriel Dupras)
Solution: Use the working directory and pass it on to the process creation.
(Nir Lichtman, closes #9382, closes #8874)
diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp
index e56379c..dd26eb1 100644
--- a/src/GvimExt/gvimext.cpp
+++ b/src/GvimExt/gvimext.cpp
@@ -776,8 +776,12 @@
// development.
return E_FAIL;
}
+
+ LPCMINVOKECOMMANDINFOEX lpcmiex = (LPCMINVOKECOMMANDINFOEX)lpcmi;
+ LPCWSTR currentDirectory = lpcmi->cbSize == sizeof(CMINVOKECOMMANDINFOEX) ? lpcmiex->lpDirectoryW : NULL;
+
hr = InvokeSingleGvim(lpcmi->hwnd,
- lpcmi->lpDirectory,
+ currentDirectory,
lpcmi->lpVerb,
lpcmi->lpParameters,
lpcmi->nShow,
@@ -884,7 +888,7 @@
STDMETHODIMP CShellExt::InvokeSingleGvim(HWND hParent,
- LPCSTR /* pszWorkingDir */,
+ LPCWSTR workingDir,
LPCSTR /* pszCmd */,
LPCSTR /* pszParam */,
int /* iShowCmd */,
@@ -944,7 +948,7 @@
FALSE, // Set handle inheritance to FALSE.
0, // No creation flags.
NULL, // Use parent's environment block.
- NULL, // Use parent's starting directory.
+ workingDir, // Use parent's starting directory.
&si, // Pointer to STARTUPINFO structure.
&pi) // Pointer to PROCESS_INFORMATION structure.
)