Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed NtGdiAlphaBlend prototype.

Browse source 
- Changed name for NtGdiSetIcmMode, updated ntgdibad.h.
- Fix size issue in w32ksvc.db.

svn path=/trunk/; revision=28253
This commit is contained in:
James Tabor 2007-08-09 06:48:07 +00:00
parent e11b16d9e7
commit 56ed3e702f
8 changed files with 46 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/gdi32/gdi32.def
View file

@ -248,7 +248,7 @@ FrameRgn@20=NtGdiFrameRgn@20
GdiAddFontResourceW@12
GdiAddGlsBounds@8
GdiAddGlsRecord@16
GdiAlphaBlend@44=NtGdiAlphaBlend@44
GdiAlphaBlend@44
GdiArtificialDecrementDriver@8
GdiCleanCacheDC@4
GdiComment@12

35
reactos/dll/win32/gdi32/misc/misc.c
View file

@ -33,6 +33,41 @@ HANDLE CurrentProcessId = NULL;
DWORD GDI_BatchLimit = 1;
BOOL
STDCALL
GdiAlphaBlend(
HDC hDCDst,
int DstX,
int DstY,
int DstCx,
int DstCy,
HDC hDCSrc,
int SrcX,
int SrcY,
int SrcCx,
int SrcCy,
BLENDFUNCTION BlendFunction
)
{
if ( hDCSrc == NULL ) return FALSE;
if (GDI_HANDLE_GET_TYPE(hDCSrc) == GDI_OBJECT_TYPE_METADC) return FALSE;
return NtGdiAlphaBlend(
hDCDst,
DstX,
DstY,
DstCx,
DstCy,
hDCSrc,
SrcX,
SrcY,
SrcCx,
SrcCy,
BlendFunction,
0 );
}
/*
* @implemented
*/

3
reactos/include/psdk/ntgdi.h
View file

@ -1097,7 +1097,8 @@ NtGdiAlphaBlend(
IN LONG SrcY,
IN LONG SrcCx,
IN LONG SrcCy,
IN BLENDFUNCTION BlendFunction
IN BLENDFUNCTION BlendFunction,
IN HANDLE hcmXform
);
W32KAPI

6
reactos/include/reactos/win32k/ntgdibad.h
View file

@ -748,12 +748,6 @@ NtGdiSetGraphicsMode (
int Mode
);
/* Use NtGdiSetIcmMode. */
INT
STDCALL
NtGdiSetICMMode(HDC hDC,
INT EnableICM);
/* Should be done in user-mode. */
BOOL
STDCALL

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

@ -1592,7 +1592,7 @@ UserDrawIconEx(
BlendFunc.AlphaFormat = AC_SRC_ALPHA;
NtGdiAlphaBlend(hDc, xLeft, yTop, cxWidth, cyHeight,
hdcOff, 0, 0, cxWidth, cyHeight, BlendFunc);
hdcOff, 0, 0, cxWidth, cyHeight, BlendFunc, 0);
}
else
{

3
reactos/subsystems/win32/win32k/objects/bitmaps.c
View file

@ -1394,7 +1394,8 @@ NtGdiAlphaBlend(
LONG YOriginSrc,
LONG WidthSrc,
LONG HeightSrc,
BLENDFUNCTION BlendFunc)
BLENDFUNCTION BlendFunc,
HANDLE hcmXform)
{
PDC DCDest = NULL;
PDC DCSrc = NULL;

5
reactos/subsystems/win32/win32k/objects/icm.c
View file

@ -123,8 +123,9 @@ NtGdiSetDeviceGammaRamp(HDC hDC,
INT
STDCALL
NtGdiSetICMMode(HDC hDC,
INT EnableICM)
NtGdiSetIcmMode(HDC hDC,
ULONG nCommand,
ULONG EnableICM) // ulMode
{
/* FIXME: this should be coded someday */
if (EnableICM == ICM_OFF)

6
reactos/subsystems/win32/win32k/w32ksvc.db
View file

@ -13,7 +13,7 @@ NtGdiAbortPath 1
# NtGdiAddFontMemResourceEx 5
# NtGdiRemoveMergeFont 2
# NtGdiAddRemoteMMInstanceToDC 3
# NtGdiAlphaBlend 12 Wrong number of param ?
NtGdiAlphaBlend 12
NtGdiAngleArc 6
# NtGdiAnyLinkedFonts 0
# NtGdiFontIsLinked 1
@ -280,7 +280,7 @@ NtGdiSetDeviceGammaRamp 2
# NtGdiSetDIBitsToDeviceInternal 16
# NtGdiSetFontEnumeration 1
# NtGdiSetFontXform 3
# NtGdiSetIcmMode 3 Wrong number of param ?
NtGdiSetIcmMode 3
# NtGdiSetLinkedUFIs 3
# NtGdiSetMagicColors 3
NtGdiSetMetaRgn 1
@ -676,7 +676,6 @@ NtGdiEngAlphaBlend 7
#
#
# Wrong number of param ?
NtGdiSetICMMode 2
NtUserCreateWindowEx 14
NtUserCreateWindowStation 6
NtUserEnumDisplayMonitors 5
@ -691,7 +690,6 @@ NtUserSetCursorIconData 6
NtUserSetWinEventHook 8
NtUserUnregisterClass 2
NtUserValidateHandleSecure 1
NtGdiAlphaBlend 11
#
#ReactOS specify syscall
NtGdiSelectObject 2