reactos/lib/shell32
diff -u -r1.13 -r1.14
--- shell32_main.h 16 Feb 2004 21:46:12 -0000 1.13
+++ shell32_main.h 4 Mar 2004 21:12:11 -0000 1.14
@@ -240,7 +240,7 @@
BOOL WINAPI ShellExecuteExW32(LPSHELLEXECUTEINFOW psei, SHELL_ExecuteW32 execfunc);
UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
- LPWSTR lpResult, LPWSTR key, void **env, LPITEMIDLIST pidl, LPCWSTR args);
+ LPWSTR lpResult, int resultLen, LPWSTR key, void **env, LPITEMIDLIST pidl, LPCWSTR args);
int WINAPI RestartDialog(HWND hwndOwner, LPCSTR lpstrReason, UINT uFlags);
int WINAPI RestartDialogEx(HWND hwndOwner, LPCWSTR lpwstrReason, UINT uFlags, UINT uReason);
reactos/lib/shell32
diff -u -r1.10 -r1.11
--- shelllink.c 21 Jan 2004 23:01:35 -0000 1.10
+++ shelllink.c 4 Mar 2004 21:12:11 -0000 1.11
@@ -671,7 +671,7 @@
*exePath = '\0';
if (This->sPath)
- SHELL_FindExecutable(NULL, This->sPath, wOpen, exePath, NULL, NULL, NULL, NULL);
+ SHELL_FindExecutable(NULL, This->sPath, wOpen, exePath, MAX_PATH, NULL, NULL, NULL, NULL);
/* if there's no PIDL, generate one */
if( ! This->pPidl )
reactos/lib/shell32
diff -u -r1.25 -r1.26
--- shlexec.c 3 Mar 2004 20:11:31 -0000 1.25
+++ shlexec.c 4 Mar 2004 21:12:11 -0000 1.26
@@ -503,7 +503,7 @@
* on the operation)
*/
UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
- LPWSTR lpResult, LPWSTR key, void **env, LPITEMIDLIST pidl, LPCWSTR args)
+ LPWSTR lpResult, int resultLen, LPWSTR key, void **env, LPITEMIDLIST pidl, LPCWSTR args)
{
static const WCHAR wWindows[] = {'w','i','n','d','o','w','s',0};
static const WCHAR wPrograms[] = {'p','r','o','g','r','a','m','s',0};
@@ -660,7 +660,7 @@
if (retval > 32)
{
- SHELL_ArgifyW(lpResult, MAX_PATH, command, xlpFile, pidl, args);
+ SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args);
/* Remove double quotation marks and command line arguments */
if (*lpResult == '"')
@@ -908,7 +908,7 @@
SetCurrentDirectoryW(lpDirectory);
}
- retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, lpResult, NULL, NULL, NULL, NULL);
+ retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, lpResult, MAX_PATH, NULL, NULL, NULL, NULL);
TRACE("returning %s\n", debugstr_w(lpResult));
if (lpDirectory)
@@ -1187,7 +1187,7 @@
/* Else, try to find the executable */
buffer[0] = '\0';
- retval = SHELL_FindExecutable(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, lpFile, sei_tmp.lpVerb, buffer, wszProtocol, &env, sei_tmp.lpIDList, sei_tmp.lpParameters);
+ retval = SHELL_FindExecutable(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, lpFile, sei_tmp.lpVerb, buffer, 1024, wszProtocol, &env, sei_tmp.lpIDList, sei_tmp.lpParameters);
if (retval > 32) /* Found */
{