Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge Wine commit about:

Browse source 
Modified files:
	dlls/shell32   : shlexec.c

Log message:
	Martin Fuchs <martin-fuchs@gmx.net>
	Fix buffer length usage for RegQueryValueW() calls at various places.

Patch: http://cvs.winehq.org/patch.py?id=11331

svn path=/trunk/; revision=8518
This commit is contained in:
Martin Fuchs 2004-03-03 19:26:58 +00:00
parent 8a70e9b5a5
commit 18f3babce6
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reactos/lib/shell32/shlexec.c
View file

@ -451,14 +451,16 @@ static UINT SHELL_FindExecutableByOperation(LPCWSTR lpPath, LPCWSTR lpFile, LPCW
strcatW(filetype, lpOperation); strcatW(filetype, lpOperation);
strcatW(filetype, wCommand); strcatW(filetype, wCommand);
if (RegQueryValueW(HKEY_CLASSES_ROOT, filetype, command, &commandlen) == ERROR_SUCCESS) if (RegQueryValueW(HKEY_CLASSES_ROOT, filetype, command,
&commandlen) == ERROR_SUCCESS)
{ {
commandlen /= sizeof(WCHAR); commandlen /= sizeof(WCHAR);
if (key) strcpyW(key, filetype); if (key) strcpyW(key, filetype);
#if 0 #if 0
LPSTR tmp; LPWSTR tmp;
char param[256]; WCHAR param[256];
LONG paramlen = 256; LONG paramlen = sizeof(param);
static const WCHAR wSpace[] = {' ',0};
/* FIXME: it seems all Windows version don't behave the same here. /* FIXME: it seems all Windows version don't behave the same here.
* the doc states that this ddeexec information can be found after * the doc states that this ddeexec information can be found after
@ -467,14 +469,15 @@ static UINT SHELL_FindExecutableByOperation(LPCWSTR lpPath, LPCWSTR lpFile, LPCW
*/ */
/* Get the parameters needed by the application /* Get the parameters needed by the application
from the associated ddeexec key */ from the associated ddeexec key */
tmp = strstr(filetype, "command"); tmp = strstrW(filetype, wCommand);
tmp[0] = '\0'; tmp[0] = '\0';
strcat(filetype, "ddeexec"); strcatW(filetype, wDdeexec);
if (RegQueryValueW(HKEY_CLASSES_ROOT, filetype, param,
if (RegQueryValueA(HKEY_CLASSES_ROOT, filetype, param, &paramlen) == ERROR_SUCCESS) &paramlen) == ERROR_SUCCESS)
{ {
strcat(command, " "); paramlen /= sizeof(WCHAR);
strcat(command, param); strcatW(command, wSpace);
strcatW(command, param);
commandlen += paramlen; commandlen += paramlen;
} }
#endif #endif
@ -511,7 +514,7 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
WCHAR *extension = NULL; /* pointer to file extension */ WCHAR *extension = NULL; /* pointer to file extension */
WCHAR wtmpext[5]; /* local copy to mung as we please */ WCHAR wtmpext[5]; /* local copy to mung as we please */
WCHAR filetype[256]; /* registry name for this filetype */ WCHAR filetype[256]; /* registry name for this filetype */
LONG filetypelen = 256; /* length of above */ LONG filetypelen = sizeof(filetype); /* length of above */
WCHAR command[256]; /* command from registry */ WCHAR command[256]; /* command from registry */
WCHAR wBuffer[256]; /* Used to GetProfileString */ WCHAR wBuffer[256]; /* Used to GetProfileString */
UINT retval = 31; /* default - 'No association was found' */ UINT retval = 31; /* default - 'No association was found' */
@ -652,7 +655,6 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
if (retval > 32) if (retval > 32)
break; break;
} }
RegCloseKey(hkey); RegCloseKey(hkey);
} }
} }
@ -748,7 +750,7 @@ static unsigned dde_connect(WCHAR * key, WCHAR* start, WCHAR* ddeexec,
unsigned ret = 31; unsigned ret = 31;
strcpyW(endkey, wApplication); strcpyW(endkey, wApplication);
applen = sizeof(app); /* buffer length for RegQueryValueW() is in bytes! */ applen = sizeof(app);
if (RegQueryValueW(HKEY_CLASSES_ROOT, key, app, &applen) != ERROR_SUCCESS) if (RegQueryValueW(HKEY_CLASSES_ROOT, key, app, &applen) != ERROR_SUCCESS)
{ {
FIXME("default app name NIY %s\n", debugstr_w(key)); FIXME("default app name NIY %s\n", debugstr_w(key));
@ -833,8 +835,6 @@ static UINT execute_from_key(LPWSTR key, LPCWSTR lpFile, void *env, LPCWSTR szCo
WCHAR param[256]; WCHAR param[256];
LONG paramlen = sizeof(param); LONG paramlen = sizeof(param);
cmdlen /= sizeof(WCHAR);
param[0] = '\0'; param[0] = '\0';
/* Get the parameters needed by the application /* Get the parameters needed by the application
@ -851,6 +851,7 @@ static UINT execute_from_key(LPWSTR key, LPCWSTR lpFile, void *env, LPCWSTR szCo
else else
{ {
/* Is there a replace() function anywhere? */ /* Is there a replace() function anywhere? */
cmdlen /= sizeof(WCHAR);
cmd[cmdlen] = '\0'; cmd[cmdlen] = '\0';
SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline); SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline);
retval = execfunc(param, env, FALSE, psei, psei_out); retval = execfunc(param, env, FALSE, psei, psei_out);