Skip to content
Snippets Groups Projects
Commit e2b06d2a authored by Rolf Kalbermatter's avatar Rolf Kalbermatter Committed by Alexandre Julliard
Browse files

Added stub implementation with correct prototypes for

ExtractAssociatedIconExA/W.
parent 9e2ab038
No related branches found
No related tags found
No related merge requests found
...@@ -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
} }
/************************************************************************* /*************************************************************************
* ExtractAssociatedIconExA (SHELL32.@) * ExtractAssociatedIconExW (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 ExtractAssociatedIconExA(DWORD d1, DWORD d2, DWORD d3, DWORD d4) HICON WINAPI ExtractAssociatedIconExW(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;
} }
/************************************************************************* /*************************************************************************
* ExtractAssociatedIconExW (SHELL32.@) * ExtractAssociatedIconExA (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 ExtractAssociatedIconExW(DWORD d1, DWORD d2, DWORD d3, DWORD d4) HICON WINAPI ExtractAssociatedIconExA(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;
} }
...@@ -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
......
...@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment