[ros-diffs] [greatlrd] 28533: * redirect EngCopyBits, EngCreateBitmap, EngCreatePalette, EngDeletePalette, EngDeletePath, EngDeleteSurface, EngEraseSurface, EngFillPath, EngMarkBandingSurface, EngPaint, EngPlgBlt, EngStrokeAndFillPath, EngStrokePath, EngTextOut, EngTransparentBlt to win32k.sys * add smaller code for Ellipse * redirect EngMultiByteToUnicodeN to RtlMultiByteToUnicodeN * redirect EngUnicodeToMultiByteN to RtlUnicodeToMultiByteN

greatlrd at svn.reactos.org greatlrd at svn.reactos.org
Sat Aug 25 00:44:37 CEST 2007


Author: greatlrd
Date: Sat Aug 25 02:44:36 2007
New Revision: 28533

URL: http://svn.reactos.org/svn/reactos?rev=28533&view=rev
Log:
* redirect EngCopyBits, EngCreateBitmap, EngCreatePalette, EngDeletePalette, EngDeletePath, EngDeleteSurface, EngEraseSurface, EngFillPath, EngMarkBandingSurface, EngPaint, EngPlgBlt, EngStrokeAndFillPath, EngStrokePath, EngTextOut, EngTransparentBlt to win32k.sys
* add smaller code for Ellipse
* redirect EngMultiByteToUnicodeN to RtlMultiByteToUnicodeN
* redirect EngUnicodeToMultiByteN to RtlUnicodeToMultiByteN

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=28533&r1=28532&r2=28533&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Aug 25 02:44:36 2007
@@ -93,9 +93,10 @@
 DeleteMetaFile at 4
 DeleteObject at 4
 DescribePixelFormat at 16
-DeviceCapabilitiesExA
-DeviceCapabilitiesExW
+DeviceCapabilitiesExA at 20
+DeviceCapabilitiesExW at 20
 DrawEscape at 16
+Ellipse at 20
 EnableEUDC at 4=NtGdiEnableEudc at 4
 EndDoc at 4
 EndFormPage at 4
@@ -104,20 +105,50 @@
 EngAcquireSemaphore at 4
 EngAlphaBlend at 28=NtGdiEngAlphaBlend at 28
 EngAssociateSurface at 12=NtGdiEngAssociateSurface at 12
-EngBitBlt at 44=NtGdiEngBitBlt at 44
-EngCreateClip at 0=NtGdiEngCreateClip at 0
-EngDeleteClip at 4=NtGdiEngDeleteClip at 4
+EngBitBlt=NtGdiEngBitBlt at 44
 EngCheckAbort at 4=NtGdiEngCheckAbort at 4
 EngComputeGlyphSet at 12
+EngCopyBits at 24=NtGdiEngCopyBits at 24
+EngCreateBitmap at 24=NtGdiEngCreateBitmap at 24
+EngCreateClip at 0=NtGdiEngCreateClip at 0
+EngCreateDeviceBitmap at 16=NtGdiEngCreateDeviceBitmap at 16
+EngCreateDeviceSurface at 16=NtGdiEngCreateDeviceSurface at 16
+EngCreatePalette at 24=NtGdiEngCreatePalette at 24
 EngCreateSemaphore at 0
-EngCreateBitmap at 24
-EngCreateDeviceSurface at 16=NtGdiEngCreateDeviceSurface at 16
-EngCreateDeviceBitmap at 16=NtGdiEngCreateDeviceBitmap at 16
+EngDeleteClip at 4=NtGdiEngDeleteClip at 4
+EngDeletePalette at 4=NtGdiEngDeletePalette at 4
+EngDeletePath at 4=NtGdiEngDeletePath at 4
+EngDeleteSemaphore at 4
+EngDeleteSurface at 4=NtGdiEngDeleteSurface at 4
+EngEraseSurface at 12=NtGdiEngEraseSurface at 12
+EngFillPath at 28=NtGdiEngFillPath at 28
+EngFindResource at 16
+EngFreeModule at 4
+EngGetCurrentCodePage at 8
+EngGetDriverName at 4
+EngGetPrinterDataFileName at 4
+EngGradientFill at 40=NtGdiEngGradientFill at 40
+EngLineTo at 36=NtGdiEngLineTo at 36
+EngLoadModule at 4
+EngLockSurface at 4=NtGdiEngLockSurface at 4
+EngMarkBandingSurface at 4=NtGdiEngMarkBandingSurface at 4
+EngMultiByteToUnicodeN at 20=RtlMultiByteToUnicodeN at 20
+EngMultiByteToWideChar at 20
+EngPaint at 20=NtGdiEngPaint at 20
+EngPlgBlt at 44=NtGdiEngPlgBlt at 44
+EngQueryEMFInfo at 8
+EngQueryLocalTime at 4
+EngReleaseSemaphore at 4
+EngStretchBlt at 44=NtGdiEngStretchBlt at 44
+EngStretchBltROP at 52=NtGdiEngStretchBltROP at 52
+EngStrokeAndFillPath at 40=NtGdiEngStrokeAndFillPath at 40
+EngStrokePath at 32=NtGdiEngStrokePath at 32
+EngTextOut at 40=NtGdiEngTextOut at 40
+EngTransparentBlt at 32=NtGdiEngTransparentBlt at 32
+EngUnicodeToMultiByteN at 20=RtlUnicodeToMultiByteN at 20
 
 ClearBitmapAttributes at 8
 ClearBrushAttributes at 8
