Sat Sep 1 14:52:23 CEST 2007

Author: greatlrd
Date: Sat Sep  1 16:52:23 2007
New Revision: 28738

URL: http://svn.reactos.org/svn/reactos?rev=28738&view=rev
Log:
add stub for : IsValidEnhMetaRecord and IsValidEnhMetaRecordOffExt, I have not search after any info about thuse api
follow api need have some part done in user mode : OffsetRgn, GetTextCharsetInfo, IntersectClipRect, OffsetClipRgn.
Implement partly NamedEscape we need metadc support to finish full implement 
follow api have been move from redirect to smaller code into hacks.c for they are ros own syscall and 
does not exists in windows, GetStretchBltMode, GetTextAlign, GetTextColor, MoveToEx, OffsetViewportOrgEx, OffsetWindowOrgEx.
redirect HT_Get8BPPMaskPalette, HT_Get8BPPFormatPalette, GetSystemPaletteUse to win32k

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

Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?rev=28738&r1=28737&r2=28738&view=diff
==============================================================================

--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Sep  1 16:52:23 2007
@@ -366,6 +366,69 @@
 GetRegionData at 12
 GetRelAbs at 8
 GetRgnBox at 8
+GetStockObject at 4
+GetStretchBltMode at 4
+GetStringBitmapA at 20
+GetStringBitmapW at 20
+GetSystemPaletteEntries at 16
+GetSystemPaletteUse at 4=NtGdiGetSystemPaletteUse at 4
+GetTextAlign at 4
+GetTextCharacterExtra at 4
+GetTextCharset at 4
+GetTextCharsetInfo at 12
+GetTextColor at 4
+GetTextExtentExPointA at 28
+GetTextExtentExPointI at 28
+GetTextExtentExPointW at 28
+GetTextExtentExPointWPri at 28
+GetTextExtentPoint32A at 16
+GetTextExtentPoint32W at 16
+GetTextExtentPointA at 16
+GetTextExtentPointI at 16
+GetTextExtentPointW at 16
+GetTextFaceA at 12
+GetTextFaceAliasW at 12
+GetTextFaceW at 12
+GetTextMetricsA at 8
+GetTextMetricsW at 8
+GetTransform at 12=NtGdiGetTransform at 12
+GetViewportExtEx at 8
+GetViewportOrgEx at 8
+GetWinMetaFileBits at 20
+GetWindowExtEx at 8
+GetWindowOrgEx at 8
+GetWorldTransform at 8
+HT_Get8BPPFormatPalette at 16=NtGdiHT_Get8BPPFormatPalette at 16
+HT_Get8BPPMaskPalette at 24=NtGdiHT_Get8BPPMaskPalette at 24
+IntersectClipRect at 20
+InvertRgn at 8
+IsValidEnhMetaRecord at 8
+IsValidEnhMetaRecordOffExt at 16
+LPtoDP at 12
+LineDDA at 24
+LineTo at 12
+MaskBlt at 48
+MirrorRgn at 8
+ModifyWorldTransform at 12
+MoveToEx at 16
+NamedEscape at 28
+OffsetClipRgn at 12
+OffsetRgn at 12
+OffsetViewportOrgEx at 16
+OffsetWindowOrgEx at 16
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ClearBitmapAttributes at 8
 ClearBrushAttributes at 8
@@ -429,54 +492,8 @@
 GetBitmapAttributes at 4
 GetBrushAttributes at 4
 GetGlyphIndicesA at 20
-GetStockObject at 4
-GetStretchBltMode at 4=NtGdiGetStretchBltMode at 4
-GetStringBitmapA at 20
-GetStringBitmapW at 20
-GetSystemPaletteEntries at 16
-GetSystemPaletteUse at 4
-GetTextAlign at 4=NtGdiGetTextAlign at 4
-GetTextCharacterExtra at 4
-GetTextCharset at 4
-GetTextCharsetInfo at 12=NtGdiGetTextCharsetInfo at 12
-GetTextColor at 4=NtGdiGetTextColor at 4
-GetTextExtentExPointA at 28
-GetTextExtentExPointI at 28
-GetTextExtentExPointW at 28
 GetTextExtentExPointWPri at 28
 GetTextExtentPoint32A at 16
-GetTextExtentPoint32W at 16
-GetTextExtentPointA at 16
-GetTextExtentPointI at 16
-GetTextExtentPointW at 16
-GetTextFaceA at 12
-GetTextFaceW at 12
-GetTextFaceAliasW at 12
-GetTextMetricsA at 8
-GetTextMetricsW at 8
-GetTransform at 12=NtGdiGetTransform at 12
-GetViewportExtEx at 8
-GetViewportOrgEx at 8
-GetWinMetaFileBits at 20
-GetWindowExtEx at 8
-GetWindowOrgEx at 8
-GetWorldTransform at 8
-HT_Get8BPPFormatPalette at 16
-HT_Get8BPPMaskPalette at 24
-IntersectClipRect at 20=NtGdiIntersectClipRect at 20
-InvertRgn at 8
-LPtoDP at 12
-LineDDA at 24
-LineTo at 12
-MaskBlt at 48
-MirrorRgn at 8
-ModifyWorldTransform at 12
-MoveToEx at 16=NtGdiMoveToEx at 16
-NamedEscape at 32
-OffsetClipRgn at 12=NtGdiOffsetClipRgn at 12
-OffsetRgn at 12=NtGdiOffsetRgn at 12
-OffsetViewportOrgEx at 16=NtGdiOffsetViewportOrgEx at 16
-OffsetWindowOrgEx at 16=NtGdiOffsetWindowOrgEx at 16
 PaintRgn at 8
 PatBlt at 24=NtGdiPatBlt at 24
 PATHOBJ_bEnum at 8

Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks.c?rev=28738&r1=28737&r2=28738&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Sat Sep  1 16:52:23 2007
@@ -140,5 +140,81 @@
     return NtGdiGetMapMode(hdc);
 }
 
