Rebase against 7cd7f14696dc3fb7aa41ef253ad144d458304a28.

This commit is contained in:
Sebastian Lackner
2017-05-02 12:57:50 +02:00
parent d80c4a83fd
commit 2db34eca39
9 changed files with 50 additions and 294 deletions

View File

@@ -1,4 +1,4 @@
From 38b073ecbfe6965fb4c67e8398d447f93832956f Mon Sep 17 00:00:00 2001
From 7648652cd46e37da1dc51c3dee6d0dcd953e96a9 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)
@@ -353,10 +353,10 @@ index bdebcba0e3..fbb8e8811a 100644
+
#endif
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 96dd33aa30..917cdee9fc 100644
index f9814997da..5102bf0e47 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -2180,19 +2180,31 @@ void WINAPI SHFlushSFCache(void)
@@ -2146,18 +2146,30 @@ void WINAPI SHFlushSFCache(void)
*/
HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv)
{
@@ -395,7 +395,6 @@ index 96dd33aa30..917cdee9fc 100644
-
return HIMAGELIST_QueryInterface(hNew, riid, ppv);
}
--
2.12.2