Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jason Beetham
wine
Commits
628e3e0f
Commit
628e3e0f
authored
26 years ago
by
Marcus Meissner
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Implemented ExtractIconEx16, added some consts to ExtractIconEx*.
parent
18aacf15
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/shell32/iconcache.c
+3
-3
3 additions, 3 deletions
dlls/shell32/iconcache.c
if1632/shell.spec
+1
-1
1 addition, 1 deletion
if1632/shell.spec
include/shell.h
+4
-3
4 additions, 3 deletions
include/shell.h
misc/shell.c
+32
-1
32 additions, 1 deletion
misc/shell.c
with
40 additions
and
8 deletions
dlls/shell32/iconcache.c
+
3
−
3
View file @
628e3e0f
...
...
@@ -706,7 +706,7 @@ INT32 WINAPI Shell_GetCachedImageIndex32AW(LPCVOID szPath, INT32 nIndex, DWORD z
/*************************************************************************
* ExtracticonEx32 [shell32.189]
*/
HICON32
WINAPI
ExtractIconEx32AW
(
LPVOID
lpszFile
,
INT32
nIconIndex
,
HICON32
*
phiconLarge
,
HICON32
*
phiconSmall
,
UINT32
nIcons
)
HICON32
WINAPI
ExtractIconEx32AW
(
LP
C
VOID
lpszFile
,
INT32
nIconIndex
,
HICON32
*
phiconLarge
,
HICON32
*
phiconSmall
,
UINT32
nIcons
)
{
if
(
VERSION_OsIsUnicode
())
return
ExtractIconEx32W
(
lpszFile
,
nIconIndex
,
phiconLarge
,
phiconSmall
,
nIcons
);
return
ExtractIconEx32A
(
lpszFile
,
nIconIndex
,
phiconLarge
,
phiconSmall
,
nIcons
);
...
...
@@ -718,7 +718,7 @@ HICON32 WINAPI ExtractIconEx32AW ( LPVOID lpszFile, INT32 nIconIndex, HICON32 *
* 1 file is not valid
* HICON32 handle of a icon (phiconLarge/Small == NULL)
*/
HICON32
WINAPI
ExtractIconEx32A
(
LPSTR
lpszFile
,
INT32
nIconIndex
,
HICON32
*
phiconLarge
,
HICON32
*
phiconSmall
,
UINT32
nIcons
)
HICON32
WINAPI
ExtractIconEx32A
(
LP
C
STR
lpszFile
,
INT32
nIconIndex
,
HICON32
*
phiconLarge
,
HICON32
*
phiconSmall
,
UINT32
nIcons
)
{
HICON32
ret
=
0
;
TRACE
(
shell
,
"file=%s idx=%i %p %p num=%i
\n
"
,
lpszFile
,
nIconIndex
,
phiconLarge
,
phiconSmall
,
nIcons
);
...
...
@@ -750,7 +750,7 @@ HICON32 WINAPI ExtractIconEx32A ( LPSTR lpszFile, INT32 nIconIndex, HICON32 * ph
/*************************************************************************
* ExtracticonEx32W [shell32.191]
*/
HICON32
WINAPI
ExtractIconEx32W
(
LPWSTR
lpszFile
,
INT32
nIconIndex
,
HICON32
*
phiconLarge
,
HICON32
*
phiconSmall
,
UINT32
nIcons
)
HICON32
WINAPI
ExtractIconEx32W
(
LP
C
WSTR
lpszFile
,
INT32
nIconIndex
,
HICON32
*
phiconLarge
,
HICON32
*
phiconSmall
,
UINT32
nIcons
)
{
LPSTR
sFile
;
DWORD
ret
;
...
...
This diff is collapsed.
Click to expand it.
if1632/shell.spec
+
1
−
1
View file @
628e3e0f
...
...
@@ -21,7 +21,7 @@ type win16
37 pascal DoEnvironmentSubst(ptr word) DoEnvironmentSubst
38 pascal FindEnvironmentString(ptr) FindEnvironmentString
39 pascal16 InternalExtractIcon(word ptr s_word word) InternalExtractIcon
40
stub
ExtractIconEx
40
pascal16 ExtractIconEx(str word ptr ptr word)
ExtractIconEx
16
# 98 stub SHL3216_THUNKDATA16
# 99 stub SHL1632_THUNKDATA16
...
...
This diff is collapsed.
Click to expand it.
include/shell.h
+
4
−
3
View file @
628e3e0f
...
...
@@ -311,10 +311,11 @@ LPWSTR WINAPI StrFormatByteSize32W ( DWORD dw, LPWSTR pszBuf, UINT32 cchBuf );
/****************************************************************************
* other functions
*/
HICON32
WINAPI
ExtractIconEx32A
(
LPSTR
,
INT32
,
HICON32
*
,
HICON32
*
,
UINT32
);
HICON32
WINAPI
ExtractIconEx32W
(
LPWSTR
,
INT32
,
HICON32
*
,
HICON32
*
,
UINT32
);
HICON16
WINAPI
ExtractIconEx16
(
LPCSTR
,
INT16
,
HICON16
*
,
HICON16
*
,
UINT16
);
HICON32
WINAPI
ExtractIconEx32A
(
LPCSTR
,
INT32
,
HICON32
*
,
HICON32
*
,
UINT32
);
HICON32
WINAPI
ExtractIconEx32W
(
LPCWSTR
,
INT32
,
HICON32
*
,
HICON32
*
,
UINT32
);
#define ExtractIconEx WINELIB_NAME_AW(ExtractIconEx)
HICON32
WINAPI
ExtractIconEx32AW
(
LPVOID
,
INT32
,
HICON32
*
,
HICON32
*
,
UINT32
);
HICON32
WINAPI
ExtractIconEx32AW
(
LP
C
VOID
,
INT32
,
HICON32
*
,
HICON32
*
,
UINT32
);
LPVOID
WINAPI
SHAlloc
(
DWORD
len
);
DWORD
WINAPI
SHFree
(
LPVOID
x
);
...
...
This diff is collapsed.
Click to expand it.
misc/shell.c
+
32
−
1
View file @
628e3e0f
...
...
@@ -875,7 +875,38 @@ HICON16 WINAPI ExtractIcon16( HINSTANCE16 hInstance, LPCSTR lpszExeFileName,
return
ExtractIcon32A
(
hInstance
,
lpszExeFileName
,
nIconIndex
);
}
/*************************************************************************
* ExtractIconEx16 (SHELL.40)
*/
HICON16
WINAPI
ExtractIconEx16
(
LPCSTR
lpszFile
,
INT16
nIconIndex
,
HICON16
*
phiconLarge
,
HICON16
*
phiconSmall
,
UINT16
nIcons
)
{
HICON32
*
ilarge
,
*
ismall
;
UINT16
ret
;
int
i
;
if
(
phiconLarge
)
ilarge
=
(
HICON32
*
)
HeapAlloc
(
GetProcessHeap
(),
0
,
nIcons
*
sizeof
(
HICON32
));
else
ilarge
=
NULL
;
if
(
phiconSmall
)
ismall
=
(
HICON32
*
)
HeapAlloc
(
GetProcessHeap
(),
0
,
nIcons
*
sizeof
(
HICON32
));
else
ismall
=
NULL
;
ret
=
ExtractIconEx32A
(
lpszFile
,
nIconIndex
,
ilarge
,
ismall
,
nIcons
);
if
(
ilarge
)
{
for
(
i
=
0
;
i
<
nIcons
;
i
++
)
phiconLarge
[
i
]
=
ilarge
[
i
];
HeapFree
(
GetProcessHeap
(),
0
,
ilarge
);
}
if
(
ismall
)
{
for
(
i
=
0
;
i
<
nIcons
;
i
++
)
phiconSmall
[
i
]
=
ismall
[
i
];
HeapFree
(
GetProcessHeap
(),
0
,
ismall
);
}
return
ret
;
}
/*************************************************************************
* ExtractAssociatedIcon [SHELL.36]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment