aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2002-12-09 01:51:27 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2002-12-09 01:51:27 +0000
commit97cc22ad0662edd32330fc6e3ab0b9dd82dada1e (patch)
treeed6fab01883a426014ac2403bba130c9834216d4
parent6f45749cffd7c2b9bc2fb43a652d23aedafc28df (diff)
downloadnewlib-97cc22ad0662edd32330fc6e3ab0b9dd82dada1e.zip
newlib-97cc22ad0662edd32330fc6e3ab0b9dd82dada1e.tar.gz
newlib-97cc22ad0662edd32330fc6e3ab0b9dd82dada1e.tar.bz2
* include/shellapi.h (ExtractIconEx[AW]): Correct return type
to UINT.
-rw-r--r--winsup/w32api/ChangeLog6
-rw-r--r--winsup/w32api/include/shellapi.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index e5a51c7..9a321f2 100644
--- 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 5e29fb3..99ec490 100644
--- 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);