Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k|User32]

Browse source 
- Updated DrawIconEx information for Meta support.

svn path=/trunk/; revision=45359
This commit is contained in:
James Tabor 2010-01-31 18:38:45 +00:00
parent 6fd5a51915
commit 2afb0124d2
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/user32/windows/icon.c
View file

@ -16,10 +16,9 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id$ /*
*
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/icon.c * FILE: dll/win32/user32/windows/icon.c
* PURPOSE: Icon * PURPOSE: Icon
* PROGRAMMER: Casper S. Hornstrup (chorns@users.sourceforge.net) * PROGRAMMER: Casper S. Hornstrup (chorns@users.sourceforge.net)
* UPDATE HISTORY: * UPDATE HISTORY:
@ -346,7 +345,7 @@ DrawIcon(
int Y, int Y,
HICON hIcon) 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);
} }
/* /*

13
reactos/include/reactos/win32k/ntuser.h
View file

@ -1548,6 +1548,15 @@ NtUserDrawCaptionTemp(
const PUNICODE_STRING str, const PUNICODE_STRING str,
UINT uFlags); UINT uFlags);
// Used with NtUserDrawIconEx, last parameter.
typedef struct _DRAWICONEXDATA
{
HBITMAP hbmMask;
HBITMAP hbmColor;
int cx;
int cy;
} DRAWICONEXDATA, *PDRAWICONEXDATA;
BOOL BOOL
NTAPI NTAPI
NtUserDrawIconEx( NtUserDrawIconEx(
@ -1560,8 +1569,8 @@ NtUserDrawIconEx(
UINT istepIfAniCur, UINT istepIfAniCur,
HBRUSH hbrFlickerFreeDraw, HBRUSH hbrFlickerFreeDraw,
UINT diFlags, UINT diFlags,
DWORD Unknown0, BOOL bMetaHDC,
DWORD Unknown1); PVOID pDIXData);
DWORD DWORD
NTAPI NTAPI

4
reactos/subsystems/win32/win32k/ntuser/cursoricon.c
View file

@ -1563,8 +1563,8 @@ NtUserDrawIconEx(
UINT istepIfAniCur, UINT istepIfAniCur,
HBRUSH hbrFlickerFreeDraw, HBRUSH hbrFlickerFreeDraw,
UINT diFlags, UINT diFlags,
DWORD Unknown0, BOOL bMetaHDC, // When TRUE, GDI functions need to be handled in User32!
DWORD Unknown1) PVOID pDIXData)
{ {
PCURICON_OBJECT pIcon; PCURICON_OBJECT pIcon;
BOOL Ret; BOOL Ret;