From 94f314ccaaf19cf6c09e037460d35973c1c23d1a Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 31 Aug 2018 19:16:27 -0500 Subject: [PATCH] Rebase against 2346a4012aed5a150cd971ca1e929528722a4d12. --- ...d-invalid-memory-access-when-reloca.patch} | 22 +- .../definition | 1 - patches/patchinstall.sh | 21 +- ...eholder-icons-to-match-icon-offset-w.patch | 403 ------------------ patches/shell32-Placeholder_Icons/definition | 3 - ...-toolbar-bitmaps-compatible-with-IE6.patch | 12 +- 6 files changed, 37 insertions(+), 425 deletions(-) rename patches/{winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch => ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch} (85%) rename patches/{winedevice-Fix_Relocation => ntoskrnl.exe-Fix_Relocation}/definition (84%) delete mode 100644 patches/shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch delete mode 100644 patches/shell32-Placeholder_Icons/definition diff --git a/patches/winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch b/patches/ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch similarity index 85% rename from patches/winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch rename to patches/ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch index 994e07a4..7f5f6b48 100644 --- a/patches/winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch +++ b/patches/ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch @@ -1,18 +1,18 @@ -From a99b0eeff3202d63f55f252ceb7cf364549d812c Mon Sep 17 00:00:00 2001 +From 77f6fbe85432f4bc61b1b9b27a0992a1f6269344 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 10 Nov 2014 04:05:38 +0100 -Subject: winedevice: Avoid invalid memory access when relocation block +Subject: ntoskrnl.exe: Avoid invalid memory access when relocation block addresses memory outside of the current page. --- - programs/winedevice/device.c | 49 ++++++++++++++++++++++++++++++++++++++------ + dlls/ntoskrnl.exe/ntoskrnl.c | 49 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) -diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c -index 94132ed..6bcc2b2 100644 ---- a/programs/winedevice/device.c -+++ b/programs/winedevice/device.c -@@ -63,6 +63,39 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) +diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c +index 577f5b3..8649863 100644 +--- a/dlls/ntoskrnl.exe/ntoskrnl.c ++++ b/dlls/ntoskrnl.exe/ntoskrnl.c +@@ -3208,6 +3208,39 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } @@ -52,7 +52,7 @@ index 94132ed..6bcc2b2 100644 /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { -@@ -86,7 +119,7 @@ static HMODULE load_driver_module( const WCHAR *name ) +@@ -3231,7 +3264,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { @@ -61,7 +61,7 @@ index 94132ed..6bcc2b2 100644 IMAGE_BASE_RELOCATION *rel, *end; if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) -@@ -94,20 +127,24 @@ static HMODULE load_driver_module( const WCHAR *name ) +@@ -3239,20 +3272,24 @@ static HMODULE load_driver_module( const WCHAR *name ) WINE_TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); @@ -92,5 +92,5 @@ index 94132ed..6bcc2b2 100644 } -- -2.7.1 +2.7.4 diff --git a/patches/winedevice-Fix_Relocation/definition b/patches/ntoskrnl.exe-Fix_Relocation/definition similarity index 84% rename from patches/winedevice-Fix_Relocation/definition rename to patches/ntoskrnl.exe-Fix_Relocation/definition index 0f523d63..98073111 100644 --- a/patches/winedevice-Fix_Relocation/definition +++ b/patches/ntoskrnl.exe-Fix_Relocation/definition @@ -1,2 +1 @@ Fixes: [28254] Fix crash of winedevice when relocation entry crosses page boundary -Disabled: True diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index dc6d5a24..8cab70aa 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "a1e0a029b0ce80e6561e0656ae4530fb1a8d4316" + echo "2346a4012aed5a150cd971ca1e929528722a4d12" } # Show version information @@ -255,6 +255,7 @@ patch_enable_all () enable_ntdll_futex_condition_var="$1" enable_ntdll_set_full_cpu_context="$1" enable_ntoskrnl_Stubs="$1" + enable_ntoskrnl_exe_Fix_Relocation="$1" enable_nvapi_Stub_DLL="$1" enable_nvcuda_CUDA_Support="$1" enable_nvcuvid_CUDA_Video_Support="$1" @@ -943,6 +944,9 @@ patch_enable () ntoskrnl-Stubs) enable_ntoskrnl_Stubs="$2" ;; + ntoskrnl.exe-Fix_Relocation) + enable_ntoskrnl_exe_Fix_Relocation="$2" + ;; nvapi-Stub_DLL) enable_nvapi_Stub_DLL="$2" ;; @@ -5605,6 +5609,21 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then ) >> "$patchlist" fi +# Patchset ntoskrnl.exe-Fix_Relocation +# | +# | This patchset fixes the following Wine bugs: +# | * [#28254] Fix crash of winedevice when relocation entry crosses page boundary +# | +# | Modified files: +# | * dlls/ntoskrnl.exe/ntoskrnl.c +# | +if test "$enable_ntoskrnl_exe_Fix_Relocation" -eq 1; then + patch_apply ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch + ( + printf '%s\n' '+ { "Sebastian Lackner", "ntoskrnl.exe: Avoid invalid memory access when relocation block addresses memory outside of the current page.", 1 },'; + ) >> "$patchlist" +fi + # Patchset nvcuvid-CUDA_Video_Support # | # | This patchset has the following (direct or indirect) dependencies: 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 deleted file mode 100644 index 89c1c2a2..00000000 --- a/patches/shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch +++ /dev/null @@ -1,403 +0,0 @@ -From 363a449bcf15fe89b5658fe3146a674d63d2c16d 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: [PATCH] shell32: Add placeholder icons to match icon offset with XP. - ---- - dlls/shell32/resources/placeholder.ico | Bin 0 -> 1726 bytes - dlls/shell32/shell32.rc | 166 ++++++++++++++++++++++++++++++++ - dlls/shell32/shresdef.h | 169 +++++++++++++++++++++++++++++++++ - 3 files changed, 335 insertions(+) - create mode 100644 dlls/shell32/resources/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 -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 e32837c..1e8d48d 100644 ---- a/dlls/shell32/shell32.rc -+++ b/dlls/shell32/shell32.rc -@@ -586,6 +586,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_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: 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 2386671..c6fd22b 100644 ---- a/dlls/shell32/shresdef.h -+++ b/dlls/shell32/shresdef.h -@@ -243,14 +243,183 @@ - #define IDI_SHELL_APP_FOLDER 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 - - /* --- -1.9.1 - diff --git a/patches/shell32-Placeholder_Icons/definition b/patches/shell32-Placeholder_Icons/definition deleted file mode 100644 index 25f4c2a6..00000000 --- a/patches/shell32-Placeholder_Icons/definition +++ /dev/null @@ -1,3 +0,0 @@ -Fixes: [30185] Add shell32 placeholder icons to match offsets with Windows -Disabled: true -# This patch is disabled until Alex Henrie is done. \ No newline at end of file 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 fc8cc0f3..8a8a9895 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 e7592f4068371b5a8b17f25278de99d49e61e235 Mon Sep 17 00:00:00 2001 +From a238afce947c81716649156bcf9eb7fb8d345a1f Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 2 Mar 2016 16:36:33 +0800 Subject: [PATCH] shell32: Add toolbar bitmaps compatible with IE6. @@ -21,7 +21,7 @@ ietoolbar_small.svg - 256x16 create mode 100644 dlls/shell32/resources/ietoolbar_small.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in -index cf19029..6e8d277 100644 +index 20365b9..ea44b8c 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -76,6 +76,8 @@ SVG_SRCS = \ @@ -30,9 +30,9 @@ index cf19029..6e8d277 100644 resources/help.svg \ + resources/ietoolbar.svg \ + resources/ietoolbar_small.svg \ + resources/image.svg \ resources/internet.svg \ resources/log_off.svg \ - resources/menu.svg \ diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b46d056f54f6b6bc5bd390d0afbb835b824e2241 @@ -3841,10 +3841,10 @@ index 0000000..2aa52cd + + diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc -index a13349c..e366eee 100644 +index 5c11590..af197b4 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc -@@ -976,6 +976,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp +@@ -1076,6 +1076,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 @@ -3860,5 +3860,5 @@ index a13349c..e366eee 100644 IDR_AVI_SEARCHING AVI resources/searching.avi -- -1.9.1 +2.7.4