[tkreuzer] 27883: - add painting.c to gdi32.def - implement FloodFill, calling NtGdiExtFloodFill - implement CreateRectRgnIndirect, calling NtGdiCreateRectRgn - remove NtGdiCreateRectRgnIndirect, NtGdiFloodFill from win32k - update ntgdibad.h
Author: tkreuzer Date: Thu Jul 26 23:52:51 2007 New Revision: 27883
URL: http://svn.reactos.org/svn/reactos?rev=27883&view=rev Log: - add painting.c to gdi32.def - implement FloodFill, calling NtGdiExtFloodFill - implement CreateRectRgnIndirect, calling NtGdiCreateRectRgn - remove NtGdiCreateRectRgnIndirect, NtGdiFloodFill from win32k - update ntgdibad.h
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/tools/nci/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 Jul 26 23:52:51 2007 @@ -84,7 +84,7 @@ CreatePolyPolygonRgn@16=NtGdiCreatePolyPolygonRgn@16 CreatePolygonRgn@12=NtGdiCreatePolygonRgn@12 CreateRectRgn@16=NtGdiCreateRectRgn@16 -CreateRectRgnIndirect@4=NtGdiCreateRectRgnIndirect@4 +CreateRectRgnIndirect@4 CreateRoundRectRgn@24=NtGdiCreateRoundRectRgn@24 CreateScalableFontResourceA@16 CreateScalableFontResourceW@16 @@ -234,7 +234,7 @@ FillRgn@12=NtGdiFillRgn@12 FixBrushOrgEx@16 FlattenPath@4 -FloodFill@16=NtGdiFloodFill@16 +FloodFill@16 FontIsLinked@4 FONTOBJ_cGetAllGlyphHandles@8 FONTOBJ_cGetGlyphs@20
Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbuil... ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Thu Jul 26 23:52:51 2007 @@ -46,6 +46,7 @@ <file>font.c</file> <file>linedda.c</file> <file>metafile.c</file> + <file>painting.c</file> <file>pen.c</file> <file>region.c</file> <file>text.c</file>
Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pai... ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Thu Jul 26 23:52:51 2007 @@ -18,6 +18,7 @@ __asm fistp out #endif
+#if 0 /* FIXME: enable this as soon as we have working usermode gdi */ LONG FASTCALL EFtoF( EFLOAT_S * efp) @@ -890,4 +891,15 @@ } return NtGdiPolyPolyDraw( hDC , Point, Count, Polys, GdiPolyPolyLine ); } - +#endif + +BOOL +WINAPI +FloodFill( + HDC hDC, + int nXStart, + int nYStart, + COLORREF crFill) +{ + return NtGdiExtFloodFill(hDC, nXStart, nYStart, crFill, FLOODFILLBORDER); +}
Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/reg... ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Thu Jul 26 23:52:51 2007 @@ -56,3 +56,19 @@ } return NULL; } + +HRGN +WINAPI +CreateRectRgnIndirect( + const RECT *prc +) +{ + if (prc) + { + return NtGdiCreateRectRgn(prc->left, + prc->top, + prc->right, + prc->bottom); + } + return NULL; +}
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 Jul 26 23:52:51 2007 @@ -245,11 +245,6 @@ INT Count, INT PolyFillMode);
-/* Use NtGdiCreateRectRgn with expanded paraemters. */ -HRGN -STDCALL -NtGdiCreateRectRgnIndirect(CONST PRECT rc); - /* Use NtGdiTransformPoints with GdiDpToLp. */ BOOL STDCALL @@ -332,16 +327,6 @@ LPCWSTR lpString, UINT cbCount, CONST INT *lpDx); - -/* Use NtGdiExtFloodFill with FLOODFILLBORDER. */ -BOOL -STDCALL -NtGdiFloodFill ( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Fill - );
/* Should be done in user-mode. */ BOOL
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 Jul 26 23:52:51 2007 @@ -566,16 +566,6 @@
/* lie and say we succeded */ return TRUE; -} - -BOOL STDCALL -NtGdiFloodFill( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Fill) -{ - return NtGdiExtFloodFill(hDC, XStart, YStart, Fill, FLOODFILLBORDER ); }
BOOL STDCALL
Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Thu Jul 26 23:52:51 2007 @@ -2044,31 +2044,6 @@ return NULL; }
-HRGN STDCALL -NtGdiCreateRectRgnIndirect(CONST PRECT rc) -{ - RECT SafeRc = {0}; - NTSTATUS Status = STATUS_SUCCESS; - - _SEH_TRY - { - ProbeForRead(rc, - sizeof(RECT), - 1); - SafeRc = *rc; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (!NT_SUCCESS(Status)) - { - return(NULL); - } - return(UnsafeIntCreateRectRgnIndirect(&SafeRc)); -} - HRGN STDCALL NtGdiCreateRoundRectRgn(INT left, INT top, INT right, INT bottom,
Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=27... ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Thu Jul 26 23:52:51 2007 @@ -38,7 +38,6 @@ NtGdiCreatePolygonRgn 3 NtGdiCreatePolyPolygonRgn 4 NtGdiCreateRectRgn 4 -NtGdiCreateRectRgnIndirect 1 NtGdiCreateRoundRectRgn 6 NtGdiCreateScalableFontResource 4 NtGdiCreateSolidBrush 2 @@ -73,7 +72,6 @@ NtGdiFillPath 1 NtGdiFillRgn 3 NtGdiFlattenPath 1 -NtGdiFloodFill 4 NtGdiFrameRgn 5 NtGdiGdiComment 3 NtGdiFlush 0
-
tkreuzer＠svn.reactos.org