diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 35c0bca1..c6caf9b9 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "83e481fee20bc5c6598e65f8295be1b3f11fb70b" + echo "18564c76fc613f61a3e13b7497dde4b29b35194e" } # Show version information @@ -7566,7 +7566,7 @@ fi # | * [#20776] Add stubs for QUERY_TYPE_SO_STATISTICS and QUERY_TYPE_SO_OVERFLOW # | # | Modified files: -# | * dlls/d3d10core/tests/device.c, dlls/d3d11/tests/d3d11.c, dlls/wined3d/query.c +# | * dlls/d3d10core/tests/d3d10core.c, dlls/d3d11/tests/d3d11.c, dlls/wined3d/query.c # | if test "$enable_wined3d_QUERY_Stubs" -eq 1; then patch_apply wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.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 5909b5e8..89c1c2a2 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,13 +1,13 @@ -From 6db5e60ef680422a15d63bbda12e279c485fbcca Mon Sep 17 00:00:00 2001 +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 | 173 +++++++++++++++++++++++++ - 3 files changed, 339 insertions(+) + 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 @@ -34,10 +34,10 @@ literal 0 HcmV?d00001 diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc -index 6c35fb7c238..6cb9afdf340 100644 +index e32837c..1e8d48d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc -@@ -564,6 +564,172 @@ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico +@@ -586,6 +586,172 @@ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico /* @makedep: resources/mydocs.ico */ IDI_SHELL_FAVORITES ICON resources/mydocs.ico @@ -211,24 +211,11 @@ index 6c35fb7c238..6cb9afdf340 100644 IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h -index 2fcb5b6cc2e..7c42b5850e0 100644 +index 2386671..c6fd22b 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h -@@ -230,23 +230,196 @@ - #define IDI_SHELL_HELP 24 - #define IDI_SHELL_RUN 25 - #define IDI_SHELL_SLEEP 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 +@@ -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 @@ -412,5 +399,5 @@ index 2fcb5b6cc2e..7c42b5850e0 100644 /* -- -2.18.0 +1.9.1