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 cced5dfbde8b685022dd74e666f8ad4ea8473453.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-04-22 14:57:30 +02:00
parent 89777bdb23
commit 075da187c7
4 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
patches/shell32-Icons/0001-shell32-Add-support-for-extra-large-and-jumbo-icon-l.patch
View File

@@ -1,4 +1,4 @@
From caa453b8f3d106c4b360504f1639c48fc81c26f9 Mon Sep 17 00:00:00 2001
From 38b073ecbfe6965fb4c67e8398d447f93832956f 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,17 +353,16 @@ index bdebcba0e3..fbb8e8811a 100644
+
#endif
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 1a67a5298c..a69eee8ac0 100644
index 96dd33aa30..917cdee9fc 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -2180,20 +2180,32 @@ void WINAPI SHFlushSFCache(void)
@@ -2180,19 +2180,31 @@ void WINAPI SHFlushSFCache(void)
*/
HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv)
{
- HIMAGELIST hLarge, hSmall;
+ HIMAGELIST hSmall, hLarge, hExtraLarge, hJumbo;
HIMAGELIST hNew;
HRESULT ret = E_FAIL;
- /* Wine currently only maintains large and small image lists */
- if ((iImageList != SHIL_LARGE) && (iImageList != SHIL_SMALL) && (iImageList != SHIL_SYSSMALL))
@@ -375,16 +374,16 @@ index 1a67a5298c..a69eee8ac0 100644
- return E_FAIL;
+ case SHIL_SMALL:
+ case SHIL_SYSSMALL:
+ hNew = ImageList_Duplicate( hSmall );
+ hNew = hSmall;
+ break;
+ case SHIL_LARGE:
+ hNew = ImageList_Duplicate( hLarge );
+ hNew = hLarge;
+ break;
+ case SHIL_EXTRALARGE:
+ hNew = ImageList_Duplicate( hExtraLarge );
+ hNew = hExtraLarge;
+ break;
+ case SHIL_JUMBO:
+ hNew = ImageList_Duplicate( hJumbo );
+ hNew = hJumbo;
+ break;
+ default:
+ FIXME("Unsupported image list %i requested\n", iImageList);
@@ -392,11 +391,11 @@ index 1a67a5298c..a69eee8ac0 100644
}
- Shell_GetImageLists(&hLarge, &hSmall);
- hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall);
- hNew = (iImageList == SHIL_LARGE) ? hLarge : hSmall;
-
/* Get the interface for the new image list */
if (hNew)
{
return HIMAGELIST_QueryInterface(hNew, riid, ppv);
}
--
2.12.2