-
-
+/*
+ * @implemented
+ *
+ */
+int 
+STDCALL
+GetStretchBltMode(HDC hdc)
+{
+    return NtGdiGetStretchBltMode(hdc);
+}
+
+/*
+ * @implemented
+ *
+ */
+UINT 
+STDCALL
+GetTextAlign(HDC hdc)
+{
+    return NtGdiGetTextAlign(hdc);
+}
+
+
+/*
+ * @implemented
+ *
+ */
+COLORREF
+STDCALL
+GetTextColor(HDC hdc)
+{
+    return NtGdiGetTextColor(hdc);
+}
+
+/*
+ * @implemented
+ *
+ */
+BOOL
+STDCALL
+MoveToEx(HDC hdc,
+         int X,
+         int Y,
+         LPPOINT lpPoint)
+{
+    return MoveToEx(hdc, X, Y, lpPoint);
+}
+
+/*
+ * @implemented
+ *
+ */
+BOOL
+STDCALL
+OffsetViewportOrgEx(HDC hdc,
+                    int nXOffset,
+                    int nYOffset,
+                    LPPOINT lpPoint)
+{
+    return OffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint);
+}
+
+/*
+ * @implemented
+ *
+ */
+BOOL 
+STDCALL
+OffsetWindowOrgEx(HDC hdc,
+                  int nXOffset,
+                  int nYOffset,
+                  LPPOINT lpPoint)
+{
+    return NtGdiOffsetWindowOrgEx(hdc, nXOffset, nYOffset, lpPoint);
+}
+
+
+

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=28738&r1=28737&r2=28738&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Sep  1 16:52:23 2007
@@ -142,15 +142,7 @@
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-UINT
-STDCALL
-GetSystemPaletteUse(HDC hDc)
-{
-    return NtGdiGetSystemPaletteUse(hDc);
-}
+
 
 /*
  * @unimplemented
@@ -1073,8 +1065,39 @@
 
 
 
-
-
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+IsValidEnhMetaRecord(
+	DWORD	a0,
+	DWORD	a1
+	)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+
+}
+
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+IsValidEnhMetaRecordOffExt(
+	DWORD	a0,
+	DWORD	a1,
+	DWORD	a2,
+	DWORD	a3
+	)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+
+}
 
 /*
  * @unimplemented
@@ -1569,29 +1592,7 @@
     return retValue;
 }
 
-/*
- * @unimplemented
- */
-LONG 
-STDCALL
-HT_Get8BPPFormatPalette(LPPALETTEENTRY pPaletteEntry, USHORT RedGamma,USHORT GreenGamma, USHORT BlueGamma)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-LONG 
-STDCALL
-HT_Get8BPPMaskPalette(LPPALETTEENTRY pPaletteEntry, BOOL Use8BPPMaskPal,BYTE CMYMask, USHORT RedGamma, USHORT GreenGamma, USHORT BlueGamma)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
+
 
 /*
  * @unimplemented
@@ -1605,17 +1606,7 @@
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-int 
-STDCALL
-NamedEscape(HDC hdc,PWCHAR pDriver,int nDriver,int iEsc,int cjIn,LPSTR pjIn,int cjOut,LPSTR pjOut)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
+
 
 /*
  * @unimplemented
@@ -2719,4 +2710,80 @@
 }
 
 
-
+/*
+ * @implemented
+ *
+ */
+INT
+STDCALL
+OffsetRgn( HRGN hrgn,
+          int nXOffset,
+          int nYOffset)
+{
+    /* FIXME some part are done in user mode */
+    return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset);
+}
+
+
+INT
+STDCALL
+GetTextCharsetInfo(HDC hdc,
+                   LPFONTSIGNATURE lpSig,
+                   DWORD dwFlags)
+{
+    /* FIXME some part are done in user mode */
+    return NtGdiGetTextCharsetInfo(hdc, lpSig, dwFlags); 
+}
+
+
+
+INT 
+STDCALL
+IntersectClipRect(HDC hdc,
+                  int nLeftRect,
+                  int nTopRect,
+                  int nRightRect,
+                  int nBottomRect)
+{
+    /* FIXME some part are done in user mode */
+    return NtGdiIntersectClipRect(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect);
+}
+
+INT 
+STDCALL
+OffsetClipRgn(HDC hdc,
+              int nXOffset,
+              int nYOffset)
+{
+    /* FIXME some part are done in user mode */
+    return NtGdiOffsetClipRgn( hdc,  nXOffset,  nYOffset);
+}
+
+
+INT
+STDCALL
+NamedEscape(HDC hdc,
+            PWCHAR pDriver,
+            INT iEsc, 
+            INT cjIn,
+            LPSTR pjIn,
+            INT cjOut,
+            LPSTR pjOut)
+{
+    /* FIXME metadc, metadc are done most in user mode, and we do not support it 
+     * Windows 2000/XP/Vista ignore the current hdc, that are being pass and always set hdc to NULL 
+     * when it calls to NtGdiExtEscape from NamedEscape
+     */
+    return NtGdiExtEscape(NULL,pDriver,wcslen(pDriver),iEsc,cjIn,pjIn,cjOut,pjOut);
+
+}
+
+
+
+
+
+
+
+
+
+

Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/coord.c?rev=28738&r1=28737&r2=28738&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/coord.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/coord.c Sat Sep  1 16:52:23 2007
@@ -143,6 +143,9 @@
 }
 
 
+/*
+ * @implemented
+ */
 BOOL
 STDCALL
 GetWorldTransform( HDC hDC, LPXFORM lpXform )


