wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against c698682b3286d72cc7c4c4624b4d14b03dbe6908.

Browse Source
This commit is contained in:
Zebediah Figura
2018-08-18 11:37:45 -05:00
parent 93e4c328d7
commit c58c70e961
12 changed files with 223 additions and 2244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch
View File

@@ -1,13 +1,13 @@
From a26b9ae70df4b2295567e3d8899b7c995f71e6dd Mon Sep 17 00:00:00 2001
From 676f5e3e1b1f88116b542d4a458ec9a72e626c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 24 May 2015 00:39:14 +0200
Subject: shell32: Add placeholder icons to match icon offset with XP.
---
dlls/shell32/placeholder.ico | Bin 0 -> 1726 bytes
dlls/shell32/shell32.rc | 170 ++++++++++++++++++++++++++++++++++++++++
dlls/shell32/shresdef.h | 179 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 349 insertions(+)
dlls/shell32/shell32.rc | 168 ++++++++++++++++++++++++++++++++++++++++
dlls/shell32/shresdef.h | 177 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 345 insertions(+)
create mode 100644 dlls/shell32/placeholder.ico
diff --git a/dlls/shell32/placeholder.ico b/dlls/shell32/placeholder.ico
@@ -34,16 +34,14 @@ literal 0
HcmV?d00001
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 847d2ce..2274997 100644
index 20261de..660ce23 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -421,6 +421,176 @@ IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico
@@ -503,6 +503,174 @@ IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico
/* @makedep: mydocs.ico */
IDI_SHELL_FAVORITES ICON mydocs.ico
+/* placeholder icons to correct icon index */
+IDI_SHELL_PLACEHOLDER2 ICON placeholder.ico
+IDI_SHELL_PLACEHOLDER3 ICON placeholder.ico
+IDI_SHELL_PLACEHOLDER21 ICON placeholder.ico
+IDI_SHELL_PLACEHOLDER22 ICON placeholder.ico
+IDI_SHELL_PLACEHOLDER25 ICON placeholder.ico
@@ -215,19 +213,10 @@ index 847d2ce..2274997 100644
IDB_TB_LARGE_LIGHT BITMAP idb_tb_large.bmp
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index 183a75e..ddae063 100644
index 1a054ff..e88ed41 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -166,6 +166,8 @@
#define IDD_TREEVIEW 0x3741
#define IDI_SHELL_DOCUMENT 1
+#define IDI_SHELL_PLACEHOLDER2 2
+#define IDI_SHELL_PLACEHOLDER3 3
#define IDI_SHELL_FOLDER 4
#define IDI_SHELL_FOLDER_OPEN 5
#define IDI_SHELL_5_12_FLOPPY 6
@@ -183,25 +185,202 @@
@@ -189,25 +189,202 @@
#define IDI_SHELL_MY_NETWORK_PLACES 18
#define IDI_SHELL_COMPUTERS_NEAR_ME 19
#define IDI_SHELL_FOLDER_SMALL_XP 20
@@ -431,5 +420,5 @@ index 183a75e..ddae063 100644
/*
--
2.4.0
2.7.4