Rebase against 70fbfa2cb8198f86efa19eda91cf769056b7da2c.

This commit is contained in:
Zebediah Figura
2018-08-24 17:37:59 -05:00
parent 74e9c4f8ce
commit 3dcb983637
5 changed files with 56 additions and 65 deletions

View File

@@ -1,4 +1,4 @@
From 9e65ab913d2995b3add1fad7ea3124b114fdd5af Mon Sep 17 00:00:00 2001
From 0c8d61b9ee9c775d8a86900482a841d1373e8f46 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 2 Mar 2016 16:36:33 +0800
Subject: [PATCH] shell32: Add toolbar bitmaps compatible with IE6.
@@ -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,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 d7d1cc0b026..fb63f036b97 100644
index 8bac590..737c8c1 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -73,6 +73,8 @@ SVG_SRCS = \
@@ -31,8 +31,8 @@ index d7d1cc0b026..fb63f036b97 100644
+ resources/ietoolbar.svg \
+ resources/ietoolbar_small.svg \
resources/internet.svg \
resources/menu.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
@@ -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 00000000000..a49bd2e9096
index 0000000..a49bd2e
--- /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 00000000000..2aa52cdb3a0
index 0000000..2aa52cd
--- /dev/null
+++ b/dlls/shell32/resources/ietoolbar_small.svg
@@ -0,0 +1,1782 @@
@@ -3841,10 +3841,10 @@ index 00000000000..2aa52cdb3a0
+ </g>
+</svg>
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 6cb9afdf340..cff05c6be0d 100644
index 2333e39..5448db0 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -742,6 +742,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
@@ -581,6 +581,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 6cb9afdf340..cff05c6be0d 100644
IDR_AVI_SEARCHING AVI resources/searching.avi
--
2.18.0
2.7.4