[ros-diffs] [greatlrd] 28581: redirect FONTOBJ_cGetAllGlyphHandles, FONTOBJ_cGetGlyphs, FONTOBJ_pQueryGlyphAttrs, FONTOBJ_pfdg, FONTOBJ_pifi, FONTOBJ_pvTrueTypeFontFile, FONTOBJ_pxoGetXform, FONTOBJ_vGetInfo to win32k.sys do not redirect ExcludeClipRect, ExtSelectClipRgn, FillRgn to win32k.sys, make a smaller functions in gdi32 for now, we need write more thing in user mode.

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Mon Aug 27 00:00:40 2007
New Revision: 28581

URL: http://svn.reactos.org/svn/reactos?rev=28581&view=rev
Log:
redirect FONTOBJ_cGetAllGlyphHandles, FONTOBJ_cGetGlyphs, FONTOBJ_pQueryGlyphAttrs, FONTOBJ_pfdg, FONTOBJ_pifi, FONTOBJ_pvTrueTypeFontFile, FONTOBJ_pxoGetXform, FONTOBJ_vGetInfo to win32k.sys
do not redirect ExcludeClipRect, ExtSelectClipRgn, FillRgn to win32k.sys, make a smaller functions in gdi32 for now, we need write more thing in user mode. 

Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/dll/win32/gdi32/misc/stubs.c

Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?rev=28581&r1=28580&r2=28581&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Mon Aug 27 00:00:40 2007
@@ -146,6 +146,46 @@
 EngTextOut at 40=NtGdiEngTextOut at 40
 EngTransparentBlt at 32=NtGdiEngTransparentBlt at 32
 EngUnicodeToMultiByteN at 20=RtlUnicodeToMultiByteN at 20
+EngUnlockSurface at 4=NtGdiEngUnlockSurface at 4
+EngWideCharToMultiByte at 20
+EnumEnhMetaFile at 20
+EnumFontFamiliesA at 16
+EnumFontFamiliesExA at 20
+EnumFontFamiliesExW at 20
+EnumFontFamiliesW at 16
+EnumFontsA at 16
+EnumFontsW at 16
+EnumICMProfilesA at 12
+EnumICMProfilesW at 12
+EnumMetaFile at 16
+EnumObjects at 16
+EqualRgn at 8=NtGdiEqualRgn at 8
+Escape at 20
+EudcLoadLinkW at 16
+EudcUnloadLinkW at 8
+ExcludeClipRect at 20
+ExtCreatePen at 20
+ExtCreateRegion at 12
+ExtEscape at 24
+ExtFloodFill at 20
+ExtSelectClipRgn at 12
+ExtTextOutA at 32
+ExtTextOutW at 32
+FONTOBJ_cGetAllGlyphHandles at 8=NtGdiFONTOBJ_cGetAllGlyphHandles at 8
+FONTOBJ_cGetGlyphs at 20=NtGdiFONTOBJ_cGetGlyphs at 20
+FONTOBJ_pQueryGlyphAttrs at 8=NtGdiFONTOBJ_pQueryGlyphAttrs at 8
+FONTOBJ_pfdg at 4=NtGdiFONTOBJ_pfdg at 4
+FONTOBJ_pifi at 4=NtGdiFONTOBJ_pifi at 4
+FONTOBJ_pvTrueTypeFontFile at 8=NtGdiFONTOBJ_pvTrueTypeFontFile at 8
+FONTOBJ_pxoGetXform at 4=NtGdiFONTOBJ_pxoGetXform at 4
+FONTOBJ_vGetInfo at 12=NtGdiFONTOBJ_vGetInfo at 12
+FillPath at 4
+FillRgn at 12
+FixBrushOrgEx at 16
+FlattenPath at 4
+FloodFill at 16
+FontIsLinked at 4
+FrameRgn at 20=NtGdiFontIsLinked at 4
 
 ClearBitmapAttributes at 8
 ClearBrushAttributes at 8
@@ -205,46 +245,7 @@
 DdEntry54 at 8=NtGdiDdUnlockD3D at 8
 DdEntry55 at 12=NtGdiDdUpdateOverlay at 12
 DdEntry56 at 8=NtGdiDdWaitForVerticalBlank at 8
-EngUnlockSurface at 4=NtGdiEngUnlockSurface at 4
-EngWideCharToMultiByte at 20
-EnumEnhMetaFile at 20
-EnumFontFamiliesA at 16
-EnumFontFamiliesExA at 20
-EnumFontFamiliesExW at 20
-EnumFontFamiliesW at 16
-EnumFontsA at 16
-EnumFontsW at 16
-EnumICMProfilesA at 12
-EnumICMProfilesW at 12
-EnumMetaFile at 16
-EnumObjects at 16
-EqualRgn at 8=NtGdiEqualRgn at 8
-Escape at 20
-EudcLoadLinkW at 16
-EudcUnloadLinkW at 8
-ExcludeClipRect at 20=NtGdiExcludeClipRect at 20
-ExtCreatePen at 20
-ExtCreateRegion at 12=NtGdiExtCreateRegion at 12
-ExtEscape at 24
-ExtFloodFill at 20
-ExtSelectClipRgn at 12=NtGdiExtSelectClipRgn at 12
-ExtTextOutA at 32
-ExtTextOutW at 32
-FillPath at 4
-FillRgn at 12=NtGdiFillRgn at 12
-FixBrushOrgEx at 16
-FlattenPath at 4
-FloodFill at 16
-FontIsLinked at 4
-FONTOBJ_cGetAllGlyphHandles at 8
-FONTOBJ_cGetGlyphs at 20
-FONTOBJ_pQueryGlyphAttrs at 8
-FONTOBJ_pfdg at 4
-FONTOBJ_pifi at 4
-FONTOBJ_pvTrueTypeFontFile at 8
-FONTOBJ_pxoGetXform at 4
-FONTOBJ_vGetInfo at 12
-FrameRgn at 20=NtGdiFrameRgn at 20
+
 GdiAddFontResourceW at 12
 GdiAddGlsBounds at 8
 GdiAddGlsRecord at 16

Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs.c?rev=28581&r1=28580&r2=28581&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Mon Aug 27 00:00:40 2007
@@ -2525,106 +2525,6 @@
                          NULL);
 }
 
-/*
- * @unimplemented
- */
-ULONG
-STDCALL
-FONTOBJ_cGetAllGlyphHandles(IN FONTOBJ *FontObj,
-                            IN HGLYPH  *Glyphs)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-ULONG
-STDCALL
-FONTOBJ_cGetGlyphs(IN FONTOBJ *FontObj,
-                   IN ULONG    Mode,
-                   IN ULONG    NumGlyphs,
-                   IN HGLYPH  *GlyphHandles,
-                   IN PVOID   *OutGlyphs)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-PFD_GLYPHATTR STDCALL
-FONTOBJ_pQueryGlyphAttrs(FONTOBJ *pfo,ULONG iMode)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-FD_GLYPHSET *STDCALL
-FONTOBJ_pfdg(FONTOBJ *pfo)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-IFIMETRICS*
-STDCALL
-FONTOBJ_pifi(IN FONTOBJ  *FontObj)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-PVOID
-STDCALL
-FONTOBJ_pvTrueTypeFontFile(IN FONTOBJ  *FontObj,
-                           IN ULONG    *FileSize)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-XFORMOBJ*
-STDCALL
-FONTOBJ_pxoGetXform(IN FONTOBJ  *FontObj)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-FONTOBJ_vGetInfo(IN  FONTOBJ   *FontObj,
-                 IN  ULONG      InfoSize,
-                 OUT PFONTINFO  FontInfo)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-}
 
 /*
  * @unimplemented
@@ -2857,3 +2757,39 @@
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
+
+/*
+ * @implemented
+ */
+INT
+STDCALL
+ExcludeClipRect(IN HDC hdc, IN INT xLeft, IN INT yTop, IN INT xRight, IN INT yBottom)
+{
+	/* FIXME some part need be done on user mode size */
+	return NtGdiExcludeClipRect(hdc, xLeft, yTop, xRight, yBottom);
+}
+
+/*
+ * @implemented
+ */
+INT
+STDCALL
+ExtSelectClipRgn( IN HDC hdc, IN HRGN hrgn, IN INT iMode)
+{
+	/* FIXME some part need be done on user mode size */
+	return NtGdiExtSelectClipRgn(hdc,hrgn, iMode);
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+FillRgn( IN HDC hdc, IN HRGN hrgn, IN HBRUSH hbrush)
+{
+	/* FIXME some part need be done on user mode size */
+	return NtGdiFillRgn( hdc, hrgn, hbrush);
+}
+
+
+