Changeset 4688 for trunk/include/win/shellapi.h

Timestamp:

Nov 24, 2000, 2:15:55 PM (25 years ago)

Author:

sandervl

Message:

KS:header update

File:

• trunk/include/win/shellapi.h (modified) (2 diffs)

trunk/include/win/shellapi.h

@@ -1 @@
-/* $Id: shellapi.h,v 1.9 2000-08-30 13:56:38 sandervl Exp $ */
+/* $Id: shellapi.h,v 1.10 2000-11-24 13:15:55 sandervl Exp $ */
 
 #ifndef _WINE_SHELLAPI_H
@@ -313 +313 @@
 HICON     WINAPI ExtractAssociatedIconW(HINSTANCE,LPWSTR,LPWORD);
 
+#ifdef __WIN32OS2__
+
+UINT WINAPI ExtractIconExA( LPCSTR, INT, HICON *, HICON *, UINT );
+UINT WINAPI ExtractIconExW( LPCWSTR, INT, HICON *, HICON *, UINT );
+UINT WINAPI ExtractIconExAW(LPCVOID, INT, HICON *, HICON *, UINT );
+
+#else /* __WIN32OS2__ */
+
+/* Return types are wrong according to SDK docs. */
 HICON WINAPI ExtractIconExA( LPCSTR, INT, HICON *, HICON *, UINT );
 HICON WINAPI ExtractIconExW( LPCWSTR, INT, HICON *, HICON *, UINT );
 HICON WINAPI ExtractIconExAW(LPCVOID, INT, HICON *, HICON *, UINT );
 
+#endif /* __WIN32OS2__ */
+
 HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
 HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);