https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a3db976a21f5378b4c840219f668404bdf852b1
commit 8a3db976a21f5378b4c840219f668404bdf852b1 Author: Thamatip Chitpong <[email protected]> AuthorDate: Thu Jun 30 20:10:47 2022 +0700 Commit: GitHub <[email protected]> CommitDate: Thu Jun 30 16:10:47 2022 +0300 [EXPLORER] Fix taskbar icon display problem (#4538) - Use SMTO_NOTIMEOUTIFNOTHUNG to get the icon with least timeout. - Replace GCL_* consts with GCLP_* since we're using GetClassLongPtr. Now the icon is correctly displayed for control panel applets. CORE-18137 --- base/shell/explorer/taskswnd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index e7f224ea136..da260dbc3e2 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -491,7 +491,7 @@ public: { HICON hIcon = NULL; #define GET_ICON(type) \ - SendMessageTimeout(hwnd, WM_GETICON, (type), 0, SMTO_ABORTIFHUNG, 100, (PDWORD_PTR)&hIcon) + SendMessageTimeout(hwnd, WM_GETICON, (type), 0, SMTO_NOTIMEOUTIFNOTHUNG, 100, (PDWORD_PTR)&hIcon) LRESULT bAlive = GET_ICON(ICON_SMALL2); if (hIcon) @@ -512,11 +512,11 @@ public: } #undef GET_ICON - hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); + hIcon = (HICON)GetClassLongPtr(hwnd, GCLP_HICONSM); if (hIcon) return hIcon; - return (HICON)GetClassLongPtr(hwnd, GCL_HICON); + return (HICON)GetClassLongPtr(hwnd, GCLP_HICON); } INT UpdateTaskItemButton(IN PTASK_ITEM TaskItem)
