Module: wine Branch: master Commit: be2259dce9bc8cb7d163a13392475c278089fa13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2259dce9bc8cb7d163a13392...
Author: David Hedberg david.hedberg@gmail.com Date: Tue Jul 20 10:11:49 2010 +0200
shell32: Shell_GetImageLists should be declared in shlobj.h and exported by name.
---
dlls/shell32/brsfolder.c | 2 +- dlls/shell32/iconcache.c | 4 ++-- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shell32_main.h | 2 -- dlls/shell32/shellord.c | 2 +- dlls/shell32/shlmenu.c | 2 +- include/shlobj.h | 1 + 7 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 0bc5820..83ed1dd 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -200,7 +200,7 @@ static void InitializeTreeView( browse_info *info )
TRACE("%p\n", info );
- Shell_GetImageList(NULL, &hImageList); + Shell_GetImageLists(NULL, &hImageList);
if (hImageList) SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList ); diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index c4087d2..637dbca 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -513,13 +513,13 @@ static int SIC_LoadOverlayIcon(int icon_idx) }
/************************************************************************* - * Shell_GetImageList [SHELL32.71] + * Shell_GetImageLists [SHELL32.71] * * PARAMETERS * imglist[1|2] [OUT] pointer which receives imagelist handles * */ -BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) +BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) { TRACE("(%p,%p)\n",lpBigList,lpSmallList); if (lpBigList) { *lpBigList = ShellBigIconList; diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index ee6f8a5..7f1c5b6 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -66,7 +66,7 @@ 68 stdcall -noname SHGetSetSettings(ptr long long) 69 stub -noname SHGetNetResource 70 stdcall -noname SHCreateDefClassObject(long long long long long) - 71 stdcall -noname Shell_GetImageList(ptr ptr) + 71 stdcall -ordinal Shell_GetImageLists(ptr ptr) 72 stdcall -noname Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW 73 stdcall -noname SHShellFolderView_Message(long long long) 74 stdcall -noname SHCreateStdEnumFmtEtc(long ptr ptr) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 3eecdad..87fb911 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -45,8 +45,6 @@ extern HINSTANCE shell32_hInstance; extern HIMAGELIST ShellSmallIconList; extern HIMAGELIST ShellBigIconList;
-BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); - /* Iconcache */ #define INVALID_INDEX -1 BOOL SIC_Initialize(void); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index fac7a7a..051154d 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2203,7 +2203,7 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) return E_FAIL; }
- Shell_GetImageList(&hLarge, &hSmall); + Shell_GetImageLists(&hLarge, &hSmall); hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall);
/* Get the interface for the new image list */ diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index ae13ff8..a6cc314 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -628,7 +628,7 @@ LRESULT WINAPI FileMenu_DrawItem(
ExtTextOutW (lpdis->hDC, xt , yt, ETO_OPAQUE, &TextRect, pMyItem->szItemText, pMyItem->cchItemText, NULL);
- Shell_GetImageList(0, &hImageList); + Shell_GetImageLists(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL);
TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); diff --git a/include/shlobj.h b/include/shlobj.h index bd00d21..0aef3cf 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -83,6 +83,7 @@ int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); BOOL WINAPI IsUserAnAdmin(void); UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); +BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*);
#define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */