shlexec: fix directory execution
Ge van Geldorp
gvg at reactos.org
Wed Jan 4 17:34:35 CST 2006
Changelog:
Ge van Geldorp <gvg at reactos.org>
- Only use the Folder class handler if we're actually executing a folder
Index: dlls/shell32/shlexec.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlexec.c,v
retrieving revision 1.78
diff -u -r1.78 shlexec.c
--- dlls/shell32/shlexec.c 30 Nov 2005 20:54:46 -0000 1.78
+++ dlls/shell32/shlexec.c 4 Jan 2006 23:31:06 -0000
@@ -1200,7 +1200,9 @@
UINT_PTR retval = 31;
WCHAR wcmd[1024];
WCHAR buffer[MAX_PATH];
+ WCHAR target[MAX_PATH];
BOOL done;
+ DWORD attribs;
/* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */
memcpy(&sei_tmp, sei, sizeof(sei_tmp));
@@ -1315,9 +1317,20 @@
strcpyW(wszApplicationName, wExplorer);
sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST;
- } else if (HCR_GetExecuteCommandW(0, wszFolder, sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, buffer, sizeof(buffer))) {
- SHELL_ArgifyW(wszApplicationName, sizeof(wszApplicationName)/sizeof(WCHAR), buffer, NULL, sei_tmp.lpIDList, NULL);
-
+ } else {
+ /* Check if we're executing a directory and if so use the
+ handler for the Folder class */
+ strcpyW(target, buffer);
+ attribs = GetFileAttributesW(buffer);
+ if (attribs != INVALID_FILE_ATTRIBUTES &&
+ 0 != (attribs & FILE_ATTRIBUTE_DIRECTORY) &&
+ HCR_GetExecuteCommandW(0, wszFolder,
+ sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen,
+ buffer, sizeof(buffer))) {
+ SHELL_ArgifyW(wszApplicationName,
+ sizeof(wszApplicationName)/sizeof(WCHAR),
+ buffer, target, sei_tmp.lpIDList, NULL);
+ }
sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST;
}
}
More information about the wine-patches
mailing list