https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67f7971fa25d9a2a88419…
commit 67f7971fa25d9a2a88419138f752aff6d9dbd8eb
Author: Thamatip Chitpong <tangaming123456(a)outlook.com>
AuthorDate: Wed Sep 14 21:29:29 2022 +0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Wed Sep 14 23:29:29 2022 +0900
[INPUT] Fix taskbar icon and remove small icon hack (#4688)
- Use int for applet index (like other CPLs).
- Revert some changes from 976d48b.
---
dll/cpl/input/input.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/dll/cpl/input/input.c b/dll/cpl/input/input.c
index b4c292e8b82..d621f2f9cf7 100644
--- a/dll/cpl/input/input.c
+++ b/dll/cpl/input/input.c
@@ -39,22 +39,13 @@ static int CALLBACK
PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam)
{
// NOTE: This callback is needed to set large icon correctly.
- // FIXME: Handle leaks
- HICON hIcon, hIconSmall;
+ HICON hIcon;
switch (uMsg)
{
case PSCB_INITIALIZED:
{
hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM));
SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
-
- hIconSmall = (HICON)LoadImageW(hApplet,
- MAKEINTRESOURCEW(IDI_CPLSYSTEM),
- IMAGE_ICON,
- GetSystemMetrics(SM_CXSMICON),
- GetSystemMetrics(SM_CYSMICON),
- 0);
- SendMessageW(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall);
break;
}
}
@@ -96,9 +87,9 @@ LONG CALLBACK
CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
{
CPLINFO *CPlInfo;
- DWORD i;
+ int i;
- i = (DWORD)lParam1;
+ i = (int)lParam1;
switch (uMsg)
{