From 34647baaf16624c13878b2562213705b73efadd4 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sat, 1 Sep 2007 21:36:44 +0000 Subject: [PATCH] add PatBlt, PolyPatBlt to user mode redirect PATHOBJ_bEnum@8 to NtGdiPATHOBJ_bEnum@8, PATHOBJ_bEnumClipLines@12 to NtGdiPATHOBJ_bEnumClipLines@12, PATHOBJ_vEnumStart@4 to NtGdiPATHOBJ_vEnumStart@4, PATHOBJ_vEnumStartClipLines@16 to NtGdiPATHOBJ_vEnumStartClipLines@16, PATHOBJ_vGetBounds@8 to NtGdiPATHOBJ_vGetBounds@8 update the good api list svn path=/trunk/; revision=28752 --- reactos/dll/win32/gdi32/gdi32.def | 42 ++++++++------- reactos/dll/win32/gdi32/good api.def | 5 ++ reactos/dll/win32/gdi32/misc/stubs.c | 77 +++++++++------------------- 3 files changed, 50 insertions(+), 74 deletions(-) diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def index 7b1b104b769..ea3353f4f1e 100644 --- a/reactos/dll/win32/gdi32/gdi32.def +++ b/reactos/dll/win32/gdi32/gdi32.def @@ -416,8 +416,26 @@ OffsetClipRgn@12 OffsetRgn@12 OffsetViewportOrgEx@16 OffsetWindowOrgEx@16 - - +PATHOBJ_bEnum@8=NtGdiPATHOBJ_bEnum@8 +PATHOBJ_bEnumClipLines@12=NtGdiPATHOBJ_bEnumClipLines@12 +PATHOBJ_vEnumStart@4=NtGdiPATHOBJ_vEnumStart@4 +PATHOBJ_vEnumStartClipLines@16=NtGdiPATHOBJ_vEnumStartClipLines@16 +PATHOBJ_vGetBounds@8=NtGdiPATHOBJ_vGetBounds@8 +PaintRgn@8 +PatBlt@24 +PathToRegion@4 +Pie@36 +PlayEnhMetaFile@12 +PlayEnhMetaFileRecord@16 +PlayMetaFile@8 +PlayMetaFileRecord@16 +PlgBlt@40 +PolyBezier@12 +PolyBezierTo@12 +PolyDraw@16 +PolyPatBlt@20 +PolyPolygon@16 +PolyPolyline@16 @@ -494,26 +512,6 @@ GetBrushAttributes@4 GetGlyphIndicesA@20 GetTextExtentExPointWPri@28 GetTextExtentPoint32A@16 -PaintRgn@8 -PatBlt@24=NtGdiPatBlt@24 -PATHOBJ_bEnum@8 -PATHOBJ_bEnumClipLines@12 -PATHOBJ_vEnumStart@4 -PATHOBJ_vEnumStartClipLines@16 -PATHOBJ_vGetBounds@8 -PolyPatBlt@20=NtGdiPolyPatBlt@20 -PathToRegion@4 -Pie@36 -PlayEnhMetaFile@12 -PlayEnhMetaFileRecord@16 -PlayMetaFile@8 -PlayMetaFileRecord@16 -PlgBlt@40 -PolyBezier@12 -PolyBezierTo@12 -PolyDraw@16 -PolyPolygon@16 -PolyPolyline@16 PolyTextOutA@12 PolyTextOutW@12 Polygon@12 diff --git a/reactos/dll/win32/gdi32/good api.def b/reactos/dll/win32/gdi32/good api.def index 2064aaab901..d937c087d26 100644 --- a/reactos/dll/win32/gdi32/good api.def +++ b/reactos/dll/win32/gdi32/good api.def @@ -155,6 +155,11 @@ GetTransform@12 GetWorldTransform@8 HT_Get8BPPFormatPalette@16 HT_Get8BPPMaskPalette@24 +PATHOBJ_bEnum@8 +PATHOBJ_bEnumClipLines@12 +PATHOBJ_vEnumStart@4 +PATHOBJ_vEnumStartClipLines@16 +PATHOBJ_vGetBounds@8 diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c index 732a291e048..bcf6d1f6c74 100644 --- a/reactos/dll/win32/gdi32/misc/stubs.c +++ b/reactos/dll/win32/gdi32/misc/stubs.c @@ -2196,57 +2196,6 @@ EngWideCharToMultiByte( UINT CodePage, } -/* - * @unimplemented - */ -BOOL STDCALL -PATHOBJ_bEnum(PATHOBJ *ppo,PATHDATA *ppd) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -PATHOBJ_bEnumClipLines(PATHOBJ *ppo,ULONG cb,CLIPLINE *pcl) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -VOID STDCALL -PATHOBJ_vEnumStart(PATHOBJ *ppo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} - -/* - * @unimplemented - */ -VOID STDCALL -PATHOBJ_vEnumStartClipLines(PATHOBJ *ppo,CLIPOBJ *pco,SURFOBJ *pso,LINEATTRS *pla) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} - -/* - * @unimplemented - */ -VOID STDCALL -PATHOBJ_vGetBounds(PATHOBJ *ppo,PRECTFX prectfx) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} /* * @unimplemented @@ -2775,7 +2724,32 @@ NamedEscape(HDC hdc, * when it calls to NtGdiExtEscape from NamedEscape */ return NtGdiExtEscape(NULL,pDriver,wcslen(pDriver),iEsc,cjIn,pjIn,cjOut,pjOut); +} + +BOOL +STDCALL +PatBlt(HDC hdc, + int nXLeft, + int nYLeft, + int nWidth, + int nHeight, + DWORD dwRop) +{ + /* FIXME some part need be done in user mode */ + return PatBlt( hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); +} + +BOOL +STDCALL +PolyPatBlt(IN HDC hdc, + IN DWORD rop4, + IN PPOLYPATBLT pPoly, + IN DWORD Count, + IN DWORD Mode) +{ + /* FIXME some part need be done in user mode */ + return NtGdiPolyPatBlt(hdc, rop4, pPoly,Count,Mode); } @@ -2786,4 +2760,3 @@ NamedEscape(HDC hdc, -