* include/shellapi.h (ExtractIconEx[AW]): Correct return type

	to UINT.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index e5a51c7eb6e25d2a421232154d2c543edceb3aed..9a321f25e865015fd334dfcc34d81d26754f0ae8 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-09  Danny Smith  <dannysmith@users.sourveforge.net>
+       
+       * include/shellapi.h (ExtractIconEx[AW]): Correct return type
+       to UINT.
+       Thanks to: Dimitri Papadopoulos <dimitri_at@sourceforge.users.net>
+
 2002-12-07  Danny Smith  <dannysmith@users.sourveforge.net>
        
        * include/winuser.h (AllowSetForegroundWindow,

diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index 5e29fb321d4bae77ef6741aa32137a4869df41d9..99ec490e9371c5740fa25548f21bbc1b4a53c1cd 100644 (file)
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -201,8 +201,8 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE,LPCSTR,PWORD);
 HICON WINAPI ExtractAssociatedIconW(HINSTANCE,LPCWSTR,PWORD);
 HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
 HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
-HICON WINAPI ExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
-HICON WINAPI ExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
+UINT WINAPI ExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
+UINT WINAPI ExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
 HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
 HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
 UINT WINAPI SHAppBarMessage(DWORD,PAPPBARDATA);