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
Johnny Cai
wine
Commits
e2b06d2a
Commit
e2b06d2a
authored
22 years ago
by
Rolf Kalbermatter
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added stub implementation with correct prototypes for
ExtractAssociatedIconExA/W.
parent
9e2ab038
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/shell32/iconcache.c
+15
-7
15 additions, 7 deletions
dlls/shell32/iconcache.c
dlls/shell32/shell32.spec
+2
-2
2 additions, 2 deletions
dlls/shell32/shell32.spec
include/shellapi.h
+3
-0
3 additions, 0 deletions
include/shellapi.h
with
20 additions
and
9 deletions
dlls/shell32/iconcache.c
+
15
−
7
View file @
e2b06d2a
...
@@ -498,25 +498,33 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lp
...
@@ -498,25 +498,33 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lp
}
}
/*************************************************************************
/*************************************************************************
* ExtractAssociatedIconEx
A
(SHELL32.@)
* ExtractAssociatedIconEx
W
(SHELL32.@)
*
*
* Return icon for given file (either from file itself or from associated
* Return icon for given file (either from file itself or from associated
* executable) and patch parameters if needed.
* executable) and patch parameters if needed.
*/
*/
HICON
WINAPI
ExtractAssociatedIconEx
A
(
DWORD
d1
,
DWORD
d2
,
DWORD
d3
,
DWORD
d4
)
HICON
WINAPI
ExtractAssociatedIconEx
W
(
HINSTANCE
hInst
,
LPWSTR
lpIconPath
,
LPWORD
lpiIconIdx
,
LPWORD
lpiIconId
)
{
{
FIXME
(
"
(%lx %lx %lx %lx): stub
\n
"
,
d1
,
d2
,
d3
,
d4
);
FIXME
(
"
%p %s %p %p): stub
\n
"
,
hInst
,
debugstr_w
(
lpIconPath
),
lpiIconIdx
,
lpiIconId
);
return
0
;
return
0
;
}
}
/*************************************************************************
/*************************************************************************
* ExtractAssociatedIconEx
W
(SHELL32.@)
* ExtractAssociatedIconEx
A
(SHELL32.@)
*
*
* Return icon for given file (either from file itself or from associated
* Return icon for given file (either from file itself or from associated
* executable) and patch parameters if needed.
* executable) and patch parameters if needed.
*/
*/
HICON
WINAPI
ExtractAssociatedIconEx
W
(
DWORD
d1
,
DWORD
d2
,
DWORD
d3
,
DWORD
d4
)
HICON
WINAPI
ExtractAssociatedIconEx
A
(
HINSTANCE
hInst
,
LPSTR
lpIconPath
,
LPWORD
lpiIconIdx
,
LPWORD
lpiIconId
)
{
{
FIXME
(
"(%lx %lx %lx %lx): stub
\n
"
,
d1
,
d2
,
d3
,
d4
);
HICON
ret
;
return
0
;
INT
len
=
MultiByteToWideChar
(
CP_ACP
,
0
,
lpIconPath
,
-
1
,
NULL
,
0
);
LPWSTR
lpwstrFile
=
HeapAlloc
(
GetProcessHeap
(),
0
,
len
*
sizeof
(
WCHAR
)
);
TRACE
(
"%p %s %p %p)
\n
"
,
hInst
,
lpIconPath
,
lpiIconIdx
,
lpiIconId
);
MultiByteToWideChar
(
CP_ACP
,
0
,
lpIconPath
,
-
1
,
lpwstrFile
,
len
);
ret
=
ExtractAssociatedIconExW
(
hInst
,
lpwstrFile
,
lpiIconIdx
,
lpiIconId
);
HeapFree
(
GetProcessHeap
(),
0
,
lpwstrFile
);
return
ret
;
}
}
This diff is collapsed.
Click to expand it.
dlls/shell32/shell32.spec
+
2
−
2
View file @
e2b06d2a
...
@@ -321,8 +321,8 @@
...
@@ -321,8 +321,8 @@
@ stub DragQueryFileAorW
@ stub DragQueryFileAorW
@ stdcall DuplicateIcon(long long) DuplicateIcon
@ stdcall DuplicateIcon(long long) DuplicateIcon
@ stdcall ExtractAssociatedIconA(long ptr long)ExtractAssociatedIconA
@ stdcall ExtractAssociatedIconA(long ptr long)ExtractAssociatedIconA
@ stdcall ExtractAssociatedIconExA(long
long
long long)ExtractAssociatedIconExA
@ stdcall ExtractAssociatedIconExA(long
str
long long)
ExtractAssociatedIconExA
@ stdcall ExtractAssociatedIconExW(long
long
long long)ExtractAssociatedIconExW
@ stdcall ExtractAssociatedIconExW(long
wstr
long long)
ExtractAssociatedIconExW
@ stub ExtractAssociatedIconW
@ stub ExtractAssociatedIconW
@ stdcall ExtractIconA(long str long)ExtractIconA
@ stdcall ExtractIconA(long str long)ExtractIconA
@ stdcall ExtractIconEx(ptr long ptr ptr long)ExtractIconExAW
@ stdcall ExtractIconEx(ptr long ptr ptr long)ExtractIconExAW
...
...
This diff is collapsed.
Click to expand it.
include/shellapi.h
+
3
−
0
View file @
e2b06d2a
...
@@ -270,6 +270,9 @@ HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
...
@@ -270,6 +270,9 @@ HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
HICON
WINAPI
ExtractAssociatedIconA
(
HINSTANCE
,
LPSTR
,
LPWORD
);
HICON
WINAPI
ExtractAssociatedIconA
(
HINSTANCE
,
LPSTR
,
LPWORD
);
HICON
WINAPI
ExtractAssociatedIconW
(
HINSTANCE
,
LPWSTR
,
LPWORD
);
HICON
WINAPI
ExtractAssociatedIconW
(
HINSTANCE
,
LPWSTR
,
LPWORD
);
#define ExtractAssociatedIcon WINELIB_NAME_AW(ExtractAssociatedIcon)
#define ExtractAssociatedIcon WINELIB_NAME_AW(ExtractAssociatedIcon)
HICON
WINAPI
ExtractAssociatedIconExA
(
HINSTANCE
,
LPSTR
,
LPWORD
,
LPWORD
);
HICON
WINAPI
ExtractAssociatedIconExW
(
HINSTANCE
,
LPWSTR
,
LPWORD
,
LPWORD
);
#define ExtractAssociatedIconEx WINELIB_NAME_AW(ExtractAssociatedIconEx)
HICON
WINAPI
ExtractIconExA
(
LPCSTR
,
INT
,
HICON
*
,
HICON
*
,
UINT
);
HICON
WINAPI
ExtractIconExA
(
LPCSTR
,
INT
,
HICON
*
,
HICON
*
,
UINT
);
HICON
WINAPI
ExtractIconExW
(
LPCWSTR
,
INT
,
HICON
*
,
HICON
*
,
UINT
);
HICON
WINAPI
ExtractIconExW
(
LPCWSTR
,
INT
,
HICON
*
,
HICON
*
,
UINT
);
#define ExtractIconEx WINELIB_NAME_AW(ExtractIconEx)
#define ExtractIconEx WINELIB_NAME_AW(ExtractIconEx)
...
...
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