Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 00:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
- Port CommandLineToArgvW fixes from Wine. Fixes crash in shell32:shlexec test.

svn path=/trunk/; revision=56587
This commit is contained in:
Thomas Faber 2012-05-14 19:26:40 +00:00
parent cb383858f1
commit 87fa6c0693
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/dll/win32/shell32/shell32_main.cpp
View file

@ -66,27 +66,34 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
LPWSTR cmdline;
int in_quotes,bcount;
if(!numargs)
{
SetLastError(ERROR_INVALID_PARAMETER);
return NULL;
}
if (*lpCmdline==0)
{
/* Return the path to the executable */
DWORD len, size=16;
DWORD len, deslen=MAX_PATH, size;
argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, size);
size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR);
for (;;)
{
len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR));
if (!(argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, size))) return NULL;
len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen);
if (!len)
{
LocalFree(argv);
return NULL;
}
if (len < size) break;
size*=2;
argv = (LPWSTR *)LocalReAlloc(argv, size, 0);
if (len < deslen) break;
deslen*=2;
size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR);
LocalFree( argv );
}
argv[0]=(LPWSTR)(argv+1);
if (numargs)
*numargs=1;
*numargs=1;
return argv;
}
@ -133,11 +140,9 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
/* Allocate in a single lump, the string array, and the strings that go with it.
* This way the caller can make a single GlobalFree call to free both, as per MSDN.
*/
argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR));
argv=(LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR));
if (!argv)
return NULL;
cmdline=(LPWSTR)(argv+argc);
wcscpy(cmdline, lpCmdline);
@ -203,8 +208,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
*d='\0';
argv[argc++]=arg;
}
if (numargs)
*numargs=argc;
*numargs=argc;
return argv;
}