https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e07dbf782c65fdedfeada94f55814fcfbb6e34ce
commit e07dbf782c65fdedfeada94f55814fcfbb6e34ce Author: Whindmar Saksit <[email protected]> AuthorDate: Mon Nov 13 20:51:52 2023 +0100 Commit: GitHub <[email protected]> CommitDate: Mon Nov 13 20:51:52 2023 +0100 [NETSHELL] Display component icons in list (#5904) Display the class icons for the installed network components. Also fixes a bug where the selection change whacked the checkbox of the first item. Use 0x7fffffff to append the item at the end of the list, as optimization. --- dll/shellext/netshell/lanconnectui.cpp | 44 ++++++++++++++++++++++------------ dll/shellext/netshell/lanconnectui.h | 2 +- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index d0c5b0b2e28..70b72549171 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -26,15 +26,16 @@ CNetConnectionPropertyUi::~CNetConnectionPropertyUi() } VOID -AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName, BOOL bChecked) +AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName, BOOL bChecked, UINT Image) { LVITEMW lvItem; - ZeroMemory(&lvItem, sizeof(lvItem)); - lvItem.mask = LVIF_TEXT | LVIF_PARAM; + lvItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; lvItem.pszText = szName; lvItem.lParam = (LPARAM)pItem; - lvItem.iItem = ListView_GetItemCount(hDlgCtrl); + lvItem.iImage = Image; + lvItem.iItem = 0x7fffffff; // Append at the end of the list. + lvItem.iSubItem = 0; lvItem.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); ListView_SetCheckState(hDlgCtrl, lvItem.iItem, bChecked); } @@ -73,7 +74,7 @@ CNetConnectionPropertyUi::GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent * } VOID -CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type) +CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type, PSP_CLASSIMAGELIST_DATA pCILD) { HRESULT hr; CComPtr<IEnumNetCfgComponent> pENetCfg; @@ -127,7 +128,10 @@ CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GU pItem->pNCfgComp = pNCfgComp.Detach(); pItem->NumPropDialogOpen = 0; - AddItemToListView(hDlgCtrl, pItem, pDisplayName, bChecked); + INT image; + if (!pCILD->ImageList || !SetupDiGetClassImageIndex(pCILD, CompGuid, &image)) + image = I_IMAGENONE; + AddItemToListView(hDlgCtrl, pItem, pDisplayName, bChecked, image); CoTaskMemFree(pDisplayName); } } @@ -143,7 +147,6 @@ CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) RECT rc; DWORD dwStyle; LPWSTR pDisplayName; - LVITEMW li; SendDlgItemMessageW(hwndDlg, IDC_NETCARDNAME, WM_SETTEXT, 0, (LPARAM)m_pProperties->pszwDeviceName); if (m_pProperties->dwCharacter & NCCF_SHOW_ICON) @@ -193,15 +196,26 @@ CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) m_pNCfg = pNCfg; m_NCfgLock = pNCfgLock; - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT); - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE); - EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL); + SP_CLASSIMAGELIST_DATA spcid; + spcid.cbSize = sizeof(spcid); + if (SetupDiGetClassImageList(&spcid)) + { + HIMAGELIST hIL = ImageList_Duplicate(spcid.ImageList); + ListView_SetImageList(hDlgCtrl, hIL, LVSIL_SMALL); + } + else + { + spcid.ImageList = NULL; + } + + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT, &spcid); + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE, &spcid); + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL, &spcid); + + if (spcid.ImageList) + SetupDiDestroyClassImageList(&spcid); - ZeroMemory(&li, sizeof(li)); - li.mask = LVIF_STATE; - li.stateMask = (UINT)-1; - li.state = LVIS_FOCUSED|LVIS_SELECTED; - (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + ListView_SetItemState(hDlgCtrl, 0, -1, LVIS_FOCUSED | LVIS_SELECTED); } VOID diff --git a/dll/shellext/netshell/lanconnectui.h b/dll/shellext/netshell/lanconnectui.h index 0dd7fdc0384..964435b05fe 100644 --- a/dll/shellext/netshell/lanconnectui.h +++ b/dll/shellext/netshell/lanconnectui.h @@ -44,7 +44,7 @@ class CNetConnectionPropertyUi: private: BOOL GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent ** pOut); - VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type); + VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type, PSP_CLASSIMAGELIST_DATA pCILD); VOID InitializeLANPropertiesUIDlg(HWND hwndDlg); VOID ShowNetworkComponentProperties(HWND hwndDlg); BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID);
