ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- creation of empty environment variables should not be possible (tested under Windows XP SP2)

Browse Source 
- dont create variables when cancel is hit
- bug report + patch by Gregor Schneider (aka DosX)
See issue #2600 for more details.

svn path=/trunk/; revision=28583
This commit is contained in:
Johannes Anderwald
2007-08-26 21:42:48 +00:00
parent ac5c71eddd
commit ed306957a1
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/cpl/sysdm/environment.c
+24 -9
View File
@@ -266,6 +266,8 @@ OnInitDialog(HWND hwndDlg)
/* Set user environment variables */
hwndListView = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST);
(void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);
SetListViewColumns(hwndListView);
SetEnvironmentVariables(hwndListView,
@@ -273,12 +275,17 @@ OnInitDialog(HWND hwndDlg)
_T("Environment"));
(void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER);
ListView_SetItemState(hwndListView,0,LVIS_FOCUSED,LVIS_FOCUSED);
(void)ListView_Update(hwndListView,0);
/* Set system environment variables */
hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST);
(void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);
SetListViewColumns(hwndListView);
SetEnvironmentVariables(hwndListView,
@@ -286,6 +293,9 @@ OnInitDialog(HWND hwndDlg)
_T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"));
(void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER);
ListView_SetItemState(hwndListView,0,LVIS_FOCUSED,LVIS_FOCUSED);
(void)ListView_Update(hwndListView,0);
}
@@ -319,17 +329,22 @@ OnNewVariable(HWND hwndDlg,
GlobalFree(VarData->lpCookedValue);
GlobalFree(VarData);
}
}
else
{
if(VarData->lpName != NULL && (VarData->lpCookedValue || VarData->lpRawValue))
{
memset(&lvi, 0x00, sizeof(lvi));
lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM;
lvi.lParam = (LPARAM)VarData;
lvi.pszText = VarData->lpName;
lvi.state = 0;
iItem = ListView_InsertItem(hwndListView, &lvi);
memset(&lvi, 0x00, sizeof(lvi));
lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM;
lvi.lParam = (LPARAM)VarData;
lvi.pszText = VarData->lpName;
lvi.state = 0;
iItem = ListView_InsertItem(hwndListView, &lvi);
ListView_SetItemText(hwndListView, iItem, 1,
ListView_SetItemText(hwndListView, iItem, 1,
(VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue);
}
}
}