Commit dc71624d authored by Ryan Cumming's avatar Ryan Cumming Committed by Alexandre Julliard

Make LookupIconIdFromDirectoryEx16 call LookupIconIdFromDirectoryEx,

instead of the other way around.
parent 9f029b7d
...@@ -1403,11 +1403,20 @@ BOOL WINAPI GetClipCursor( RECT *rect ) ...@@ -1403,11 +1403,20 @@ BOOL WINAPI GetClipCursor( RECT *rect )
* *
* FIXME: exact parameter sizes * FIXME: exact parameter sizes
*/ */
INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE xdir, BOOL16 bIcon, INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE dir, BOOL16 bIcon,
INT16 width, INT16 height, UINT16 cFlag ) INT16 width, INT16 height, UINT16 cFlag )
{ {
return LookupIconIdFromDirectoryEx( dir, bIcon, width, height, cFlag );
}
/**********************************************************************
* LookupIconIdFromDirectoryEx (USER32.@)
*/
INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon,
INT width, INT height, UINT cFlag )
{
CURSORICONDIR *dir = (CURSORICONDIR*)xdir; CURSORICONDIR *dir = (CURSORICONDIR*)xdir;
UINT16 retVal = 0; UINT retVal = 0;
if( dir && !dir->idReserved && (dir->idType & 3) ) if( dir && !dir->idReserved && (dir->idType & 3) )
{ {
CURSORICONDIRENTRY* entry; CURSORICONDIRENTRY* entry;
...@@ -1434,15 +1443,6 @@ INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE xdir, BOOL16 bIcon, ...@@ -1434,15 +1443,6 @@ INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE xdir, BOOL16 bIcon,
} }
/********************************************************************** /**********************************************************************
* LookupIconIdFromDirectoryEx (USER32.@)
*/
INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE dir, BOOL bIcon,
INT width, INT height, UINT cFlag )
{
return LookupIconIdFromDirectoryEx16( dir, bIcon, width, height, cFlag );
}
/**********************************************************************
* LookupIconIdFromDirectory (USER.?) * LookupIconIdFromDirectory (USER.?)
*/ */
INT16 WINAPI LookupIconIdFromDirectory16( LPBYTE dir, BOOL16 bIcon ) INT16 WINAPI LookupIconIdFromDirectory16( LPBYTE dir, BOOL16 bIcon )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment