From 48428871b5e200aaac40874721eb534fe1108327 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 2 Aug 2007 01:44:59 +0000 Subject: [PATCH] remove NtGdiArc, NtGdiArcTo and NtGdiChord from win32k, they are not used any longer. svn path=/trunk/; revision=28091 --- .../win32/win32k/objects/fillshap.c | 16 --- .../subsystems/win32/win32k/objects/line.c | 119 ------------------ reactos/subsystems/win32/win32k/w32ksvc.db | 3 - 3 files changed, 138 deletions(-) diff --git a/reactos/subsystems/win32/win32k/objects/fillshap.c b/reactos/subsystems/win32/win32k/objects/fillshap.c index e2fb9ef2c22..b2669700cb4 100644 --- a/reactos/subsystems/win32/win32k/objects/fillshap.c +++ b/reactos/subsystems/win32/win32k/objects/fillshap.c @@ -149,22 +149,6 @@ IntGdiPolyPolygon(DC *dc, /******************************************************************************/ -BOOL -STDCALL -NtGdiChord(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * NtGdiEllipse * diff --git a/reactos/subsystems/win32/win32k/objects/line.c b/reactos/subsystems/win32/win32k/objects/line.c index 8f0815dff55..721d7f3b8ef 100644 --- a/reactos/subsystems/win32/win32k/objects/line.c +++ b/reactos/subsystems/win32/win32k/objects/line.c @@ -284,29 +284,6 @@ IntGdiGetArcDirection(DC *dc) return dc->w.ArcDirection; } -BOOL FASTCALL -IntGdiArc(DC *dc, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc) -{ - if(PATH_IsPathOpen(dc->w.path)) - { - return PATH_Arc(dc, LeftRect, TopRect, RightRect, BottomRect, - XStartArc, YStartArc, XEndArc, YEndArc, GdiTypeArc ); - } - - // FIXME -// EngArc(dc, LeftRect, TopRect, RightRect, BottomRect, UNIMPLEMENTED -// XStartArc, YStartArc, XEndArc, YEndArc); - - return TRUE; -} BOOL FASTCALL IntGdiPolyPolyline(DC *dc, @@ -350,102 +327,6 @@ NtGdiAngleArc( return FALSE; } -BOOL -STDCALL -NtGdiArc(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc) -{ - DC *dc; - BOOL Ret; - - dc = DC_LockDc (hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - Ret = IntGdiArc(dc, - LeftRect, - TopRect, - RightRect, - BottomRect, - XStartArc, - YStartArc, - XEndArc, - YEndArc); - - DC_UnlockDc( dc ); - return Ret; -} - -BOOL -STDCALL -NtGdiArcTo(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2) -{ - BOOL result; - DC *dc; - - dc = DC_LockDc (hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - // Line from current position to starting point of arc - if ( !IntGdiLineTo(dc, XRadial1, YRadial1) ) - { - DC_UnlockDc(dc); - return FALSE; - } - - //dc = DC_LockDc(hDC); - - //if(!dc) return FALSE; - - // Then the arc is drawn. - result = IntGdiArc(dc, LeftRect, TopRect, RightRect, BottomRect, - XRadial1, YRadial1, XRadial2, YRadial2); - - //DC_UnlockDc(dc); - - // If no error occured, the current position is moved to the ending point of the arc. - if(result) - IntGdiMoveToEx(dc, XRadial2, YRadial2, NULL); - - DC_UnlockDc(dc); - - return result; -} - INT STDCALL NtGdiGetArcDirection(HDC hDC) diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db index ed983c711a8..9df26313650 100644 --- a/reactos/subsystems/win32/win32k/w32ksvc.db +++ b/reactos/subsystems/win32/win32k/w32ksvc.db @@ -5,13 +5,10 @@ NtGdiAddFontResource 2 NtGdiAlphaBlend 11 NtGdiAngleArc 6 NtGdiAnimatePalette 4 -NtGdiArc 9 NtGdiArcInternal 10 -NtGdiArcTo 9 NtGdiBeginPath 1 NtGdiBitBlt 11 NtGdiCancelDC 1 -NtGdiChord 9 NtGdiCloseEnhMetaFile 1 NtGdiCloseFigure 1 NtGdiCloseMetaFile 1