-DeleteObject at 4
-DescribePixelFormat at 16
 DdEntry1 at 16=NtGdiD3dContextCreate at 16
 DdEntry2 at 4=NtGdiD3dContextDestroy at 4
 DdEntry3 at 4=NtGdiD3dContextDestroyAll at 4
@@ -174,39 +205,6 @@
 DdEntry54 at 8=NtGdiDdUnlockD3D at 8
 DdEntry55 at 12=NtGdiDdUpdateOverlay at 12
 DdEntry56 at 8=NtGdiDdWaitForVerticalBlank at 8
-Ellipse at 20=NtGdiEllipse at 20
-EngCopyBits at 24
-EngCreatePalette at 24
-EngDeletePalette at 4
-EngDeletePath at 4
-EngDeleteSemaphore at 4
-EngDeleteSurface at 4
-EngEraseSurface at 12
-EngFillPath at 28
-EngFindResource at 16
-EngFreeModule at 4
-EngGetCurrentCodePage at 8
-EngGetDriverName at 4
-EngGetPrinterDataFileName at 4
-EngGradientFill at 40
-EngLineTo at 36
-EngLoadModule at 4
-EngLockSurface at 4=NtGdiEngLockSurface at 4
-EngMarkBandingSurface at 4
-EngMultiByteToUnicodeN at 20
-EngMultiByteToWideChar at 20
-EngPaint at 20
-EngPlgBlt at 44
-EngQueryEMFInfo at 8
-EngQueryLocalTime at 4
-EngReleaseSemaphore at 4
-EngStretchBlt at 44=NtGdiEngStretchBlt at 44
-EngStretchBltROP at 52
-EngStrokeAndFillPath at 40
-EngStrokePath at 32
-EngTextOut at 40
-EngTransparentBlt at 32
-EngUnicodeToMultiByteN at 20
 EngUnlockSurface at 4
 EngWideCharToMultiByte at 20
 EnumEnhMetaFile at 20

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=28533&r1=28532&r2=28533&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Aug 25 02:44:36 2007
@@ -2468,54 +2468,6 @@
 /*
  * @unimplemented
  */
-BOOL STDCALL
-EngCopyBits(SURFOBJ *Dest,
-	    SURFOBJ *Source,
-	    CLIPOBJ *Clip,
-	    XLATEOBJ *ColorTranslation,
-	    RECTL *DestRect,
-	    POINTL *SourcePoint)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-HBITMAP STDCALL
-EngCreateBitmap(IN SIZEL Size,
-		IN LONG Width,
-		IN ULONG Format,
-		IN ULONG Flags,
-		IN PVOID Bits)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-
-/*
- * @unimplemented
- */
-HPALETTE STDCALL
-EngCreatePalette(IN ULONG Mode,
-		 IN ULONG NumColors,
-		 IN ULONG *Colors,
-		 IN ULONG Red,
-		 IN ULONG Green,
-		 IN ULONG Blue)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
 HSEMAPHORE
 STDCALL
 EngCreateSemaphore ( VOID )
@@ -2528,26 +2480,7 @@
 
 
 
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngDeletePalette(IN HPALETTE Palette)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-VOID STDCALL
-EngDeletePath(PATHOBJ *ppo)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-}
+
 
 /*
  * @unimplemented
@@ -2562,40 +2495,11 @@
  RtlFreeHeap( GetProcessHeap(), 0, hsem );
 }
 
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngDeleteSurface(IN HSURF Surface)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngEraseSurface(SURFOBJ *Surface,
-		RECTL *Rect,
-		ULONG iColor)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,BRUSHOBJ *pbo,POINTL *pptlBrushOrg,MIX mix,FLONG flOptions)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
+
+
+
+
+
 
 /*
  * @unimplemented
@@ -2656,48 +2560,16 @@
 }
 
 /*
- * @unimplemented
+ * @implemented
  */
 LPWSTR STDCALL
 EngGetPrinterDataFileName(HDEV hdev)
 {
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL 
-EngGradientFill(SURFOBJ *psoDest,CLIPOBJ *pco,XLATEOBJ *pxlo,TRIVERTEX *pVertex,ULONG nVertex,PVOID pMesh,ULONG nMesh,RECTL *prclExtents,POINTL *pptlDitherOrg,ULONG ulMode)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngLineTo(SURFOBJ *Surface,
-	  CLIPOBJ *Clip,
-	  BRUSHOBJ *Brush,
-	  LONG x1,
-	  LONG y1,
-	  LONG x2,
-	  LONG y2,
-	  RECTL *RectBounds,
-	  MIX mix)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
+    return EngGetDriverName(hdev);
+}
+
+/*
+ * @implemented
  */
 HANDLE STDCALL 
 EngLoadModule(LPWSTR pwsz)
