Implement ExtEscape, MaskBlt, PlgBlt, wich were linked to the Nt functions before...

svn path=/trunk/; revision=28063

diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def
index 27c3e0d..0d63e31 100644 (file)
--- a/reactos/dll/win32/gdi32/gdi32.def
+++ b/reactos/dll/win32/gdi32/gdi32.def
@@ -225,7 +225,7 @@ EudcUnloadLinkW@8
 ExcludeClipRect@20=NtGdiExcludeClipRect@20
 ExtCreatePen@20
 ExtCreateRegion@12=NtGdiExtCreateRegion@12
-ExtEscape@24=NtGdiExtEscape@24
+ExtEscape@24
 ExtFloodFill@20=NtGdiExtFloodFill@20
 ExtSelectClipRgn@12=NtGdiExtSelectClipRgn@12
 ExtTextOutA@32
@@ -467,7 +467,7 @@ InvertRgn@8=NtGdiInvertRgn@8
 LPtoDP@12=NtGdiLPtoDP@12
 LineDDA@24
 LineTo@12=NtGdiLineTo@12
-MaskBlt@48=NtGdiMaskBlt@48
+MaskBlt@48
 MirrorRgn@8
 ModifyWorldTransform@12=NtGdiModifyWorldTransform@12
 MoveToEx@16=NtGdiMoveToEx@16
@@ -490,7 +490,7 @@ PlayEnhMetaFile@12
 PlayEnhMetaFileRecord@16
 PlayMetaFile@8
 PlayMetaFileRecord@16
-PlgBlt@40=NtGdiPlgBlt@40
+PlgBlt@40
 PolyBezier@12=NtGdiPolyBezier@12
 PolyBezierTo@12=NtGdiPolyBezierTo@12
 PolyDraw@16=NtGdiPolyDraw@16

diff --git a/reactos/dll/win32/gdi32/misc/misc.c b/reactos/dll/win32/gdi32/misc/misc.c
index d27af7b..4058df8 100644 (file)
--- a/reactos/dll/win32/gdi32/misc/misc.c
+++ b/reactos/dll/win32/gdi32/misc/misc.c
@@ -145,3 +145,15 @@ GdiReleaseDC(HDC hdc)
        return 0;
 }
 
+INT STDCALL
+ExtEscape(
+       HDC hDC,
+       int nEscape,
+       int cbInput,
+       LPCSTR lpszInData,
+       int cbOutput,
+       LPSTR lpszOutData
+)
+{
+       return NtGdiExtEscape(hDC, NULL, 0, nEscape, cbInput, (LPSTR)lpszInData, cbOutput, lpszOutData);
+}

diff --git a/reactos/dll/win32/gdi32/objects/painting.c b/reactos/dll/win32/gdi32/objects/painting.c
index c1137b4..6fc1b7f 100644 (file)
--- a/reactos/dll/win32/gdi32/objects/painting.c
+++ b/reactos/dll/win32/gdi32/objects/painting.c
@@ -903,3 +903,61 @@ FloodFill(
 {
     return NtGdiExtFloodFill(hDC, nXStart, nYStart, crFill, FLOODFILLBORDER);
 }
+
+BOOL WINAPI
+MaskBlt(
+       HDC hdcDest,
+       INT nXDest,
+       INT nYDest,
+       INT nWidth,
+       INT nHeight,
+       HDC hdcSrc,
+       INT nXSrc,
+       INT nYSrc,
+       HBITMAP hbmMask,
+       INT xMask,
+       INT yMask,
+       DWORD dwRop)
+{
+       return NtGdiMaskBlt(hdcDest,
+                           nXDest,
+                           nYDest,
+                           nWidth,
+                           nHeight,
+                           hdcSrc,
+                           nXSrc,
+                           nYSrc,
+                           hbmMask,
+                           xMask,
+                           yMask,
+                           dwRop,
+                           0);
+}
+
+
+BOOL
+WINAPI
+PlgBlt(
+       HDC hdcDest,
+       const POINT *lpPoint,
+       HDC hdcSrc,
+       INT nXSrc,
+       INT nYSrc,
+       INT nWidth,
+       INT nHeight,
+       HBITMAP hbmMask,
+       INT xMask,
+       INT yMask)
+{
+       return NtGdiPlgBlt(hdcDest,
+                          (LPPOINT)lpPoint,
+                          hdcSrc,
+                          nXSrc,
+                          nYSrc,
+                          nWidth,
+                          nHeight,
+                          hbmMask,
+                          xMask,
+                          yMask,
+                          0);
+}