ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Fix DoEnvironmentSubstA implementation.

This commit is contained in:
Detlef Riekenberg 2012-12-04 11:38:01 +01:00 committed by Alexandre Julliard
parent ff2f494195
commit 1708adeb97
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/shell32/shellord.c
View File

@ -1592,37 +1592,31 @@ BOOL WINAPI SHValidateUNC (HWND hwndOwner, PWSTR pszFile, UINT fConnect)
/************************************************************************ /************************************************************************
* DoEnvironmentSubstA [SHELL32.@] * DoEnvironmentSubstA [SHELL32.@]
* *
* Replace %KEYWORD% in the str with the value of variable KEYWORD * See DoEnvironmentSubstW.
* from environment. If it is not found the %KEYWORD% is left
* intact. If the buffer is too small, str is not modified.
*
* PARAMS
* pszString [I] '\0' terminated string with %keyword%.
* [O] '\0' terminated string with %keyword% substituted.
* cchString [I] size of str.
*
* RETURNS
* cchString length in the HIWORD;
* TRUE in LOWORD if subst was successful and FALSE in other case
*/ */
DWORD WINAPI DoEnvironmentSubstA(LPSTR pszString, UINT cchString) DWORD WINAPI DoEnvironmentSubstA(LPSTR pszString, UINT cchString)
{ {
LPSTR dst; LPSTR dst;
BOOL res = FALSE; BOOL res = FALSE;
FIXME("(%s, %d) stub\n", debugstr_a(pszString), cchString); DWORD len = cchString;
if (pszString == NULL) /* Really return 0? */
return 0; TRACE("(%s, %d)\n", debugstr_a(pszString), cchString);
if ((dst = HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(CHAR)))) if ((dst = HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(CHAR))))
{ {
DWORD num = ExpandEnvironmentStringsA(pszString, dst, cchString); len = ExpandEnvironmentStringsA(pszString, dst, cchString);
if (num && num < cchString) /* dest buffer is too small */ /* len includes the terminating 0 */
if (len && len < cchString)
{ {
res = TRUE; res = TRUE;
memcpy(pszString, dst, num); memcpy(pszString, dst, len);
} }
else
len = cchString;
HeapFree(GetProcessHeap(), 0, dst); HeapFree(GetProcessHeap(), 0, dst);
} }
return MAKELONG(res,cchString); /* Always cchString? */ return MAKELONG(len, res);
} }
/************************************************************************ /************************************************************************