wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 83e481fee20bc5c6598e65f8295be1b3f11fb70b

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-08-22 09:09:03 +10:00
parent 110a6f6016
commit 8cf0e5c285
11 changed files with 110 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,13 @@
From 60ba2a81dd862811f14539f862dafdf522e270fb Mon Sep 17 00:00:00 2001
From 6db5e60ef680422a15d63bbda12e279c485fbcca 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.
Subject: [PATCH] shell32: Add placeholder icons to match icon offset with XP.
---
dlls/shell32/resources/placeholder.ico | Bin 0 -> 1726 bytes
dlls/shell32/shell32.rc | 166 +++++++++++++++++++++++++++++++
dlls/shell32/shresdef.h | 175 +++++++++++++++++++++++++++++++++
3 files changed, 341 insertions(+)
dlls/shell32/shell32.rc | 166 ++++++++++++++++++++++++
dlls/shell32/shresdef.h | 173 +++++++++++++++++++++++++
3 files changed, 339 insertions(+)
create mode 100644 dlls/shell32/resources/placeholder.ico
diff --git a/dlls/shell32/resources/placeholder.ico b/dlls/shell32/resources/placeholder.ico
@@ -34,10 +34,10 @@ literal 0
HcmV?d00001
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 1eb5b16..dce8438 100644
index 6c35fb7c238..6cb9afdf340 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -517,6 +517,172 @@ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico
@@ -564,6 +564,172 @@ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico
/* @makedep: resources/mydocs.ico */
IDI_SHELL_FAVORITES ICON resources/mydocs.ico
@@ -211,15 +211,13 @@ index 1eb5b16..dce8438 100644
IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index d352d7c..e566200 100644
index 2fcb5b6cc2e..7c42b5850e0 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -193,23 +193,198 @@
#define IDI_SHELL_SETTINGS 22
#define IDI_SHELL_SEARCH 23
@@ -230,23 +230,196 @@
#define IDI_SHELL_HELP 24
+#define IDI_SHELL_PLACEHOLDER25 25
+#define IDI_SHELL_PLACEHOLDER26 26
#define IDI_SHELL_RUN 25
#define IDI_SHELL_SLEEP 26
+#define IDI_SHELL_PLACEHOLDER27 27
+#define IDI_SHELL_PLACEHOLDER28 28
#define IDI_SHELL_FOLDER_OPEN_LARGE 29
@@ -414,5 +412,5 @@ index d352d7c..e566200 100644
/*
--
2.7.4
2.18.0