From 110a6f6016656460084c2088874807be8f022032 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 20 Aug 2018 20:20:07 -0500 Subject: [PATCH] Rebase against 8204d04b7fd416c1b6296708937e3c06e058809b. --- patches/patchinstall.sh | 8 +- ...eholder-icons-to-match-icon-offset-w.patch | 366 +++++++++--------- ...-toolbar-bitmaps-compatible-with-IE6.patch | 78 ++-- ...d-more-Tango-icons-to-the-IE-toolbar.patch | 28 +- 4 files changed, 237 insertions(+), 243 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9cf3e5ba..b9f0542c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "c698682b3286d72cc7c4c4624b4d14b03dbe6908" + echo "8204d04b7fd416c1b6296708937e3c06e058809b" } # Show version information @@ -6485,7 +6485,7 @@ fi # | * [#30185] Add shell32 placeholder icons to match offsets with Windows # | # | Modified files: -# | * dlls/shell32/placeholder.ico, dlls/shell32/shell32.rc, dlls/shell32/shresdef.h +# | * dlls/shell32/resources/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 @@ -6529,8 +6529,8 @@ fi # | * [#40236] Add missing resources for IE6 buttons # | # | Modified files: -# | * dlls/shell32/Makefile.in, dlls/shell32/ietoolbar.bmp, dlls/shell32/ietoolbar.svg, dlls/shell32/ietoolbar_small.bmp, -# | dlls/shell32/ietoolbar_small.svg, dlls/shell32/shell32.rc +# | * dlls/shell32/Makefile.in, dlls/shell32/resources/ietoolbar.bmp, dlls/shell32/resources/ietoolbar.svg, +# | dlls/shell32/resources/ietoolbar_small.bmp, dlls/shell32/resources/ietoolbar_small.svg, dlls/shell32/shell32.rc # | if test "$enable_shell32_Toolbar_Bitmaps" -eq 1; then patch_apply shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch 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 index e12a9319..12c41407 100644 --- 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 @@ -1,16 +1,16 @@ -From 676f5e3e1b1f88116b542d4a458ec9a72e626c8d Mon Sep 17 00:00:00 2001 +From 60ba2a81dd862811f14539f862dafdf522e270fb 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 | 168 ++++++++++++++++++++++++++++++++++++++++ - dlls/shell32/shresdef.h | 177 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 345 insertions(+) - create mode 100644 dlls/shell32/placeholder.ico + dlls/shell32/resources/placeholder.ico | Bin 0 -> 1726 bytes + dlls/shell32/shell32.rc | 166 +++++++++++++++++++++++++++++++ + dlls/shell32/shresdef.h | 175 +++++++++++++++++++++++++++++++++ + 3 files changed, 341 insertions(+) + create mode 100644 dlls/shell32/resources/placeholder.ico -diff --git a/dlls/shell32/placeholder.ico b/dlls/shell32/placeholder.ico +diff --git a/dlls/shell32/resources/placeholder.ico b/dlls/shell32/resources/placeholder.ico new file mode 100644 index 0000000000000000000000000000000000000000..23b6d9543b9940cdf77804370c5b0670791e2034 GIT binary patch @@ -34,194 +34,188 @@ literal 0 HcmV?d00001 diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc -index 20261de..660ce23 100644 +index 1eb5b16..dce8438 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc -@@ -503,6 +503,174 @@ IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico - /* @makedep: mydocs.ico */ - IDI_SHELL_FAVORITES ICON mydocs.ico +@@ -517,6 +517,172 @@ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico + /* @makedep: resources/mydocs.ico */ + IDI_SHELL_FAVORITES ICON resources/mydocs.ico +/* placeholder icons to correct icon index */ -+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 ++IDI_SHELL_PLACEHOLDER25 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER26 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER27 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER28 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER34 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER37 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER40 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER41 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER42 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER43 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER44 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER45 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER46 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER47 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER48 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER49 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER50 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER51 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER52 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER53 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER54 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER133 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER134 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER135 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER137 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER138 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER139 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER143 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER144 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER145 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER146 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER147 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER148 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER151 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER152 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER153 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER154 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER155 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER156 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER157 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER160 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER165 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER166 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER167 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER171 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER172 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER173 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER174 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER175 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER176 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER177 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER178 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER179 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER180 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER181 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER182 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER183 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER184 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER185 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER186 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER187 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER191 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER192 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER193 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER194 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER196 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER197 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER198 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER199 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER200 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER210 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER220 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER221 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER222 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER223 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER224 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER225 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER226 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER227 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER228 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER229 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER230 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER231 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER232 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER233 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER234 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER236 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER237 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER238 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER239 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER240 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER241 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER242 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER243 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER244 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER245 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER246 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER247 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER248 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER249 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER250 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER251 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER252 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER253 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER254 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER255 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER256 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER257 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER258 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER259 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER260 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER261 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER262 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER263 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER264 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER265 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER266 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER267 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER268 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER269 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER270 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER271 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER272 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER273 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER274 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER275 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER276 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER277 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER278 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER279 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER281 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER282 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER283 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER284 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER289 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER290 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER291 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER292 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER293 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER294 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER295 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER296 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER297 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER298 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER299 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER300 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER301 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER302 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER303 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER304 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER305 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER306 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER307 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER308 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER309 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER310 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER311 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER312 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER313 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER314 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER315 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER316 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER317 ICON resources/placeholder.ico ++IDI_SHELL_PLACEHOLDER318 ICON resources/placeholder.ico + - /* @makedep: idb_tb_large.bmp */ - IDB_TB_LARGE_LIGHT BITMAP idb_tb_large.bmp + /* @makedep: resources/idb_tb_large.bmp */ + IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h -index 1a054ff..e88ed41 100644 +index d352d7c..e566200 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h -@@ -189,25 +189,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 +@@ -193,23 +193,198 @@ + #define IDI_SHELL_SETTINGS 22 #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 +#define IDI_SHELL_PLACEHOLDER25 25 diff --git a/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch b/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch index 7bac579e..a99b9fee 100644 --- a/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch +++ b/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch @@ -1,4 +1,4 @@ -From 6f6773527923a6f1de164edd2cb6e564cc8a2576 Mon Sep 17 00:00:00 2001 +From 276fddccbf8cd4dba81da097d777f0afbef193bd Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 2 Mar 2016 16:36:33 +0800 Subject: shell32: Add toolbar bitmaps compatible with IE6. @@ -8,32 +8,32 @@ and scaled down copies of dlls/ieframe/ietoolbar.svg: ietoolbar.svg - 384x24 ietoolbar_small.svg - 256x16 --- - dlls/shell32/Makefile.in | 2 + - dlls/shell32/ietoolbar.bmp | Bin 0 -> 37002 bytes - dlls/shell32/ietoolbar.svg | 1782 ++++++++++++++++++++++++++++++++++++++ - dlls/shell32/ietoolbar_small.bmp | Bin 0 -> 16522 bytes - dlls/shell32/ietoolbar_small.svg | 1782 ++++++++++++++++++++++++++++++++++++++ - dlls/shell32/shell32.rc | 8 + + dlls/shell32/Makefile.in | 2 + + dlls/shell32/resources/ietoolbar.bmp | Bin 0 -> 37002 bytes + dlls/shell32/resources/ietoolbar.svg | 1782 ++++++++++++++++++++++++++++ + dlls/shell32/resources/ietoolbar_small.bmp | Bin 0 -> 16522 bytes + dlls/shell32/resources/ietoolbar_small.svg | 1782 ++++++++++++++++++++++++++++ + dlls/shell32/shell32.rc | 8 + 6 files changed, 3574 insertions(+) - create mode 100644 dlls/shell32/ietoolbar.bmp - create mode 100644 dlls/shell32/ietoolbar.svg - create mode 100644 dlls/shell32/ietoolbar_small.bmp - create mode 100644 dlls/shell32/ietoolbar_small.svg + create mode 100644 dlls/shell32/resources/ietoolbar.bmp + create mode 100644 dlls/shell32/resources/ietoolbar.svg + create mode 100644 dlls/shell32/resources/ietoolbar_small.bmp + create mode 100644 dlls/shell32/resources/ietoolbar_small.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in -index 038db7f..255fadc 100644 +index 731b6f4..f36b581 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -71,6 +71,8 @@ SVG_SRCS = \ - floppy.svg \ - folder.svg \ - folder_open.svg \ -+ ietoolbar.svg \ -+ ietoolbar_small.svg \ - mycomputer.svg \ - mydocs.svg \ - netdrive.svg \ -diff --git a/dlls/shell32/ietoolbar.bmp b/dlls/shell32/ietoolbar.bmp + resources/floppy.svg \ + resources/folder.svg \ + resources/folder_open.svg \ ++ resources/ietoolbar.svg \ ++ resources/ietoolbar_small.svg \ + resources/internet.svg \ + resources/mycomputer.svg \ + resources/mydocs.svg \ +diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b46d056f54f6b6bc5bd390d0afbb835b824e2241 GIT binary patch @@ -180,11 +180,11 @@ I&`%}szuY{YPXGV_ literal 0 HcmV?d00001 -diff --git a/dlls/shell32/ietoolbar.svg b/dlls/shell32/ietoolbar.svg +diff --git a/dlls/shell32/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg new file mode 100644 index 0000000..a49bd2e --- /dev/null -+++ b/dlls/shell32/ietoolbar.svg ++++ b/dlls/shell32/resources/ietoolbar.svg @@ -0,0 +1,1782 @@ + + @@ -1968,7 +1968,7 @@ index 0000000..a49bd2e + id="path8643-7" /> + + -diff --git a/dlls/shell32/ietoolbar_small.bmp b/dlls/shell32/ietoolbar_small.bmp +diff --git a/dlls/shell32/resources/ietoolbar_small.bmp b/dlls/shell32/resources/ietoolbar_small.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1810de2010313e204a74209c8101bd5e19760a5f GIT binary patch @@ -2052,11 +2052,11 @@ P^dx_SAxuIE&=UAR#Z?Dq literal 0 HcmV?d00001 -diff --git a/dlls/shell32/ietoolbar_small.svg b/dlls/shell32/ietoolbar_small.svg +diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg new file mode 100644 index 0000000..2aa52cd --- /dev/null -+++ b/dlls/shell32/ietoolbar_small.svg ++++ b/dlls/shell32/resources/ietoolbar_small.svg @@ -0,0 +1,1782 @@ + + @@ -3841,24 +3841,24 @@ index 0000000..2aa52cd + + diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc -index bfba962..3d1774a 100644 +index 1eb5b16..be42e5b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc -@@ -433,6 +433,14 @@ IDB_TB_SMALL_LIGHT BITMAP idb_tb_small.bmp - /* @makedep: idb_tb_small.bmp */ - IDB_TB_SMALL_DARK BITMAP idb_tb_small.bmp +@@ -529,6 +529,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp + /* @makedep: resources/idb_tb_small.bmp */ + IDB_TB_SMALL_DARK BITMAP resources/idb_tb_small.bmp -+/* @makedep: ietoolbar.bmp */ -+204 BITMAP ietoolbar.bmp -+205 BITMAP ietoolbar.bmp ++/* @makedep: resources/ietoolbar.bmp */ ++204 BITMAP resources/ietoolbar.bmp ++205 BITMAP resources/ietoolbar.bmp + -+/* @makedep: ietoolbar_small.bmp */ -+206 BITMAP ietoolbar_small.bmp -+207 BITMAP ietoolbar_small.bmp ++/* @makedep: resources/ietoolbar_small.bmp */ ++206 BITMAP resources/ietoolbar_small.bmp ++207 BITMAP resources/ietoolbar_small.bmp + - /* @makedep: searching.avi */ - IDR_AVI_SEARCHING AVI searching.avi + /* @makedep: resources/searching.avi */ + IDR_AVI_SEARCHING AVI resources/searching.avi -- -2.7.1 +2.7.4 diff --git a/patches/shell32-Toolbar_Bitmaps/0002-shell32-Add-more-Tango-icons-to-the-IE-toolbar.patch b/patches/shell32-Toolbar_Bitmaps/0002-shell32-Add-more-Tango-icons-to-the-IE-toolbar.patch index 76e26d44..bdd4d2f0 100644 --- a/patches/shell32-Toolbar_Bitmaps/0002-shell32-Add-more-Tango-icons-to-the-IE-toolbar.patch +++ b/patches/shell32-Toolbar_Bitmaps/0002-shell32-Add-more-Tango-icons-to-the-IE-toolbar.patch @@ -1,16 +1,16 @@ -From 3f46c07466bcd2e7587e662d2eefbb7e19315b80 Mon Sep 17 00:00:00 2001 +From 336a9359d181bd50cf0762b476c4ae806d5a779d Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 3 Mar 2016 14:07:44 +0800 Subject: shell32: Add more Tango icons to the IE toolbar. --- - dlls/shell32/ietoolbar.bmp | Bin 37002 -> 37002 bytes - dlls/shell32/ietoolbar.svg | 3324 +++++++++++++++++++++++++++++++++---- - dlls/shell32/ietoolbar_small.bmp | Bin 16522 -> 16522 bytes - dlls/shell32/ietoolbar_small.svg | 3326 ++++++++++++++++++++++++++++++++++---- + dlls/shell32/resources/ietoolbar.bmp | Bin 37002 -> 37002 bytes + dlls/shell32/resources/ietoolbar.svg | 3324 ++++++++++++++++++++++++--- + dlls/shell32/resources/ietoolbar_small.bmp | Bin 16522 -> 16522 bytes + dlls/shell32/resources/ietoolbar_small.svg | 3326 +++++++++++++++++++++++++--- 4 files changed, 6035 insertions(+), 615 deletions(-) -diff --git a/dlls/shell32/ietoolbar.bmp b/dlls/shell32/ietoolbar.bmp +diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp index b46d056f54f6b6bc5bd390d0afbb835b824e2241..5fc7960eb80896af9ddc36ecd5d2b6d6f266434a 100644 GIT binary patch literal 37002 @@ -361,10 +361,10 @@ zDK2k=xA(vwn>H=jjDodw+q{ucRRu-Kk!H0e7X<$!IvyqLud-O)TXH=^!}EDU;hkwO zuUS~Wy!8>TO97%46O7UX`O`Y9%GqnFVy-U6XLewQn$NGo|4PZ%mM9=2cyZ{+oKZ^H Mh@;K=FXyTM0xWa?p#T5? -diff --git a/dlls/shell32/ietoolbar.svg b/dlls/shell32/ietoolbar.svg +diff --git a/dlls/shell32/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg index a49bd2e..eaf0e80 100644 ---- a/dlls/shell32/ietoolbar.svg -+++ b/dlls/shell32/ietoolbar.svg +--- a/dlls/shell32/resources/ietoolbar.svg ++++ b/dlls/shell32/resources/ietoolbar.svg @@ -31,9 +31,9 @@ showgrid="true" showguides="true" @@ -3803,7 +3803,7 @@ index a49bd2e..eaf0e80 100644 + -diff --git a/dlls/shell32/ietoolbar_small.bmp b/dlls/shell32/ietoolbar_small.bmp +diff --git a/dlls/shell32/resources/ietoolbar_small.bmp b/dlls/shell32/resources/ietoolbar_small.bmp index 1810de2010313e204a74209c8101bd5e19760a5f..f69125cafa9aa0344d835b2c3c7c67a3eb5ea0a9 100644 GIT binary patch literal 16522 @@ -4055,10 +4055,10 @@ zhkwKH5MzM;kKxXpJKbJhUULL(?!x&9CGb`P{_7(3unH!VIUcz^`(yC* P^dx_SAxuIE&=UAR#Z?Dq -diff --git a/dlls/shell32/ietoolbar_small.svg b/dlls/shell32/ietoolbar_small.svg +diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg index 2aa52cd..759eb58 100644 ---- a/dlls/shell32/ietoolbar_small.svg -+++ b/dlls/shell32/ietoolbar_small.svg +--- a/dlls/shell32/resources/ietoolbar_small.svg ++++ b/dlls/shell32/resources/ietoolbar_small.svg @@ -31,9 +31,9 @@ showgrid="true" showguides="true" @@ -7503,5 +7503,5 @@ index 2aa52cd..759eb58 100644 -- -2.7.1 +2.7.4