[jimtabor] 28253: - Fixed NtGdiAlphaBlend prototype. - Changed name for NtGdiSetIcmMode, updated ntgdibad.h. - Fix size issue in w32ksvc.db.
Author: jimtabor Date: Thu Aug 9 10:48:07 2007 New Revision: 28253
URL: http://svn.reactos.org/svn/reactos?rev=28253&view=rev Log: - Fixed NtGdiAlphaBlend prototype. - Changed name for NtGdiSetIcmMode, updated ntgdibad.h. - Fix size issue in w32ksvc.db.
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/include/psdk/ntgdi.h trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?r... ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 9 10:48:07 2007 @@ -248,7 +248,7 @@ GdiAddFontResourceW@12 GdiAddGlsBounds@8 GdiAddGlsRecord@16 -GdiAlphaBlend@44=NtGdiAlphaBlend@44 +GdiAlphaBlend@44 GdiArtificialDecrementDriver@8 GdiCleanCacheDC@4 GdiComment@12
Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.c... ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Thu Aug 9 10:48:07 2007 @@ -32,6 +32,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
Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=28... ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Thu Aug 9 10:48:07 2007 @@ -1097,7 +1097,8 @@ IN LONG SrcY, IN LONG SrcCx, IN LONG SrcCy, - IN BLENDFUNCTION BlendFunction + IN BLENDFUNCTION BlendFunction, + IN HANDLE hcmXform );
W32KAPI
Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgd... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Aug 9 10:48:07 2007 @@ -748,12 +748,6 @@ int Mode );
-/* Use NtGdiSetIcmMode. */ -INT -STDCALL -NtGdiSetICMMode(HDC hDC, - INT EnableICM); - /* Should be done in user-mode. */ BOOL STDCALL
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 (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Thu Aug 9 10:48:07 2007 @@ -1592,7 +1592,7 @@ 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 {
Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Thu Aug 9 10:48:07 2007 @@ -1394,7 +1394,8 @@ LONG YOriginSrc, LONG WidthSrc, LONG HeightSrc, - BLENDFUNCTION BlendFunc) + BLENDFUNCTION BlendFunc, + HANDLE hcmXform) { PDC DCDest = NULL; PDC DCSrc = NULL;
Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c Thu Aug 9 10:48:07 2007 @@ -123,8 +123,9 @@
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)
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 9 10:48:07 2007 @@ -13,7 +13,7 @@ # NtGdiAddFontMemResourceEx 5 # NtGdiRemoveMergeFont 2 # NtGdiAddRemoteMMInstanceToDC 3 -# NtGdiAlphaBlend 12 Wrong number of param ? +NtGdiAlphaBlend 12 NtGdiAngleArc 6 # NtGdiAnyLinkedFonts 0 # NtGdiFontIsLinked 1 @@ -280,7 +280,7 @@ # NtGdiSetDIBitsToDeviceInternal 16 # NtGdiSetFontEnumeration 1 # NtGdiSetFontXform 3 -# NtGdiSetIcmMode 3 Wrong number of param ? +NtGdiSetIcmMode 3 # NtGdiSetLinkedUFIs 3 # NtGdiSetMagicColors 3 NtGdiSetMetaRgn 1 @@ -676,7 +676,6 @@ # # # Wrong number of param ? -NtGdiSetICMMode 2 NtUserCreateWindowEx 14 NtUserCreateWindowStation 6 NtUserEnumDisplayMonitors 5 @@ -691,7 +690,6 @@ NtUserSetWinEventHook 8 NtUserUnregisterClass 2 NtUserValidateHandleSecure 1 -NtGdiAlphaBlend 11 # #ReactOS specify syscall NtGdiSelectObject 2
-
jimtabor＠svn.reactos.org