Rebase against a1e0a029b0ce80e6561e0656ae4530fb1a8d4316

This commit is contained in:
Alistair Leslie-Hughes
2018-08-30 09:25:58 +10:00
parent d7154d5d3f
commit 51cfdc619e
7 changed files with 73 additions and 92 deletions

View File

@@ -1,4 +1,4 @@
From b8e6db45765947ef23bbbbb080cd487170f4bbd6 Mon Sep 17 00:00:00 2001
From e7592f4068371b5a8b17f25278de99d49e61e235 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.
@@ -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 0664c85..9c15a71 100644
index cf19029..6e8d277 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -76,6 +76,8 @@ SVG_SRCS = \
@@ -31,8 +31,8 @@ index 0664c85..9c15a71 100644
+ resources/ietoolbar.svg \
+ resources/ietoolbar_small.svg \
resources/internet.svg \
resources/lock.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
+ </g>
+</svg>
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index d586a05..dcb8f0a 100644
index a13349c..e366eee 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -698,6 +698,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
@@ -976,6 +976,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