system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 12:34:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shell32: Shell_GetImageLists should be declared in shlobj.h and exported by name.

Browse source
This commit is contained in:
David Hedberg 2010-07-20 10:11:49 +02:00 committed by Alexandre Julliard
parent 65f6ab7c86
commit be2259dce9
7 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/shell32/brsfolder.c
View file

@ -200,7 +200,7 @@ static void InitializeTreeView( browse_info *info )
TRACE("%p\n", info ); TRACE("%p\n", info );
Shell_GetImageList(NULL, &hImageList); Shell_GetImageLists(NULL, &hImageList);
if (hImageList) if (hImageList)
SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList ); SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList );

4
dlls/shell32/iconcache.c
View file

@ -513,13 +513,13 @@ static int SIC_LoadOverlayIcon(int icon_idx)
} }
/************************************************************************* /*************************************************************************
* Shell_GetImageList [SHELL32.71] * Shell_GetImageLists [SHELL32.71]
* *
* PARAMETERS * PARAMETERS
* imglist[1|2] [OUT] pointer which receives imagelist handles * 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); { TRACE("(%p,%p)\n",lpBigList,lpSmallList);
if (lpBigList) if (lpBigList)
{ *lpBigList = ShellBigIconList; { *lpBigList = ShellBigIconList;

2
dlls/shell32/shell32.spec
View file

@ -66,7 +66,7 @@
68 stdcall -noname SHGetSetSettings(ptr long long) 68 stdcall -noname SHGetSetSettings(ptr long long)
69 stub -noname SHGetNetResource 69 stub -noname SHGetNetResource
70 stdcall -noname SHCreateDefClassObject(long long long long long) 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 72 stdcall -noname Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW
73 stdcall -noname SHShellFolderView_Message(long long long) 73 stdcall -noname SHShellFolderView_Message(long long long)
74 stdcall -noname SHCreateStdEnumFmtEtc(long ptr ptr) 74 stdcall -noname SHCreateStdEnumFmtEtc(long ptr ptr)

2
dlls/shell32/shell32_main.h
View file

@ -45,8 +45,6 @@ extern HINSTANCE shell32_hInstance;
extern HIMAGELIST ShellSmallIconList; extern HIMAGELIST ShellSmallIconList;
extern HIMAGELIST ShellBigIconList; extern HIMAGELIST ShellBigIconList;
BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
/* Iconcache */ /* Iconcache */
#define INVALID_INDEX -1 #define INVALID_INDEX -1
BOOL SIC_Initialize(void); BOOL SIC_Initialize(void);

2
dlls/shell32/shellord.c
View file

@ -2203,7 +2203,7 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv)
return E_FAIL; return E_FAIL;
} }
Shell_GetImageList(&hLarge, &hSmall); Shell_GetImageLists(&hLarge, &hSmall);
hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall); hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall);
/* Get the interface for the new image list */ /* Get the interface for the new image list */

2
dlls/shell32/shlmenu.c
View file

@ -628,7 +628,7 @@ LRESULT WINAPI FileMenu_DrawItem(
ExtTextOutW (lpdis->hDC, xt , yt, ETO_OPAQUE, &TextRect, pMyItem->szItemText, pMyItem->cchItemText, NULL); 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); 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); TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom);

1
include/shlobj.h
View file

@ -83,6 +83,7 @@ int WINAPI RestartDialog(HWND,LPCWSTR,DWORD);
int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD);
BOOL WINAPI IsUserAnAdmin(void); BOOL WINAPI IsUserAnAdmin(void);
UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); 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_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */
#define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */