Create image lists for the groups and users list views and add images to the list...

svn path=/trunk/; revision=31429

diff --git a/reactos/dll/cpl/usrmgr/groups.c b/reactos/dll/cpl/usrmgr/groups.c
index 7778bbc..74b5f8a 100644 (file)
--- a/reactos/dll/cpl/usrmgr/groups.c
+++ b/reactos/dll/cpl/usrmgr/groups.c
@@ -70,10 +70,11 @@ UpdateGroupsList(HWND hwndListView)
         for (i = 0; i < entriesread; i++)\r
         {\r
            memset(&lvi, 0x00, sizeof(lvi));\r
         for (i = 0; i < entriesread; i++)\r
         {\r
            memset(&lvi, 0x00, sizeof(lvi));\r

-           lvi.mask = LVIF_TEXT | LVIF_STATE; // | LVIF_PARAM;\r
+           lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; // | LVIF_PARAM;\r

 //           lvi.lParam = (LPARAM)VarData;\r
            lvi.pszText = pBuffer[i].lgrpi1_name;\r
            lvi.state = 0; //(i == 0) ? LVIS_SELECTED : 0;\r
 //           lvi.lParam = (LPARAM)VarData;\r
            lvi.pszText = pBuffer[i].lgrpi1_name;\r
            lvi.state = 0; //(i == 0) ? LVIS_SELECTED : 0;\r

+           lvi.iImage = 0;\r

            iItem = ListView_InsertItem(hwndListView, &lvi);\r
 \r
            ListView_SetItemText(hwndListView, iItem, 1,\r
            iItem = ListView_InsertItem(hwndListView, &lvi);\r
 \r
            ListView_SetItemText(hwndListView, iItem, 1,\r


@@ -94,9 +95,19 @@ static VOID
 OnInitDialog(HWND hwndDlg)\r
 {\r
     HWND hwndListView;\r
 OnInitDialog(HWND hwndDlg)\r
 {\r
     HWND hwndListView;\r

+    HIMAGELIST hImgList;\r
+    HICON hIcon;\r
+\r
+    /* Create the image list */\r
+    hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5);\r
+    hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_GROUP),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);\r
+    Index[0] = ImageList_AddIcon(hImgList,hIcon);\r
+    DestroyIcon(hIcon);\r

 \r
     hwndListView = GetDlgItem(hwndDlg, IDC_GROUPS_LIST);\r
 \r
 \r
     hwndListView = GetDlgItem(hwndDlg, IDC_GROUPS_LIST);\r
 \r

+    (VOID)ListView_SetImageList(hwndListView, hImgList, LVSIL_SMALL);\r
+\r

     (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);\r
 \r
     SetGroupsListColumns(hwndListView);\r
     (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);\r
 \r
     SetGroupsListColumns(hwndListView);\r

diff --git a/reactos/dll/cpl/usrmgr/users.c b/reactos/dll/cpl/usrmgr/users.c
index c851ac3..69f967c 100644 (file)
--- a/reactos/dll/cpl/usrmgr/users.c
+++ b/reactos/dll/cpl/usrmgr/users.c
@@ -141,10 +141,11 @@ UpdateUsersList(HWND hwndListView)
         for (i = 0; i < entriesread; i++)\r
         {\r
            memset(&lvi, 0x00, sizeof(lvi));\r
         for (i = 0; i < entriesread; i++)\r
         {\r
            memset(&lvi, 0x00, sizeof(lvi));\r

-           lvi.mask = LVIF_TEXT | LVIF_STATE; // | LVIF_PARAM;\r
+           lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; // | LVIF_PARAM;\r

 //           lvi.lParam = (LPARAM)VarData;\r
            lvi.pszText = pBuffer[i].usri20_name;\r
            lvi.state = 0; //(i == 0) ? LVIS_SELECTED : 0;\r
 //           lvi.lParam = (LPARAM)VarData;\r
            lvi.pszText = pBuffer[i].usri20_name;\r
            lvi.state = 0; //(i == 0) ? LVIS_SELECTED : 0;\r

+           lvi.iImage = (pBuffer[i].usri20_flags & UF_ACCOUNTDISABLE) ? 1 : 0;\r

            iItem = ListView_InsertItem(hwndListView, &lvi);\r
 \r
            ListView_SetItemText(hwndListView, iItem, 1,\r
            iItem = ListView_InsertItem(hwndListView, &lvi);\r
 \r
            ListView_SetItemText(hwndListView, iItem, 1,\r


@@ -168,10 +169,21 @@ static VOID
 OnInitDialog(HWND hwndDlg)\r
 {\r
     HWND hwndListView;\r
 OnInitDialog(HWND hwndDlg)\r
 {\r
     HWND hwndListView;\r

+    HIMAGELIST hImgList;\r
+    HICON hIcon;\r
+\r
+    /* Create the image list */\r
+    hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 5, 5);\r
+    hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);\r
+    ImageList_AddIcon(hImgList, hIcon);\r
+    hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOCKED_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);\r
+    ImageList_AddIcon(hImgList, hIcon);\r
+    DestroyIcon(hIcon);\r

 \r
 \r

-    /* Set user environment variables */\r

     hwndListView = GetDlgItem(hwndDlg, IDC_USERS_LIST);\r
 \r
     hwndListView = GetDlgItem(hwndDlg, IDC_USERS_LIST);\r
 \r

+    (VOID)ListView_SetImageList(hwndListView, hImgList, LVSIL_SMALL);\r
+\r

     (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);\r
 \r
     SetUsersListColumns(hwndListView);\r
     (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);\r
 \r
     SetUsersListColumns(hwndListView);\r