Rebase against 83e481fee20bc5c6598e65f8295be1b3f11fb70b

patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch

@@ -1,7 +1,7 @@
-From 276fddccbf8cd4dba81da097d777f0afbef193bd Mon Sep 17 00:00:00 2001
+From 9e65ab913d2995b3add1fad7ea3124b114fdd5af Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Wed, 2 Mar 2016 16:36:33 +0800
-Subject: shell32: Add toolbar bitmaps compatible with IE6.
+Subject: [PATCH] shell32: Add toolbar bitmaps compatible with IE6.
 
 These are extended to 16 icons (IE6 expects that the toolbar contains 16 icons)
 and scaled down copies of dlls/ieframe/ietoolbar.svg:
@@ -10,9 +10,9 @@ ietoolbar_small.svg - 256x16
 ---
  dlls/shell32/Makefile.in                   |    2 +
  dlls/shell32/resources/ietoolbar.bmp       |  Bin 0 -> 37002 bytes
- dlls/shell32/resources/ietoolbar.svg       | 1782 ++++++++++++++++++++++++++++
+ 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/resources/ietoolbar_small.svg | 1782 ++++++++++++++++++++
  dlls/shell32/shell32.rc                    |    8 +
  6 files changed, 3574 insertions(+)
  create mode 100644 dlls/shell32/resources/ietoolbar.bmp
@@ -21,13 +21,13 @@ 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 731b6f4..f36b581 100644
+index d7d1cc0b026..fb63f036b97 100644
 --- a/dlls/shell32/Makefile.in
 +++ b/dlls/shell32/Makefile.in
-@@ -71,6 +71,8 @@ SVG_SRCS = \
- 	resources/floppy.svg \
+@@ -73,6 +73,8 @@ SVG_SRCS = \
  	resources/folder.svg \
  	resources/folder_open.svg \
+ 	resources/help.svg \
 +	resources/ietoolbar.svg \
 +	resources/ietoolbar_small.svg \
  	resources/internet.svg \
@@ -182,7 +182,7 @@ HcmV?d00001
 
 diff --git a/dlls/shell32/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg
 new file mode 100644
-index 0000000..a49bd2e
+index 00000000000..a49bd2e9096
 --- /dev/null
 +++ b/dlls/shell32/resources/ietoolbar.svg
 @@ -0,0 +1,1782 @@
@@ -2054,7 +2054,7 @@ HcmV?d00001
 
 diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg
 new file mode 100644
-index 0000000..2aa52cd
+index 00000000000..2aa52cdb3a0
 --- /dev/null
 +++ b/dlls/shell32/resources/ietoolbar_small.svg
 @@ -0,0 +1,1782 @@
@@ -3841,10 +3841,10 @@ index 0000000..2aa52cd
 +  </g>
 +</svg>
 diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
-index 1eb5b16..be42e5b 100644
+index 6cb9afdf340..cff05c6be0d 100644
 --- a/dlls/shell32/shell32.rc
 +++ b/dlls/shell32/shell32.rc
-@@ -529,6 +529,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
+@@ -742,6 +742,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 1eb5b16..be42e5b 100644
  IDR_AVI_SEARCHING AVI resources/searching.avi
  
 -- 
-2.7.4
+2.18.0
 

patches/shell32-Toolbar_Bitmaps/0002-shell32-Add-more-Tango-icons-to-the-IE-toolbar.patch

@@ -1,13 +1,13 @@
-From 336a9359d181bd50cf0762b476c4ae806d5a779d Mon Sep 17 00:00:00 2001
+From 51a90a64edceb850ae778878f0c8dcfa5d3e46c0 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Thu, 3 Mar 2016 14:07:44 +0800
-Subject: shell32: Add more Tango icons to the IE toolbar.
+Subject: [PATCH] shell32: Add more Tango icons to the IE toolbar.
 
 ---
  dlls/shell32/resources/ietoolbar.bmp       |  Bin 37002 -> 37002 bytes
- dlls/shell32/resources/ietoolbar.svg       | 3324 ++++++++++++++++++++++++---
+ dlls/shell32/resources/ietoolbar.svg       | 3324 +++++++++++++++++--
  dlls/shell32/resources/ietoolbar_small.bmp |  Bin 16522 -> 16522 bytes
- dlls/shell32/resources/ietoolbar_small.svg | 3326 +++++++++++++++++++++++++---
+ dlls/shell32/resources/ietoolbar_small.svg | 3326 ++++++++++++++++++--
  4 files changed, 6035 insertions(+), 615 deletions(-)
 
 diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp
@@ -362,7 +362,7 @@ 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/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg
-index a49bd2e..eaf0e80 100644
+index a49bd2e9096..eaf0e8013f5 100644
 --- a/dlls/shell32/resources/ietoolbar.svg
 +++ b/dlls/shell32/resources/ietoolbar.svg
 @@ -31,9 +31,9 @@
@@ -4056,7 +4056,7 @@ z+54EZqRduH;{KjYsD<1NTmv9_=r0Km5qyGfVoe=8HtF3u;a>(3unH!VIUcz^`(yC*
 P^dx_SAxuIE&=UAR#Z?Dq
 
 diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg
-index 2aa52cd..759eb58 100644
+index 2aa52cdb3a0..759eb580343 100644
 --- a/dlls/shell32/resources/ietoolbar_small.svg
 +++ b/dlls/shell32/resources/ietoolbar_small.svg
 @@ -31,9 +31,9 @@
@@ -7503,5 +7503,5 @@ index 2aa52cd..759eb58 100644
    </g>
  </svg>
 -- 
-2.7.4
+2.18.0