From c0dbde0436544acc9e638e879308aa8aa348f6ce Mon Sep 17 00:00:00 2001 From: Oleg Dubinskiy Date: Wed, 6 Mar 2024 11:56:26 +0100 Subject: [PATCH] [MYDOCS] Add missing icons expected by 3rd party applications (#6576) Add "My Documents" and "My Pictures" icons, with 100 and 101 identifiers accordingly. They are duplicating the icons from shell32. This fixes My Documents desktop icon becoming blank when reverting back to the system default icons after applying 3rd party icon set in Stardock IconPackager 5.1, and also fixes icons of some items in the application preview dialog. It's confirmed that mydocs.dll on Windows XP SP3 and Server 2003 SP2 includes these two icon resources with the said identifiers. The icons there are being an exact copy from shell32 as well. CORE-19471 CORE-14758 --- dll/shellext/mydocs/CMakeLists.txt | 3 ++- dll/shellext/mydocs/mydocs.rc | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/shellext/mydocs/CMakeLists.txt b/dll/shellext/mydocs/CMakeLists.txt index 5c1b170faa5..78d6f8b377e 100644 --- a/dll/shellext/mydocs/CMakeLists.txt +++ b/dll/shellext/mydocs/CMakeLists.txt @@ -3,7 +3,8 @@ spec2def(mydocs.dll mydocs.spec) add_definitions( -D_WINE) -file(GLOB_RECURSE mydocs_rc_deps res/*.*) +set(ICONS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../win32/shell32/res/icons) +file(GLOB_RECURSE mydocs_rc_deps res/*.* ${ICONS_DIR}/235.ico ${ICONS_DIR}/236.ico) add_rc_deps(mydocs.rc ${mydocs_rc_deps}) list(APPEND SOURCE diff --git a/dll/shellext/mydocs/mydocs.rc b/dll/shellext/mydocs/mydocs.rc index a16fc6bc3e6..ec24cb9414b 100644 --- a/dll/shellext/mydocs/mydocs.rc +++ b/dll/shellext/mydocs/mydocs.rc @@ -16,6 +16,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +100 ICON "../../win32/shell32/res/icons/235.ico" // IDI_SHELL_MY_DOCUMENTS +101 ICON "../../win32/shell32/res/icons/236.ico" // IDI_SHELL_MY_PICTURES + IDR_MYDOCS REGISTRY "res/mydocs.rgs" #ifdef LANGUAGE_DE_DE