Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
be2259dc
Commit
be2259dc
authored
Jul 20, 2010
by
David Hedberg
Committed by
Alexandre Julliard
Jul 20, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Shell_GetImageLists should be declared in shlobj.h and exported by name.
parent
65f6ab7c
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
8 deletions
+7
-8
brsfolder.c
dlls/shell32/brsfolder.c
+1
-1
iconcache.c
dlls/shell32/iconcache.c
+2
-2
shell32.spec
dlls/shell32/shell32.spec
+1
-1
shell32_main.h
dlls/shell32/shell32_main.h
+0
-2
shellord.c
dlls/shell32/shellord.c
+1
-1
shlmenu.c
dlls/shell32/shlmenu.c
+1
-1
shlobj.h
include/shlobj.h
+1
-0
No files found.
dlls/shell32/brsfolder.c
View file @
be2259dc
...
...
@@ -200,7 +200,7 @@ static void InitializeTreeView( browse_info *info )
TRACE
(
"%p
\n
"
,
info
);
Shell_GetImageList
(
NULL
,
&
hImageList
);
Shell_GetImageList
s
(
NULL
,
&
hImageList
);
if
(
hImageList
)
SendMessageW
(
info
->
hwndTreeView
,
TVM_SETIMAGELIST
,
0
,
(
LPARAM
)
hImageList
);
...
...
dlls/shell32/iconcache.c
View file @
be2259dc
...
...
@@ -513,13 +513,13 @@ static int SIC_LoadOverlayIcon(int icon_idx)
}
/*************************************************************************
* Shell_GetImageList [SHELL32.71]
* Shell_GetImageList
s
[SHELL32.71]
*
* PARAMETERS
* imglist[1|2] [OUT] pointer which receives imagelist handles
*
*/
BOOL
WINAPI
Shell_GetImageList
(
HIMAGELIST
*
lpBigList
,
HIMAGELIST
*
lpSmallList
)
BOOL
WINAPI
Shell_GetImageList
s
(
HIMAGELIST
*
lpBigList
,
HIMAGELIST
*
lpSmallList
)
{
TRACE
(
"(%p,%p)
\n
"
,
lpBigList
,
lpSmallList
);
if
(
lpBigList
)
{
*
lpBigList
=
ShellBigIconList
;
...
...
dlls/shell32/shell32.spec
View file @
be2259dc
...
...
@@ -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)
...
...
dlls/shell32/shell32_main.h
View file @
be2259dc
...
...
@@ -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
);
...
...
dlls/shell32/shellord.c
View file @
be2259dc
...
...
@@ -2203,7 +2203,7 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv)
return
E_FAIL
;
}
Shell_GetImageList
(
&
hLarge
,
&
hSmall
);
Shell_GetImageList
s
(
&
hLarge
,
&
hSmall
);
hNew
=
ImageList_Duplicate
(
iImageList
==
SHIL_LARGE
?
hLarge
:
hSmall
);
/* Get the interface for the new image list */
...
...
dlls/shell32/shlmenu.c
View file @
be2259dc
...
...
@@ -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_GetImageList
s
(
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
);
...
...
include/shlobj.h
View file @
be2259dc
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment