[ros-diffs] [tkreuzer] 28063: Implement ExtEscape, MaskBlt, PlgBlt, wich were linked to the Nt functions before. But those have a different parameter count. Fixes compilation.
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Wed Aug 1 04:07:16 CEST 2007
Author: tkreuzer
Date: Wed Aug 1 06:07:15 2007
New Revision: 28063
URL: http://svn.reactos.org/svn/reactos?rev=28063&view=rev
Log:
Implement ExtEscape, MaskBlt, PlgBlt, wich were linked to the Nt functions before. But those have a different parameter count. Fixes compilation.
Modified:
trunk/reactos/dll/win32/gdi32/gdi32.def
trunk/reactos/dll/win32/gdi32/misc/misc.c
trunk/reactos/dll/win32/gdi32/objects/painting.c
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?rev=28063&r1=28062&r2=28063&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Wed Aug 1 06:07:15 2007
@@ -225,7 +225,7 @@
ExcludeClipRect at 20=NtGdiExcludeClipRect at 20
ExtCreatePen at 20
ExtCreateRegion at 12=NtGdiExtCreateRegion at 12
-ExtEscape at 24=NtGdiExtEscape at 24
+ExtEscape at 24
ExtFloodFill at 20=NtGdiExtFloodFill at 20
ExtSelectClipRgn at 12=NtGdiExtSelectClipRgn at 12
ExtTextOutA at 32
@@ -467,7 +467,7 @@
LPtoDP at 12=NtGdiLPtoDP at 12
LineDDA at 24
LineTo at 12=NtGdiLineTo at 12
-MaskBlt at 48=NtGdiMaskBlt at 48
+MaskBlt at 48
MirrorRgn at 8
ModifyWorldTransform at 12=NtGdiModifyWorldTransform at 12
MoveToEx at 16=NtGdiMoveToEx at 16
@@ -490,7 +490,7 @@
PlayEnhMetaFileRecord at 16
PlayMetaFile at 8
PlayMetaFileRecord at 16
-PlgBlt at 40=NtGdiPlgBlt at 40
+PlgBlt at 40
PolyBezier at 12=NtGdiPolyBezier at 12
PolyBezierTo at 12=NtGdiPolyBezierTo at 12
PolyDraw at 16=NtGdiPolyDraw at 16
Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.c?rev=28063&r1=28062&r2=28063&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/misc.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/misc.c Wed Aug 1 06:07:15 2007
@@ -145,3 +145,15 @@
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);
+}
Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/painting.c?rev=28063&r1=28062&r2=28063&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/painting.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/painting.c Wed Aug 1 06:07:15 2007
@@ -903,3 +903,61 @@
{
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);
+}
More information about the Ros-diffs
mailing list