Rebase against e4c9a2ec81b8029876d588e09587db40ab65ee69.

This commit is contained in:
Sebastian Lackner
2017-06-06 10:12:28 +02:00
parent 6ca029a4f6
commit d0ac86031a
13 changed files with 26 additions and 1244 deletions

View File

@@ -1,4 +1,4 @@
From 4d4320e632de06b391bb6ddff4376f7aabe92d51 Mon Sep 17 00:00:00 2001
From b73fce3206de216ebb9423caae4bcc02d64de261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 3 Aug 2014 02:23:44 +0200
Subject: shell32: Add support for extra large and jumbo icon lists. (v2)
@@ -340,11 +340,11 @@ index 0ea2eb9e0e8..767c90e8e71 100644
* PidlToSicIndex [INTERNAL]
*
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index 941ca74f321..3007bbf4539 100644
index fc2a5ba8a86..b91bb5528ad 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -236,4 +236,7 @@ static inline WCHAR *strdupW(const WCHAR *src)
return dest;
@@ -251,4 +251,7 @@ static inline WCHAR *strdupAtoW(const char *str)
return ret;
}
+void SHELL_GetInternalImageLists(HIMAGELIST *lpSmallList, HIMAGELIST *lpLargeList,
@@ -413,5 +413,5 @@ index ad254c83498..03878af46dd 100644
IImageList_GetIconSize( list, &width, &height );
switch (i)
--
2.12.2
2.13.0