shell32: Set current directory when executing files in a shell view
Thomas Weidenmueller
wine-patches at reactsoft.com
Sat Jul 7 14:06:44 CDT 2007
When calling ShellExecuteEx for the selected objects in a shell view,
set the current directory to the view's directory.
- Thomas
-------------- next part --------------
Index: shlview.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlview.c,v
retrieving revision 1.137
diff -u -r1.137 shlview.c
--- shlview.c 25 May 2007 19:46:04 -0000 1.137
+++ shlview.c 7 Jul 2007 19:02:04 -0000
@@ -854,6 +854,9 @@
STGMEDIUM stgm;
LPIDA pIDList;
LPCITEMIDLIST parent_pidl;
+ WCHAR parent_path[MAX_PATH];
+ LPCWSTR parent_dir = NULL;
+ SFGAOF attribs;
int i;
if (0 == ShellView_GetSelections(This))
@@ -887,10 +890,16 @@
pIDList = GlobalLock(stgm.u.hGlobal);
parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pIDList+pIDList->aoffset[0]);
+ hr = IShellFolder_GetAttributesOf(This->pSFParent, 1, &parent_pidl, &attribs);
+ if (SUCCEEDED(hr) && (attribs & SFGAO_FILESYSTEM) &&
+ SHGetPathFromIDListW(parent_pidl, parent_path))
+ {
+ parent_dir = parent_path;
+ }
+
for (i = pIDList->cidl; i > 0; --i)
{
LPCITEMIDLIST pidl;
- SFGAOF attribs;
pidl = (LPCITEMIDLIST)((LPBYTE)pIDList+pIDList->aoffset[i]);
@@ -899,19 +908,19 @@
if (SUCCEEDED(hr) && ! (attribs & SFGAO_FOLDER))
{
- SHELLEXECUTEINFOA shexinfo;
+ SHELLEXECUTEINFOW shexinfo;
- shexinfo.cbSize = sizeof(SHELLEXECUTEINFOA);
+ shexinfo.cbSize = sizeof(SHELLEXECUTEINFOW);
shexinfo.fMask = SEE_MASK_INVOKEIDLIST; /* SEE_MASK_IDLIST is also possible. */
shexinfo.hwnd = NULL;
shexinfo.lpVerb = NULL;
shexinfo.lpFile = NULL;
shexinfo.lpParameters = NULL;
- shexinfo.lpDirectory = NULL;
+ shexinfo.lpDirectory = parent_dir;
shexinfo.nShow = SW_NORMAL;
shexinfo.lpIDList = ILCombine(parent_pidl, pidl);
- ShellExecuteExA(&shexinfo); /* Discard error/success info */
+ ShellExecuteExW(&shexinfo); /* Discard error/success info */
ILFree((LPITEMIDLIST)shexinfo.lpIDList);
}
More information about the wine-patches
mailing list