Implemented GetIconInfo16 -> call to GetIconInfo32.

dlls/comctl32/imagelist.c

@@ -1431,7 +1431,7 @@ ImageList_LoadImage32A (HINSTANCE32 hi, LPCSTR lpbmp, INT32 cx,	INT32 cGrow,
         ICONINFO ii;
         BITMAP32 bmp;
 
-        GetIconInfo (handle, &ii);
+        GetIconInfo32 (handle, &ii);
         GetObject32A (ii.hbmColor, sizeof(BITMAP32), (LPVOID)&bmp);
         himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
@@ -1495,7 +1495,7 @@ ImageList_LoadImage32W (HINSTANCE32 hi, LPCWSTR lpbmp, INT32 cx, INT32 cGrow,
         ICONINFO ii;
         BITMAP32 bmp;
 
-        GetIconInfo (handle, &ii);
+        GetIconInfo32 (handle, &ii);
         GetObject32A (ii.hbmMask, sizeof(BITMAP32), (LPVOID)&bmp);
         himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
@@ -1876,7 +1876,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT32 i, HICON32 hIcon)
     if ((i >= himl->cCurImage) || (i < -1))
 	return -1;
 
-    GetIconInfo (hIcon, &ii);
+    GetIconInfo32 (hIcon, &ii);
     if (ii.hbmMask == 0)
 	ERR (imagelist, "no mask!\n");
     if (ii.hbmColor == 0)

if1632/user.spec

@@ -363,7 +363,7 @@ file	user.exe
 390 pascal16 CopyImage(word word word word word) CopyImage16
 391 stub SignalProc32
 394 pascal16 DrawIconEx(word word word word word word word word word) DrawIconEx16
-395 stub GetIconInfo
+395 pascal16 GetIconInfo(word long) GetIconInfo16
 397 pascal16 RegisterClassEx(ptr) RegisterClassEx16
 398 pascal16 GetClassInfoEx(word segstr ptr) GetClassInfoEx16
 399 pascal16 ChildWindowFromPointEx(word long word) ChildWindowFromPointEx16

include/wine/winuser16.h

@@ -352,6 +352,7 @@ INT16       WINAPI GetDlgItemText16(HWND16,INT16,SEGPTR,UINT16);
 UINT16      WINAPI GetDoubleClickTime16(void);
 HWND16      WINAPI GetFocus16(void);
 HWND16      WINAPI GetForegroundWindow16(void);
+BOOL16      WINAPI GetIconInfo16(HICON16,LPICONINFO);
 BOOL16      WINAPI GetInputState16(void);
 UINT16      WINAPI GetInternalWindowPos16(HWND16,LPRECT16,LPPOINT16);
 INT16       WINAPI GetKeyboardLayoutName16(LPSTR);

include/winuser.h

@@ -646,7 +646,8 @@ INT32       WINAPI EnumPropsEx32W(HWND32,PROPENUMPROCEX32W,LPARAM);
 #define     EnumPropsEx WINELIB_NAME_AW(EnumPropsEx)
 BOOL32      WINAPI EnumThreadWindows(DWORD,WNDENUMPROC32,LPARAM);
 BOOL32      WINAPI ExitWindowsEx(UINT32,DWORD);
-BOOL32      WINAPI GetIconInfo(HICON32,LPICONINFO);
+BOOL32      WINAPI GetIconInfo32(HICON32,LPICONINFO);
+#define     GetIconInfo WINELIB_NAME(GetIconInfo)
 DWORD       WINAPI GetMenuContextHelpId32(HMENU32);
 #define     GetMenuContextHelpId WINELIB_NAME(GetMenuContextHelpId)
 UINT32      WINAPI GetMenuDefaultItem32(HMENU32,UINT32,UINT32);

objects/cursoricon.c

@@ -1565,9 +1565,17 @@ HICON32 WINAPI LoadIcon32A(HINSTANCE32 hInstance, LPCSTR name)
 }
 
 /**********************************************************************
- *          GetIconInfo		(USER32.242)
+ *          GetIconInfo16       (USER.395)
  */
-BOOL32 WINAPI GetIconInfo(HICON32 hIcon,LPICONINFO iconinfo) {
+BOOL16 WINAPI GetIconInfo16(HICON16 hIcon,LPICONINFO iconinfo)
+{
+    return (BOOL16)GetIconInfo32((HICON32)hIcon, iconinfo);
+}
+
+/**********************************************************************
+ *          GetIconInfo32		(USER32.242)
+ */
+BOOL32 WINAPI GetIconInfo32(HICON32 hIcon,LPICONINFO iconinfo) {
     CURSORICONINFO	*ciconinfo;
 
     ciconinfo = GlobalLock16(hIcon);

relay32/user32.spec

@@ -243,7 +243,7 @@ init	MAIN_UserInit
 239 stdcall GetDoubleClickTime() GetDoubleClickTime32
 240 stdcall GetFocus() GetFocus32
 241 stdcall GetForegroundWindow() GetForegroundWindow32
-242 stdcall GetIconInfo(long ptr) GetIconInfo
+242 stdcall GetIconInfo(long ptr) GetIconInfo32
 243 stub GetInputDesktop
 244 stdcall GetInputState() GetInputState32
 245 stdcall GetInternalWindowPos(long ptr ptr) GetInternalWindowPos32