Author: tkreuzer
Date: Sat May 14 12:57:52 2011
New Revision: 51729
URL: http://svn.reactos.org/svn/reactos?rev=51729&view=rev
Log:
[SHELL32]
Owen Rudge <orudge at codeweavers dot com>:
Implement SHGetImageList
http://source.winehq.org/git/wine.git/commitdiff/9db87f13d3f0f9e07accc9b5e12dccd202b88156
Fixes explorer++ main window
patch provided by igorko
Modified:
trunk/reactos/dll/win32/shell32/shellord.c
Modified: trunk/reactos/dll/win32/shell32/shellord.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord.c?rev=51729&r1=51728&r2=51729&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Sat May 14 12:57:52
2011
@@ -47,6 +47,7 @@
#include "shlwapi.h"
#include "commdlg.h"
#include "recyclebin.h"
+#include "commoncontrols.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
WINE_DECLARE_DEBUG_CHANNEL(pidl);
@@ -2247,10 +2248,40 @@
{
}
+/*************************************************************************
+ * SHGetImageList (SHELL32.727)
+ *
+ * Returns a copy of a shell image list.
+ *
+ * NOTES
+ * Windows XP features 4 sizes of image list, and Vista 5. Wine currently
+ * only supports the traditional small and large image lists, so requests
+ * for the others will currently fail.
+ */
HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv)
{
- FIXME("STUB: %i %s\n",iImageList,debugstr_guid(riid));
- return E_NOINTERFACE;
+ HIMAGELIST hLarge, hSmall;
+ 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))
+ {
+ FIXME("Unsupported image list %i requested\n", iImageList);
+ return E_FAIL;
+ }
+
+ Shell_GetImageLists(&hLarge, &hSmall);
+ hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall);
+
+ /* Get the interface for the new image list */
+ if (hNew)
+ {
+ ret = HIMAGELIST_QueryInterface(hNew, riid, ppv);
+ ImageList_Destroy(hNew);
+ }
+
+ return ret;
}
/*************************************************************************