@@ -2707,37 +2579,7 @@
 
 
 /*
- * @unimplemented
- */
-BOOL STDCALL 
-EngMarkBandingSurface(HSURF hsurf)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-VOID STDCALL
-EngMultiByteToUnicodeN(OUT LPWSTR UnicodeString,
-		       IN ULONG MaxBytesInUnicodeString,
-		       OUT PULONG BytesInUnicodeString,
-		       IN PCHAR MultiByteString,
-		       IN ULONG BytesInMultiByteString)
-{
-  RtlMultiByteToUnicodeN(
-                     UnicodeString,
-                     MaxBytesInUnicodeString,
-                     BytesInUnicodeString,
-                     MultiByteString,
-                     BytesInMultiByteString
-                        );
-}
-
-/*
- * @unimplemented
+ * @implemented
  */
 INT STDCALL 
 EngMultiByteToWideChar(UINT CodePage,
@@ -2746,41 +2588,11 @@
                        LPSTR MultiByteString,
                        INT BytesInMultiByteString)
 {
-  return MultiByteToWideChar(
-                         CodePage,
-			 0,
-			 MultiByteString,
-			 BytesInMultiByteString,
-			 WideCharString,
-			(BytesInWideCharString/sizeof(WCHAR)) /* Bytes to (in WCHARs) */
-			    );
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngPaint(IN SURFOBJ *Surface,
-	 IN CLIPOBJ *ClipRegion,
-	 IN BRUSHOBJ *Brush,
-	 IN POINTL *BrushOrigin,
-	 IN MIX  Mix)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL 
-EngPlgBlt(SURFOBJ *psoTrg,SURFOBJ *psoSrc,SURFOBJ *psoMsk,CLIPOBJ *pco,XLATEOBJ *pxlo,COLORADJUSTMENT *pca,POINTL *pptlBrushOrg,POINTFIX *pptfx,RECTL *prcl,POINTL *pptl,ULONG iMode)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
+  return MultiByteToWideChar(CodePage,0,MultiByteString,BytesInMultiByteString,WideCharString,BytesInWideCharString / sizeof(WCHAR));
+}
+
+
+
 
 /*
  * @implemented
@@ -2821,87 +2633,20 @@
   RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem);
 }
 
-
-
-/*
- * @unimplemented
- */
-BOOL STDCALL 
-EngStretchBltROP(SURFOBJ *psoDest,SURFOBJ *psoSrc,SURFOBJ *psoMask,CLIPOBJ *pco,XLATEOBJ *pxlo,COLORADJUSTMENT *pca,POINTL *pptlHTOrg,RECTL *prclDest,RECTL *prclSrc,POINTL *pptlMask,ULONG iMode,BRUSHOBJ *pbo,DWORD rop4)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL 
-EngStrokeAndFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,XFORMOBJ *pxo,BRUSHOBJ *pboStroke,LINEATTRS *plineattrs,BRUSHOBJ *pboFill,POINTL *pptlBrushOrg,MIX mixFill,FLONG flOptions)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngStrokePath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,XFORMOBJ *pxo,BRUSHOBJ *pbo,POINTL *pptlBrushOrg,LINEATTRS *plineattrs,MIX mix)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL 
-EngTextOut(SURFOBJ *pso,STROBJ *pstro,FONTOBJ *pfo,CLIPOBJ *pco,RECTL *prclExtra,RECTL *prclOpaque,BRUSHOBJ *pboFore,BRUSHOBJ *pboOpaque,POINTL *pptlOrg,MIX mix)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngTransparentBlt(IN SURFOBJ *Dest,
-		  IN SURFOBJ *Source,
-		  IN CLIPOBJ *Clip,
-		  IN XLATEOBJ *ColorTranslation,
-		  IN PRECTL DestRect,
-		  IN PRECTL SourceRect,
-		  IN ULONG TransparentColor,
-		  IN ULONG Reserved)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-VOID STDCALL
-EngUnicodeToMultiByteN(OUT PCHAR MultiByteString,
-		       IN ULONG  MaxBytesInMultiByteString,
-		       OUT PULONG  BytesInMultiByteString,
-		       IN PWSTR  UnicodeString,
-		       IN ULONG  BytesInUnicodeString)
-{
-   RtlUnicodeToMultiByteN(
-                       MultiByteString,
-                       MaxBytesInMultiByteString,
-                       BytesInMultiByteString,
-                       UnicodeString,
-                       BytesInUnicodeString
-                         );
+/*
+ * @implemented
+ */
+BOOL 
+STDCALL
+Ellipse(
+  HDC hdc,
+  int nLeftRect,
+  int nTopRect,
+  int nRightRect,
+  int nBottomRect)
+{
+    /* FIXME some parts need be done in user mode */
+    return NtGdiEllipse(hdc,nLeftRect,nTopRect,nRightRect,nBottomRect);
 }
 
 /*




More information about the Ros-diffs mailing list