[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    Make LookupIconIdFromDirectoryEx16 Call LookupIconIdFromDirectoryEx
From:       Ryan Cumming <ryan () completely ! kicks-ass ! org>
Date:       2002-11-15 2:45:02
[Download RAW message or body]

Found by winapi_check

-Ryan

ChangeLog:
Make LookupIconIdFromDirectoryEx16 call LookupIconIdFromDirectoryEx, instead 
of the other way around.
["LookupIconIdFromDirectoryEx.diff" (text/x-diff)]

Index: windows/cursoricon.c
===================================================================
RCS file: /home/wine/wine/windows/cursoricon.c,v
retrieving revision 1.56
diff -u -r1.56 cursoricon.c
--- windows/cursoricon.c	13 Nov 2002 19:43:53 -0000	1.56
+++ windows/cursoricon.c	15 Nov 2002 02:32:26 -0000
@@ -1403,11 +1403,20 @@
  *
  * FIXME: exact parameter sizes
  */
-INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE xdir, BOOL16 bIcon,
+INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE dir, BOOL16 bIcon,
 	     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;
-    UINT16 retVal = 0;
+    UINT retVal = 0;
     if( dir && !dir->idReserved && (dir->idType & 3) )
     {
 	CURSORICONDIRENTRY* entry;
@@ -1431,15 +1440,6 @@
     }
     else WARN_(cursor)("invalid resource directory\n");
     return retVal;
-}
-
-/**********************************************************************
- *		LookupIconIdFromDirectoryEx (USER32.@)
- */
-INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE dir, BOOL bIcon,
-             INT width, INT height, UINT cFlag )
-{
-    return LookupIconIdFromDirectoryEx16( dir, bIcon, width, height, cFlag );
 }
 
 /**********************************************************************


[prev in list] [next in list] [prev in thread] [next in thread]