commit ffb912e6925b40374e6fede236ad5496e673978f
author Marcus Meissner <marcus@jet.franken.de> Thu Jan 28 09:14:38 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 28 09:14:38 1999 +0000
tree 6ebdd1250b4a7618fd2e8a19682d725d99188849
parent f0a3545699c39560f91923eb5e8ac6bb62d76876

Fixed GetIconInfo16 (.spec,ICONINFO struct is different for Win16/Win32).

include/winuser.h

diff --git a/include/winuser.h b/include/winuser.h
index cca5e17..e078a81 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -117,7 +117,10 @@
 	DWORD		yHotspot;
 	HBITMAP32	hbmMask;
 	HBITMAP32	hbmColor;
-} ICONINFO,*LPICONINFO;
+} ICONINFO32,*LPICONINFO32;
+
+DECL_WINELIB_TYPE(ICONINFO);
+DECL_WINELIB_TYPE(LPICONINFO);
 
 /* this is the 6 byte accel struct used in Win32 when presented to the user */
 typedef struct
@@ -638,7 +641,7 @@
 INT32       WINAPI CopyAcceleratorTable32A(HACCEL32,LPACCEL32,INT32);
 INT32       WINAPI CopyAcceleratorTable32W(HACCEL32,LPACCEL32,INT32);
 #define     CopyAcceleratorTable WINELIB_NAME_AW(CopyAcceleratorTable)
-HICON32     WINAPI CreateIconIndirect(LPICONINFO);
+HICON32     WINAPI CreateIconIndirect(LPICONINFO32);
 BOOL32      WINAPI DestroyAcceleratorTable(HACCEL32);
 BOOL32      WINAPI EnumDisplayMonitors(HDC32,LPRECT32,MONITORENUMPROC,LPARAM);
 INT32       WINAPI EnumPropsEx32A(HWND32,PROPENUMPROCEX32A,LPARAM);
@@ -646,7 +649,7 @@
 #define     EnumPropsEx WINELIB_NAME_AW(EnumPropsEx)
 BOOL32      WINAPI EnumThreadWindows(DWORD,WNDENUMPROC32,LPARAM);
 BOOL32      WINAPI ExitWindowsEx(UINT32,DWORD);
-BOOL32      WINAPI GetIconInfo32(HICON32,LPICONINFO);
+BOOL32      WINAPI GetIconInfo32(HICON32,LPICONINFO32);
 #define     GetIconInfo WINELIB_NAME(GetIconInfo)
 DWORD       WINAPI GetMenuContextHelpId32(HMENU32);
 #define     GetMenuContextHelpId WINELIB_NAME(GetMenuContextHelpId)