You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 8204d04b7fd416c1b6296708937e3c06e058809b.
This commit is contained in:
Zebediah Figura
@@ -1,4 +1,4 @@
|
||||
From 6f6773527923a6f1de164edd2cb6e564cc8a2576 Mon Sep 17 00:00:00 2001
|
||||
From 276fddccbf8cd4dba81da097d777f0afbef193bd 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.
|
||||
@@ -8,32 +8,32 @@ and scaled down copies of dlls/ieframe/ietoolbar.svg:
|
||||
ietoolbar.svg - 384x24
|
||||
ietoolbar_small.svg - 256x16
|
||||
---
|
||||
dlls/shell32/Makefile.in | 2 +
|
||||
dlls/shell32/ietoolbar.bmp | Bin 0 -> 37002 bytes
|
||||
dlls/shell32/ietoolbar.svg | 1782 ++++++++++++++++++++++++++++++++++++++
|
||||
dlls/shell32/ietoolbar_small.bmp | Bin 0 -> 16522 bytes
|
||||
dlls/shell32/ietoolbar_small.svg | 1782 ++++++++++++++++++++++++++++++++++++++
|
||||
dlls/shell32/shell32.rc | 8 +
|
||||
dlls/shell32/Makefile.in | 2 +
|
||||
dlls/shell32/resources/ietoolbar.bmp | Bin 0 -> 37002 bytes
|
||||
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/shell32.rc | 8 +
|
||||
6 files changed, 3574 insertions(+)
|
||||
create mode 100644 dlls/shell32/ietoolbar.bmp
|
||||
create mode 100644 dlls/shell32/ietoolbar.svg
|
||||
create mode 100644 dlls/shell32/ietoolbar_small.bmp
|
||||
create mode 100644 dlls/shell32/ietoolbar_small.svg
|
||||
create mode 100644 dlls/shell32/resources/ietoolbar.bmp
|
||||
create mode 100644 dlls/shell32/resources/ietoolbar.svg
|
||||
create mode 100644 dlls/shell32/resources/ietoolbar_small.bmp
|
||||
create mode 100644 dlls/shell32/resources/ietoolbar_small.svg
|
||||
|
||||
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
|
||||
index 038db7f..255fadc 100644
|
||||
index 731b6f4..f36b581 100644
|
||||
--- a/dlls/shell32/Makefile.in
|
||||
+++ b/dlls/shell32/Makefile.in
|
||||
@@ -71,6 +71,8 @@ SVG_SRCS = \
|
||||
floppy.svg \
|
||||
folder.svg \
|
||||
folder_open.svg \
|
||||
+ ietoolbar.svg \
|
||||
+ ietoolbar_small.svg \
|
||||
mycomputer.svg \
|
||||
mydocs.svg \
|
||||
netdrive.svg \
|
||||
diff --git a/dlls/shell32/ietoolbar.bmp b/dlls/shell32/ietoolbar.bmp
|
||||
resources/floppy.svg \
|
||||
resources/folder.svg \
|
||||
resources/folder_open.svg \
|
||||
+ resources/ietoolbar.svg \
|
||||
+ resources/ietoolbar_small.svg \
|
||||
resources/internet.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
|
||||
GIT binary patch
|
||||
@@ -180,11 +180,11 @@ I&`%}szuY{YPXGV_
|
||||
literal 0
|
||||
HcmV?d00001
|
||||
|
||||
diff --git a/dlls/shell32/ietoolbar.svg b/dlls/shell32/ietoolbar.svg
|
||||
diff --git a/dlls/shell32/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg
|
||||
new file mode 100644
|
||||
index 0000000..a49bd2e
|
||||
--- /dev/null
|
||||
+++ b/dlls/shell32/ietoolbar.svg
|
||||
+++ b/dlls/shell32/resources/ietoolbar.svg
|
||||
@@ -0,0 +1,1782 @@
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
@@ -1968,7 +1968,7 @@ index 0000000..a49bd2e
|
||||
+ id="path8643-7" />
|
||||
+ </g>
|
||||
+</svg>
|
||||
diff --git a/dlls/shell32/ietoolbar_small.bmp b/dlls/shell32/ietoolbar_small.bmp
|
||||
diff --git a/dlls/shell32/resources/ietoolbar_small.bmp b/dlls/shell32/resources/ietoolbar_small.bmp
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..1810de2010313e204a74209c8101bd5e19760a5f
|
||||
GIT binary patch
|
||||
@@ -2052,11 +2052,11 @@ P^dx_SAxuIE&=UAR#Z?Dq
|
||||
literal 0
|
||||
HcmV?d00001
|
||||
|
||||
diff --git a/dlls/shell32/ietoolbar_small.svg b/dlls/shell32/ietoolbar_small.svg
|
||||
diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg
|
||||
new file mode 100644
|
||||
index 0000000..2aa52cd
|
||||
--- /dev/null
|
||||
+++ b/dlls/shell32/ietoolbar_small.svg
|
||||
+++ b/dlls/shell32/resources/ietoolbar_small.svg
|
||||
@@ -0,0 +1,1782 @@
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
@@ -3841,24 +3841,24 @@ index 0000000..2aa52cd
|
||||
+ </g>
|
||||
+</svg>
|
||||
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
|
||||
index bfba962..3d1774a 100644
|
||||
index 1eb5b16..be42e5b 100644
|
||||
--- a/dlls/shell32/shell32.rc
|
||||
+++ b/dlls/shell32/shell32.rc
|
||||
@@ -433,6 +433,14 @@ IDB_TB_SMALL_LIGHT BITMAP idb_tb_small.bmp
|
||||
/* @makedep: idb_tb_small.bmp */
|
||||
IDB_TB_SMALL_DARK BITMAP idb_tb_small.bmp
|
||||
@@ -529,6 +529,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
|
||||
|
||||
+/* @makedep: ietoolbar.bmp */
|
||||
+204 BITMAP ietoolbar.bmp
|
||||
+205 BITMAP ietoolbar.bmp
|
||||
+/* @makedep: resources/ietoolbar.bmp */
|
||||
+204 BITMAP resources/ietoolbar.bmp
|
||||
+205 BITMAP resources/ietoolbar.bmp
|
||||
+
|
||||
+/* @makedep: ietoolbar_small.bmp */
|
||||
+206 BITMAP ietoolbar_small.bmp
|
||||
+207 BITMAP ietoolbar_small.bmp
|
||||
+/* @makedep: resources/ietoolbar_small.bmp */
|
||||
+206 BITMAP resources/ietoolbar_small.bmp
|
||||
+207 BITMAP resources/ietoolbar_small.bmp
|
||||
+
|
||||
/* @makedep: searching.avi */
|
||||
IDR_AVI_SEARCHING AVI searching.avi
|
||||
/* @makedep: resources/searching.avi */
|
||||
IDR_AVI_SEARCHING AVI resources/searching.avi
|
||||
|
||||
--
|
||||
2.7.1
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
From 3f46c07466bcd2e7587e662d2eefbb7e19315b80 Mon Sep 17 00:00:00 2001
|
||||
From 336a9359d181bd50cf0762b476c4ae806d5a779d 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.
|
||||
|
||||
---
|
||||
dlls/shell32/ietoolbar.bmp | Bin 37002 -> 37002 bytes
|
||||
dlls/shell32/ietoolbar.svg | 3324 +++++++++++++++++++++++++++++++++----
|
||||
dlls/shell32/ietoolbar_small.bmp | Bin 16522 -> 16522 bytes
|
||||
dlls/shell32/ietoolbar_small.svg | 3326 ++++++++++++++++++++++++++++++++++----
|
||||
dlls/shell32/resources/ietoolbar.bmp | Bin 37002 -> 37002 bytes
|
||||
dlls/shell32/resources/ietoolbar.svg | 3324 ++++++++++++++++++++++++---
|
||||
dlls/shell32/resources/ietoolbar_small.bmp | Bin 16522 -> 16522 bytes
|
||||
dlls/shell32/resources/ietoolbar_small.svg | 3326 +++++++++++++++++++++++++---
|
||||
4 files changed, 6035 insertions(+), 615 deletions(-)
|
||||
|
||||
diff --git a/dlls/shell32/ietoolbar.bmp b/dlls/shell32/ietoolbar.bmp
|
||||
diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp
|
||||
index b46d056f54f6b6bc5bd390d0afbb835b824e2241..5fc7960eb80896af9ddc36ecd5d2b6d6f266434a 100644
|
||||
GIT binary patch
|
||||
literal 37002
|
||||
@@ -361,10 +361,10 @@ zDK2k=xA(vwn>H=jjDodw+q{ucRRu-Kk!H0e7X<$!IvyqLud-O)TXH=^!}EDU;hkwO
|
||||
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/ietoolbar.svg b/dlls/shell32/ietoolbar.svg
|
||||
diff --git a/dlls/shell32/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg
|
||||
index a49bd2e..eaf0e80 100644
|
||||
--- a/dlls/shell32/ietoolbar.svg
|
||||
+++ b/dlls/shell32/ietoolbar.svg
|
||||
--- a/dlls/shell32/resources/ietoolbar.svg
|
||||
+++ b/dlls/shell32/resources/ietoolbar.svg
|
||||
@@ -31,9 +31,9 @@
|
||||
showgrid="true"
|
||||
showguides="true"
|
||||
@@ -3803,7 +3803,7 @@ index a49bd2e..eaf0e80 100644
|
||||
+ </g>
|
||||
</g>
|
||||
</svg>
|
||||
diff --git a/dlls/shell32/ietoolbar_small.bmp b/dlls/shell32/ietoolbar_small.bmp
|
||||
diff --git a/dlls/shell32/resources/ietoolbar_small.bmp b/dlls/shell32/resources/ietoolbar_small.bmp
|
||||
index 1810de2010313e204a74209c8101bd5e19760a5f..f69125cafa9aa0344d835b2c3c7c67a3eb5ea0a9 100644
|
||||
GIT binary patch
|
||||
literal 16522
|
||||
@@ -4055,10 +4055,10 @@ zhkwKH5MzM;kKxXpJKbJhUULL(?!x&9CGb`P{_7<qLT*l+7|h~BLL!(YCU!Z6qCDT7
|
||||
z+54EZqRduH;{KjYsD<1NTmv9_=r0Km5qyGfVoe=8HtF3u;a>(3unH!VIUcz^`(yC*
|
||||
P^dx_SAxuIE&=UAR#Z?Dq
|
||||
|
||||
diff --git a/dlls/shell32/ietoolbar_small.svg b/dlls/shell32/ietoolbar_small.svg
|
||||
diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg
|
||||
index 2aa52cd..759eb58 100644
|
||||
--- a/dlls/shell32/ietoolbar_small.svg
|
||||
+++ b/dlls/shell32/ietoolbar_small.svg
|
||||
--- a/dlls/shell32/resources/ietoolbar_small.svg
|
||||
+++ b/dlls/shell32/resources/ietoolbar_small.svg
|
||||
@@ -31,9 +31,9 @@
|
||||
showgrid="true"
|
||||
showguides="true"
|
||||
@@ -7503,5 +7503,5 @@ index 2aa52cd..759eb58 100644
|
||||
</g>
|
||||
</svg>
|
||||
--
|
||||
2.7.1
|
||||
2.7.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user