diff --git a/README.md b/README.md index a03f1ee9..b48e1ff9 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,9 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [2]:** +**Bug fixes and features included in the next upcoming release [3]:** +* Add shell32 placeholder icons to match offsets with Windows ([Wine Bug #30185](https://bugs.winehq.org/show_bug.cgi?id=30185)) * Add stubbed ISWbemSecurity interfaces in wbemdisp * Also handle '\r' as whitespace in wbemprox queries diff --git a/debian/changelog b/debian/changelog index 14884991..531f4a27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ wine-staging (1.7.44) UNRELEASED; urgency=low * Added patch to handle '\r' as whitespace in wbemprox queries. * Added patch with stubbed ISWbemSecurity interfaces in wbemdisp. + * Added patch with shell32 placeholder icons to match offsets with Windows. * Removed patch to reset device state in SysKeyboard*Impl_Acquire (accepted upstream). * Removed patch to avoid creating thread queues for foreign threads in diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 8d970bdc..4a4b08c0 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -217,6 +217,7 @@ patch_enable_all () enable_shdocvw_ParseURLFromOutsideSource_Tests="$1" enable_shell32_Default_Path="$1" enable_shell32_Icons="$1" + enable_shell32_Placeholder_Icons="$1" enable_shell32_Progress_Dialog="$1" enable_shell32_Quoted_ShellExecute="$1" enable_shell32_RunDLL_CallEntry16="$1" @@ -711,6 +712,9 @@ patch_enable () shell32-Icons) enable_shell32_Icons="$2" ;; + shell32-Placeholder_Icons) + enable_shell32_Placeholder_Icons="$2" + ;; shell32-Progress_Dialog) enable_shell32_Progress_Dialog="$2" ;; @@ -2650,18 +2654,6 @@ if test "$enable_dxgi_GetDesc" -eq 1; then ) >> "$patchlist" fi -# Patchset makedep-PARENTSPEC -# | -# | Modified files: -# | * tools/makedep.c -# | -if test "$enable_makedep_PARENTSPEC" -eq 1; then - patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch - ( - echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-DllRedirects # | # | Modified files: @@ -2682,6 +2674,18 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then ) >> "$patchlist" fi +# Patchset makedep-PARENTSPEC +# | +# | Modified files: +# | * tools/makedep.c +# | +if test "$enable_makedep_PARENTSPEC" -eq 1; then + patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch + ( + echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-CSMT_Helper # | # | Modified files: @@ -4859,6 +4863,21 @@ if test "$enable_shell32_Icons" -eq 1; then ) >> "$patchlist" fi +# Patchset shell32-Placeholder_Icons +# | +# | This patchset fixes the following Wine bugs: +# | * [#30185] Add shell32 placeholder icons to match offsets with Windows +# | +# | Modified files: +# | * dlls/shell32/placeholder.ico, dlls/shell32/shell32.rc, dlls/shell32/shresdef.h +# | +if test "$enable_shell32_Placeholder_Icons" -eq 1; then + patch_apply shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch + ( + echo '+ { "Michael Müller", "shell32: Add placeholder icons to match icon offset with XP.", 1 },'; + ) >> "$patchlist" +fi + # Patchset shell32-Progress_Dialog # | # | Modified files: diff --git a/patches/shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch b/patches/shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch new file mode 100644 index 00000000..3c388a8a --- /dev/null +++ b/patches/shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch @@ -0,0 +1,435 @@ +From a26b9ae70df4b2295567e3d8899b7c995f71e6dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Sun, 24 May 2015 00:39:14 +0200 +Subject: shell32: Add placeholder icons to match icon offset with XP. + +--- + dlls/shell32/placeholder.ico | Bin 0 -> 1726 bytes + dlls/shell32/shell32.rc | 170 ++++++++++++++++++++++++++++++++++++++++ + dlls/shell32/shresdef.h | 179 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 349 insertions(+) + create mode 100644 dlls/shell32/placeholder.ico + +diff --git a/dlls/shell32/placeholder.ico b/dlls/shell32/placeholder.ico +new file mode 100644 +index 0000000000000000000000000000000000000000..23b6d9543b9940cdf77804370c5b0670791e2034 +GIT binary patch +literal 1726 +zcmc&!WpEQg6y5|1fg+)}2P?&kJ1y?+TAZTAn^4+oAR$Ny!QI`Rpe^q1+G2qOk`@VV +z(loc+cb%IF`N2Rl414q4zI*Tc-g~#Vw}gm@m`J6Bn_ +z1#mu&LS!7k;|CY>^GyTiM1V*n5~5Hjh+eNJDwT?8G@9Q69B`q5RxXzlgTX+oRx6>D +z5|(B88MY^c7`V_ttJP|W-EQY=noK5M<8U~L)9L&L@F5>K=n)!d)oL~GHyVw6UuLtJ +ze|EWC{0xm?BZl6=g&$hvf{osUxO)yyEn>oZ2x|qs(4S`x#5{ch*IkeIb+4t<>4?Q* +z;Q`ydCvcJ1QxBhz!)CJ)rBcZQwtMVf>4n6zZ*2HtI{&fA)`~AG#Ki=+NZ~q@} +z|KBfPzkRp;NJ_RlQkJ9h5cy=U*f +z{rZKA7B5-4Z25|nt5&aByKa57a>h)RdX{GPoVoL~^K}cxPnbAq@|3CJa>cZW>5);) +zz(IqD3>`LnMCiy-qsNRL7uKnBm#*Eq_vqQHcb~rf`VR;RZrr44v*s;Ywrbs`ZM*gz +zItEs)R=q~eTD9xctyjN6!$v`}5+zHOF5_P|pj`P16)RP)BF*KOJ5Szx`3n>*RJcgd +zV#SF_oFSu6rp%HoS$(r*&yh3jU`+oV=d6rFFbAB!7||Srb5_jR00#ClMi8Z`A(WWFf7Z&x>zRO$ufz_ER&qbGR}CGamBKXaKVNTF>t_zhSMSk +Sav>*jqXufBCSUwN-+lt}Wmw<< + +literal 0 +HcmV?d00001 + +diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc +index 847d2ce..2274997 100644 +--- a/dlls/shell32/shell32.rc ++++ b/dlls/shell32/shell32.rc +@@ -421,6 +421,176 @@ IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico + /* @makedep: mydocs.ico */ + IDI_SHELL_FAVORITES ICON mydocs.ico + ++/* placeholder icons to correct icon index */ ++IDI_SHELL_PLACEHOLDER2 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER3 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER21 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER22 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER25 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER26 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER27 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER28 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER34 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER37 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER40 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER41 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER42 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER43 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER44 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER45 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER46 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER47 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER48 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER49 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER50 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER51 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER52 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER53 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER54 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER133 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER134 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER135 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER137 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER138 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER139 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER143 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER144 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER145 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER146 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER147 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER148 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER151 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER152 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER153 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER154 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER155 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER156 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER157 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER160 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER165 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER166 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER167 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER171 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER172 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER173 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER174 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER175 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER176 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER177 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER178 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER179 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER180 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER181 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER182 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER183 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER184 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER185 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER186 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER187 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER191 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER192 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER193 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER194 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER196 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER197 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER198 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER199 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER200 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER210 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER220 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER221 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER222 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER223 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER224 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER225 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER226 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER227 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER228 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER229 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER230 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER231 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER232 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER233 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER234 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER236 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER237 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER238 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER239 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER240 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER241 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER242 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER243 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER244 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER245 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER246 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER247 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER248 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER249 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER250 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER251 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER252 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER253 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER254 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER255 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER256 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER257 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER258 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER259 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER260 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER261 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER262 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER263 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER264 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER265 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER266 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER267 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER268 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER269 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER270 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER271 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER272 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER273 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER274 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER275 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER276 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER277 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER278 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER279 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER281 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER282 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER283 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER284 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER289 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER290 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER291 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER292 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER293 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER294 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER295 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER296 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER297 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER298 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER299 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER300 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER301 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER302 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER303 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER304 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER305 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER306 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER307 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER308 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER309 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER310 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER311 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER312 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER313 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER314 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER315 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER316 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER317 ICON placeholder.ico ++IDI_SHELL_PLACEHOLDER318 ICON placeholder.ico ++ + /* @makedep: idb_tb_large.bmp */ + IDB_TB_LARGE_LIGHT BITMAP idb_tb_large.bmp + +diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h +index 183a75e..ddae063 100644 +--- a/dlls/shell32/shresdef.h ++++ b/dlls/shell32/shresdef.h +@@ -166,6 +166,8 @@ + #define IDD_TREEVIEW 0x3741 + + #define IDI_SHELL_DOCUMENT 1 ++#define IDI_SHELL_PLACEHOLDER2 2 ++#define IDI_SHELL_PLACEHOLDER3 3 + #define IDI_SHELL_FOLDER 4 + #define IDI_SHELL_FOLDER_OPEN 5 + #define IDI_SHELL_5_12_FLOPPY 6 +@@ -183,25 +185,202 @@ + #define IDI_SHELL_MY_NETWORK_PLACES 18 + #define IDI_SHELL_COMPUTERS_NEAR_ME 19 + #define IDI_SHELL_FOLDER_SMALL_XP 20 ++#define IDI_SHELL_PLACEHOLDER21 21 ++#define IDI_SHELL_PLACEHOLDER22 22 + #define IDI_SHELL_SEARCH 23 + #define IDI_SHELL_HELP 24 ++#define IDI_SHELL_PLACEHOLDER25 25 ++#define IDI_SHELL_PLACEHOLDER26 26 ++#define IDI_SHELL_PLACEHOLDER27 27 ++#define IDI_SHELL_PLACEHOLDER28 28 + #define IDI_SHELL_FOLDER_OPEN_LARGE 29 + #define IDI_SHELL_SHORTCUT 30 + #define IDI_SHELL_FOLDER_OPEN_SMALL 31 + #define IDI_SHELL_EMPTY_RECYCLE_BIN 32 + #define IDI_SHELL_FULL_RECYCLE_BIN 33 ++#define IDI_SHELL_PLACEHOLDER34 34 + #define IDI_SHELL_DESKTOP 35 + #define IDI_SHELL_CONTROL_PANEL 36 ++#define IDI_SHELL_PLACEHOLDER37 37 + #define IDI_SHELL_PRINTERS_FOLDER 38 + #define IDI_SHELL_FONTS_FOLDER 39 ++#define IDI_SHELL_PLACEHOLDER40 40 ++#define IDI_SHELL_PLACEHOLDER41 41 ++#define IDI_SHELL_PLACEHOLDER42 42 ++#define IDI_SHELL_PLACEHOLDER43 43 ++#define IDI_SHELL_PLACEHOLDER44 44 ++#define IDI_SHELL_PLACEHOLDER45 45 ++#define IDI_SHELL_PLACEHOLDER46 46 ++#define IDI_SHELL_PLACEHOLDER47 47 ++#define IDI_SHELL_PLACEHOLDER48 48 ++#define IDI_SHELL_PLACEHOLDER49 49 ++#define IDI_SHELL_PLACEHOLDER50 50 ++#define IDI_SHELL_PLACEHOLDER51 51 ++#define IDI_SHELL_PLACEHOLDER52 52 ++#define IDI_SHELL_PLACEHOLDER53 53 ++#define IDI_SHELL_PLACEHOLDER54 54 ++/* 55 - 132 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER133 133 ++#define IDI_SHELL_PLACEHOLDER134 134 ++#define IDI_SHELL_PLACEHOLDER135 135 ++/* 136 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER137 137 ++#define IDI_SHELL_PLACEHOLDER138 138 ++#define IDI_SHELL_PLACEHOLDER139 139 + #define IDI_SHELL_REMOTE_PRINTER 140 + #define IDI_SHELL_TO_FILE_PRINTER 141 + #define IDI_SHELL_TRASH_FILE 142 ++#define IDI_SHELL_PLACEHOLDER143 143 ++#define IDI_SHELL_PLACEHOLDER144 144 ++#define IDI_SHELL_PLACEHOLDER145 145 ++#define IDI_SHELL_PLACEHOLDER146 146 ++#define IDI_SHELL_PLACEHOLDER147 147 ++#define IDI_SHELL_PLACEHOLDER148 148 ++/* 149 - 150 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER151 151 ++#define IDI_SHELL_PLACEHOLDER152 152 ++#define IDI_SHELL_PLACEHOLDER153 153 ++#define IDI_SHELL_PLACEHOLDER154 154 ++#define IDI_SHELL_PLACEHOLDER155 155 ++#define IDI_SHELL_PLACEHOLDER156 156 ++#define IDI_SHELL_PLACEHOLDER157 157 ++/* 158 - 159 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER160 160 + #define IDI_SHELL_CONFIRM_DELETE 161 ++/* 162 - 164 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER165 165 ++#define IDI_SHELL_PLACEHOLDER166 166 ++#define IDI_SHELL_PLACEHOLDER167 167 + #define IDI_SHELL_DEFAULT_PRINTER 168 + #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 + #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 ++#define IDI_SHELL_PLACEHOLDER171 171 ++#define IDI_SHELL_PLACEHOLDER172 172 ++#define IDI_SHELL_PLACEHOLDER173 173 ++#define IDI_SHELL_PLACEHOLDER174 174 ++#define IDI_SHELL_PLACEHOLDER175 175 ++#define IDI_SHELL_PLACEHOLDER176 176 ++#define IDI_SHELL_PLACEHOLDER177 177 ++#define IDI_SHELL_PLACEHOLDER178 178 ++#define IDI_SHELL_PLACEHOLDER179 179 ++#define IDI_SHELL_PLACEHOLDER180 180 ++#define IDI_SHELL_PLACEHOLDER181 181 ++#define IDI_SHELL_PLACEHOLDER182 182 ++#define IDI_SHELL_PLACEHOLDER183 183 ++#define IDI_SHELL_PLACEHOLDER184 184 ++#define IDI_SHELL_PLACEHOLDER185 185 ++#define IDI_SHELL_PLACEHOLDER186 186 ++#define IDI_SHELL_PLACEHOLDER187 187 ++/* 188 - 190 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER191 191 ++#define IDI_SHELL_PLACEHOLDER192 192 ++#define IDI_SHELL_PLACEHOLDER193 193 ++#define IDI_SHELL_PLACEHOLDER194 194 ++/* 195 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER196 196 ++#define IDI_SHELL_PLACEHOLDER197 197 ++#define IDI_SHELL_PLACEHOLDER198 198 ++#define IDI_SHELL_PLACEHOLDER199 199 ++#define IDI_SHELL_PLACEHOLDER200 200 ++/* 201 - 209 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER210 210 ++/* 211 - 219 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER220 220 ++#define IDI_SHELL_PLACEHOLDER221 221 ++#define IDI_SHELL_PLACEHOLDER222 222 ++#define IDI_SHELL_PLACEHOLDER223 223 ++#define IDI_SHELL_PLACEHOLDER224 224 ++#define IDI_SHELL_PLACEHOLDER225 225 ++#define IDI_SHELL_PLACEHOLDER226 226 ++#define IDI_SHELL_PLACEHOLDER227 227 ++#define IDI_SHELL_PLACEHOLDER228 228 ++#define IDI_SHELL_PLACEHOLDER229 229 ++#define IDI_SHELL_PLACEHOLDER230 230 ++#define IDI_SHELL_PLACEHOLDER231 231 ++#define IDI_SHELL_PLACEHOLDER232 232 ++#define IDI_SHELL_PLACEHOLDER233 233 ++#define IDI_SHELL_PLACEHOLDER234 234 + #define IDI_SHELL_MY_DOCUMENTS 235 ++#define IDI_SHELL_PLACEHOLDER236 236 ++#define IDI_SHELL_PLACEHOLDER237 237 ++#define IDI_SHELL_PLACEHOLDER238 238 ++#define IDI_SHELL_PLACEHOLDER239 239 ++#define IDI_SHELL_PLACEHOLDER240 240 ++#define IDI_SHELL_PLACEHOLDER241 241 ++#define IDI_SHELL_PLACEHOLDER242 242 ++#define IDI_SHELL_PLACEHOLDER243 243 ++#define IDI_SHELL_PLACEHOLDER244 244 ++#define IDI_SHELL_PLACEHOLDER245 245 ++#define IDI_SHELL_PLACEHOLDER246 246 ++#define IDI_SHELL_PLACEHOLDER247 247 ++#define IDI_SHELL_PLACEHOLDER248 248 ++#define IDI_SHELL_PLACEHOLDER249 249 ++#define IDI_SHELL_PLACEHOLDER250 250 ++#define IDI_SHELL_PLACEHOLDER251 251 ++#define IDI_SHELL_PLACEHOLDER252 252 ++#define IDI_SHELL_PLACEHOLDER253 253 ++#define IDI_SHELL_PLACEHOLDER254 254 ++#define IDI_SHELL_PLACEHOLDER255 255 ++#define IDI_SHELL_PLACEHOLDER256 256 ++#define IDI_SHELL_PLACEHOLDER257 257 ++#define IDI_SHELL_PLACEHOLDER258 258 ++#define IDI_SHELL_PLACEHOLDER259 259 ++#define IDI_SHELL_PLACEHOLDER260 260 ++#define IDI_SHELL_PLACEHOLDER261 261 ++#define IDI_SHELL_PLACEHOLDER262 262 ++#define IDI_SHELL_PLACEHOLDER263 263 ++#define IDI_SHELL_PLACEHOLDER264 264 ++#define IDI_SHELL_PLACEHOLDER265 265 ++#define IDI_SHELL_PLACEHOLDER266 266 ++#define IDI_SHELL_PLACEHOLDER267 267 ++#define IDI_SHELL_PLACEHOLDER268 268 ++#define IDI_SHELL_PLACEHOLDER269 269 ++#define IDI_SHELL_PLACEHOLDER270 270 ++#define IDI_SHELL_PLACEHOLDER271 271 ++#define IDI_SHELL_PLACEHOLDER272 272 ++#define IDI_SHELL_PLACEHOLDER273 273 ++#define IDI_SHELL_PLACEHOLDER274 274 ++#define IDI_SHELL_PLACEHOLDER275 275 ++#define IDI_SHELL_PLACEHOLDER276 276 ++#define IDI_SHELL_PLACEHOLDER277 277 ++#define IDI_SHELL_PLACEHOLDER278 278 ++#define IDI_SHELL_PLACEHOLDER279 279 ++/* 280 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER281 281 ++#define IDI_SHELL_PLACEHOLDER282 282 ++#define IDI_SHELL_PLACEHOLDER283 283 ++#define IDI_SHELL_PLACEHOLDER284 284 ++/* 285 - 288 not used on Windows */ ++#define IDI_SHELL_PLACEHOLDER289 289 ++#define IDI_SHELL_PLACEHOLDER290 290 ++#define IDI_SHELL_PLACEHOLDER291 291 ++#define IDI_SHELL_PLACEHOLDER292 292 ++#define IDI_SHELL_PLACEHOLDER293 293 ++#define IDI_SHELL_PLACEHOLDER294 294 ++#define IDI_SHELL_PLACEHOLDER295 295 ++#define IDI_SHELL_PLACEHOLDER296 296 ++#define IDI_SHELL_PLACEHOLDER297 297 ++#define IDI_SHELL_PLACEHOLDER298 298 ++#define IDI_SHELL_PLACEHOLDER299 299 ++#define IDI_SHELL_PLACEHOLDER300 300 ++#define IDI_SHELL_PLACEHOLDER301 301 ++#define IDI_SHELL_PLACEHOLDER302 302 ++#define IDI_SHELL_PLACEHOLDER303 303 ++#define IDI_SHELL_PLACEHOLDER304 304 ++#define IDI_SHELL_PLACEHOLDER305 305 ++#define IDI_SHELL_PLACEHOLDER306 306 ++#define IDI_SHELL_PLACEHOLDER307 307 ++#define IDI_SHELL_PLACEHOLDER308 308 ++#define IDI_SHELL_PLACEHOLDER309 309 ++#define IDI_SHELL_PLACEHOLDER310 310 ++#define IDI_SHELL_PLACEHOLDER311 311 ++#define IDI_SHELL_PLACEHOLDER312 312 ++#define IDI_SHELL_PLACEHOLDER313 313 ++#define IDI_SHELL_PLACEHOLDER314 314 ++#define IDI_SHELL_PLACEHOLDER315 315 ++#define IDI_SHELL_PLACEHOLDER316 316 ++#define IDI_SHELL_PLACEHOLDER317 317 ++#define IDI_SHELL_PLACEHOLDER318 318 + #define IDI_SHELL_FAVORITES 319 + + /* +-- +2.4.0 + diff --git a/patches/shell32-Placeholder_Icons/definition b/patches/shell32-Placeholder_Icons/definition new file mode 100644 index 00000000..48da54c8 --- /dev/null +++ b/patches/shell32-Placeholder_Icons/definition @@ -0,0 +1 @@ +Fixes: [30185] Add shell32 placeholder icons to match offsets with Windows