Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CPL][DESK] Use shell32 icon directly; follow-up to #2281

Browse source
This commit is contained in:
Katayama Hirofumi MZ 2020-01-28 14:05:51 +09:00
parent cc794e564a
commit c069e5c122
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dll/cpl/desk/background.c
View file

@ -309,6 +309,7 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData)
HRESULT hr;
HICON hIcon;
INT cx, cy;
HINSTANCE hShell32;
hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST);
@ -317,7 +318,11 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData)
cx = GetSystemMetrics(SM_CXSMICON);
cy = GetSystemMetrics(SM_CYSMICON);
himl = ImageList_Create(cx, cy, ILC_COLOR32 | ILC_MASK, 0, 0);
hIcon = (HICON)LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_NONE), IMAGE_ICON, cx, cy, 0);
/* Load (None) icon */
hShell32 = LoadLibraryEx(L"shell32", NULL, LOAD_LIBRARY_AS_DATAFILE);
hIcon = (HICON)LoadImageW(hShell32, MAKEINTRESOURCEW(200), IMAGE_ICON, cx, cy, 0);
FreeLibrary(hShell32);
ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL);

1
dll/cpl/desk/desk.rc
View file

@ -14,7 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDC_DESK_ICON ICON "resources/applet.ico"
IDC_DESK_ICON2 ICON "resources/applet.ico"
IDI_NONE ICON "resources/none.ico"
IDC_MONITOR BITMAP "resources/monitor.bmp"

1
dll/cpl/desk/resource.h
View file

@ -3,7 +3,6 @@
/* ids */
#define IDC_DESK_ICON 40
#define IDC_DESK_ICON2 100 /* Needed for theme compatability with Windows. */
#define IDI_NONE 101
#define IDC_STATIC -1

BIN
dll/cpl/desk/resources/none.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 23 KiB