Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-21 03:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand an environment variable only if its value got at least two percent characters.

Browse source 
svn path=/trunk/; revision=30035
This commit is contained in:
Eric Kohl 2007-11-01 11:45:14 +00:00
parent a03d9e441c
commit 1308d46688
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/cpl/sysdm/environment.c
View file

@ -56,6 +56,8 @@ EditVariableDlgProc(HWND hwndDlg,
dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0);
if (dwNameLength > 0 && dwValueLength > 0) if (dwNameLength > 0 && dwValueLength > 0)
{ {
LPTSTR p;
if (VarData->lpName == NULL) if (VarData->lpName == NULL)
{ {
VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR));
@ -84,7 +86,8 @@ EditVariableDlgProc(HWND hwndDlg,
VarData->lpCookedValue = NULL; VarData->lpCookedValue = NULL;
} }
if (_tcschr(VarData->lpRawValue, _T('%'))) p = _tcschr(VarData->lpRawValue, _T('%'));
if (p && _tcschr(++p, _T('%')))
{ {
VarData->dwType = REG_EXPAND_SZ; VarData->dwType = REG_EXPAND_SZ;
VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR));
@ -115,7 +118,7 @@ EditVariableDlgProc(HWND hwndDlg,
static VOID static VOID
SetEnvironmentVariables(HWND hwndListView, GetEnvironmentVariables(HWND hwndListView,
HKEY hRootKey, HKEY hRootKey,
LPTSTR lpSubKeyName) LPTSTR lpSubKeyName)
{ {
@ -276,7 +279,7 @@ OnInitDialog(HWND hwndDlg)
SetListViewColumns(hwndListView); SetListViewColumns(hwndListView);
SetEnvironmentVariables(hwndListView, GetEnvironmentVariables(hwndListView,
HKEY_CURRENT_USER, HKEY_CURRENT_USER,
_T("Environment")); _T("Environment"));
@ -294,7 +297,7 @@ OnInitDialog(HWND hwndDlg)
SetListViewColumns(hwndListView); SetListViewColumns(hwndListView);
SetEnvironmentVariables(hwndListView, GetEnvironmentVariables(hwndListView,
HKEY_LOCAL_MACHINE, HKEY_LOCAL_MACHINE,
_T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"));