Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 12:03:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Don't set a desktop.ini folder icon on WinDir and System32 (#7933)

Browse source 
wine 332b90c0064563a9e4f67fb2d9b26a940e5e745c removed the whole icon member on their side.

CORE-19037
This commit is contained in:
Whindmar Saksit 2025-04-27 01:06:32 +02:00 • committed by GitHub
parent 0a6bcfc9ff
commit bd2d3b8603
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
dll/win32/shell32/wine/shellpath.c
View file

@ -1229,11 +1229,7 @@ static const CSIDL_DATA CSIDL_Data[] =
CSIDL_Type_User,
L"Desktop",
MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY),
#ifdef __REACTOS__
0
#else
-IDI_SHELL_DESKTOP
#endif
},
{ /* 0x01 - CSIDL_INTERNET */
&FOLDERID_InternetFolder,
@ -1246,11 +1242,7 @@ static const CSIDL_DATA CSIDL_Data[] =
CSIDL_Type_User,
L"Programs",
MAKEINTRESOURCEW(IDS_PROGRAMS),
#ifdef __REACTOS__
0
#else
-IDI_SHELL_PROGRAMS_FOLDER
#endif
},
{ /* 0x03 - CSIDL_CONTROLS (.CPL files) */
&FOLDERID_ControlPanelFolder,
@ -1352,11 +1344,7 @@ static const CSIDL_DATA CSIDL_Data[] =
CSIDL_Type_User,
L"Desktop",
MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY),
#ifdef __REACTOS__
0
#else
-IDI_SHELL_DESKTOP
#endif
},
{ /* 0x11 - CSIDL_DRIVES */
&FOLDERID_ComputerFolder,
@ -1404,11 +1392,7 @@ static const CSIDL_DATA CSIDL_Data[] =
CSIDL_Type_AllUsers,
L"Common Programs",
MAKEINTRESOURCEW(IDS_PROGRAMS),
#ifdef __REACTOS__
0
#else
-IDI_SHELL_PROGRAMS_FOLDER
#endif
},
{ /* 0x18 - CSIDL_COMMON_STARTUP */
&FOLDERID_CommonStartup,
@ -1421,11 +1405,7 @@ static const CSIDL_DATA CSIDL_Data[] =
CSIDL_Type_AllUsers,
L"Common Desktop",
MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY),
#ifdef __REACTOS__
0
#else
-IDI_SHELL_DESKTOP
#endif
},
{ /* 0x1a - CSIDL_APPDATA */
&FOLDERID_RoamingAppData,
@ -1494,25 +1474,21 @@ static const CSIDL_DATA CSIDL_Data[] =
CSIDL_Type_WindowsPath,
L"Windows",
NULL,
-IDI_SHELL_SYSTEM_GEAR
0
},
{ /* 0x25 - CSIDL_SYSTEM */
&FOLDERID_System,
CSIDL_Type_SystemPath,
L"System",
NULL,
-IDI_SHELL_SYSTEM_GEAR
0
},
{ /* 0x26 - CSIDL_PROGRAM_FILES */
&FOLDERID_ProgramFiles,
CSIDL_Type_CurrVer,
L"ProgramFiles",
MAKEINTRESOURCEW(IDS_PROGRAM_FILES),
#ifdef __REACTOS__
0
#else
-IDI_SHELL_PROGRAMS_FOLDER
#endif
},
{ /* 0x27 - CSIDL_MYPICTURES */
&FOLDERID_Pictures,
@ -1543,21 +1519,21 @@ static const CSIDL_DATA CSIDL_Data[] =
CSIDL_Type_CurrVer,
L"ProgramFilesX86",
L"Program Files (x86)",
-IDI_SHELL_PROGRAMS_FOLDER
0
},
{ /* 0x2b - CSIDL_PROGRAM_FILES_COMMON */
&FOLDERID_ProgramFilesCommon,
CSIDL_Type_CurrVer,
L"ProgramFilesCommon",
MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON),
-IDI_SHELL_PROGRAMS_FOLDER
0
},
{ /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */
&FOLDERID_ProgramFilesCommonX86,
CSIDL_Type_CurrVer,
L"ProgramFilesCommonX86",
L"Program Files (x86)\\Common Files",
-IDI_SHELL_PROGRAMS_FOLDER
0
},
{ /* 0x2d - CSIDL_COMMON_TEMPLATES */
&FOLDERID_CommonTemplates,