Author: jimtabor Date: Sun Jan 31 19:38:45 2010 New Revision: 45359
URL: http://svn.reactos.org/svn/reactos?rev=45359&view=rev Log: [Win32k|User32] - Updated DrawIconEx information for Meta support.
Modified: trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/ic... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Sun Jan 31 19:38:45 2010 @@ -16,10 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/icon.c + * FILE: dll/win32/user32/windows/icon.c * PURPOSE: Icon * PROGRAMMER: Casper S. Hornstrup (chorns@users.sourceforge.net) * UPDATE HISTORY: @@ -346,7 +345,7 @@ int Y, HICON hIcon) { - return DrawIconEx(hDC, X, Y, hIcon, 0, 0, 0, NULL, DI_NORMAL | DI_DEFAULTSIZE); + return DrawIconEx(hDC, X, Y, hIcon, 0, 0, 0, NULL, DI_NORMAL|DI_DEFAULTSIZE|DI_COMPAT); }
/*
Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntus... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jan 31 19:38:45 2010 @@ -1548,6 +1548,15 @@ const PUNICODE_STRING str, UINT uFlags);
+// Used with NtUserDrawIconEx, last parameter. +typedef struct _DRAWICONEXDATA +{ + HBITMAP hbmMask; + HBITMAP hbmColor; + int cx; + int cy; +} DRAWICONEXDATA, *PDRAWICONEXDATA; + BOOL NTAPI NtUserDrawIconEx( @@ -1560,8 +1569,8 @@ UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags, - DWORD Unknown0, - DWORD Unknown1); + BOOL bMetaHDC, + PVOID pDIXData);
DWORD NTAPI
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Jan 31 19:38:45 2010 @@ -1563,8 +1563,8 @@ UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags, - DWORD Unknown0, - DWORD Unknown1) + BOOL bMetaHDC, // When TRUE, GDI functions need to be handled in User32! + PVOID pDIXData) { PCURICON_OBJECT pIcon; BOOL Ret;