4 Aug
2007
4 Aug
'07
10:02 p.m.
Author: jimtabor
Date: Sun Aug 5 02:02:39 2007
New Revision: 28166
URL: http://svn.reactos.org/svn/reactos?rev=28166&view=rev
Log:
Removed non Enh Metafile stubs from win32k:
- Updated ntgdibad.h.
- List of known functions:
NtGidConvertMetafileRect
NtGdiCreateMetafileDC
NtGdiCreateServerMetaFile
NtGdiGetServerMetaFileBits
NtGdiSetMetaRgn
- No updates for Enh Metafile.
Modified:
trunk/reactos/include/reactos/win32k/ntgdibad.h
trunk/reactos/subsystems/win32/win32k/objects/metafile.c
trunk/reactos/subsystems/win32/win32k/w32ksvc.db
Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sun Aug 5 02:02:39 2007
@@ -125,13 +125,6 @@
HDC hDC
);
-/* Metafiles are user mode */
-HMETAFILE
-STDCALL
-NtGdiCloseMetaFile (
- HDC hDC
- );
-
/* Does not exist */
BOOL
STDCALL
@@ -144,14 +137,6 @@
STDCALL
NtGdiCopyEnhMetaFile (
HENHMETAFILE Src,
- LPCWSTR File
- );
-
-/* Metafiles are user mode */
-HMETAFILE
-STDCALL
-NtGdiCopyMetaFile (
- HMETAFILE Src,
LPCWSTR File
);
@@ -177,13 +162,6 @@
LPCWSTR Description
);
-/* Metafiles are user mode */
-HDC
-STDCALL
-NtGdiCreateMetaFile (
- LPCWSTR File
- );
-
/* Use NtGdiCreatePaletteInternal with palNumEntries at the end. */
HPALETTE
STDCALL
@@ -220,13 +198,6 @@
STDCALL
NtGdiDeleteEnhMetaFile (
HENHMETAFILE emf
- );
-
-/* Meta are user-mode. */
-BOOL
-STDCALL
-NtGdiDeleteMetaFile (
- HMETAFILE mf
);
/* Should be done in user-mode. */
@@ -257,16 +228,6 @@
NtGdiEnumICMProfiles(HDC hDC,
LPWSTR lpstrBuffer,
UINT cch );
-
-/* Meta are user-mode. */
-BOOL
-STDCALL
-NtGdiEnumMetaFile (
- HDC hDC,
- HMETAFILE mf,
- MFENUMPROC MetaFunc,
- LPARAM lParam
- );
/* Should be done in user-mode. */
INT
@@ -483,30 +444,6 @@
/* Should be done in user-mode using shared GDI Objects. */
INT STDCALL NtGdiGetMapMode(HDC hDC);
-/* Meta files are user-mode. */
-HMETAFILE
-STDCALL
-NtGdiGetMetaFile (
- LPCWSTR MetaFile
- );
-
-/* Meta files are user-mode. */
-UINT
-STDCALL
-NtGdiGetMetaFileBitsEx (
- HMETAFILE hmf,
- UINT Size,
- LPVOID Data
- );
-
-/* Meta files are user-mode. */
-int
-STDCALL
-NtGdiGetMetaRgn (
- HDC hDC,
- HRGN hrgn
- );
-
/* Use NtGdiDoPalette with GdiPalGetEntries. */
UINT
STDCALL
@@ -565,17 +502,6 @@
/* Needs to be done in user-mode. */
BOOL STDCALL NtGdiGetViewportOrgEx(HDC hDC, LPPOINT viewportOrg);
-
-/* Metafiles are user-mode. */
-UINT
-STDCALL
-NtGdiGetWinMetaFileBits (
- HENHMETAFILE hemf,
- UINT BufSize,
- LPBYTE Buffer,
- INT MapMode,
- HDC Ref
- );
/* Needs to be done in user-mode. */
BOOL STDCALL NtGdiGetWindowExtEx(HDC hDC, LPSIZE windowExt);
@@ -664,24 +590,6 @@
LPHANDLETABLE Handletable,
CONST ENHMETARECORD * EnhMetaRecord,
UINT Handles
- );
-
-/* Metafiles are user-mode. */
-BOOL
-STDCALL
-NtGdiPlayMetaFile (
- HDC hDC,
- HMETAFILE hmf
- );
-
-/* Metafiles are user-mode. */
-BOOL
-STDCALL
-NtGdiPlayMetaFileRecord (
- HDC hDC,
- LPHANDLETABLE Handletable,
- LPMETARECORD MetaRecord,
- UINT Handles
);
/* Use NtGdiPolyPolyDraw with GdiPolyBezier. */
@@ -893,13 +801,6 @@
NtGdiSetMapperFlags(HDC hDC,
DWORD Flag);
-/* Metafiles are user-mode. */
-HMETAFILE
-STDCALL
-NtGdiSetMetaFileBitsEx (
- UINT Size,
- CONST PBYTE Data
- );
/* Use NtGdiDoPalette with GdiPalSetEntries, TRUE. */
UINT
Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Sun Aug 5 02:02:39 2007
@@ -255,14 +255,6 @@
return hmf;
}
-HMETAFILE
-STDCALL
-NtGdiCloseMetaFile(HDC hDC)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
HENHMETAFILE
STDCALL
NtGdiCopyEnhMetaFile(HENHMETAFILE Src,
@@ -272,14 +264,6 @@
return 0;
}
-HMETAFILE
-STDCALL
-NtGdiCopyMetaFile(HMETAFILE Src,
- LPCWSTR File)
-{
- UNIMPLEMENTED;
- return 0;
-}
//
//
// Rewrite is in progress, this function is subject to change at any time.
@@ -487,28 +471,9 @@
return ret;
}
-
-
-
-HDC
-STDCALL
-NtGdiCreateMetaFile(LPCWSTR File)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
BOOL
STDCALL
NtGdiDeleteEnhMetaFile(HENHMETAFILE emf)
-{
- UNIMPLEMENTED;
- return FALSE;
-}
-
-BOOL
-STDCALL
-NtGdiDeleteMetaFile(HMETAFILE mf)
{
UNIMPLEMENTED;
return FALSE;
@@ -528,17 +493,6 @@
BOOL
STDCALL
-NtGdiEnumMetaFile(HDC hDC,
- HMETAFILE mf,
- MFENUMPROC MetaFunc,
- LPARAM lParam)
-{
- UNIMPLEMENTED;
- return FALSE;
-}
-
-BOOL
-STDCALL
NtGdiGdiComment(HDC hDC,
UINT Size,
CONST LPBYTE Data)
@@ -590,36 +544,6 @@
NtGdiGetEnhMetaFilePaletteEntries(HENHMETAFILE hemf,
UINT Entries,
LPPALETTEENTRY pe)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-HMETAFILE
-STDCALL
-NtGdiGetMetaFile(LPCWSTR MetaFile)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-UINT
-STDCALL
-NtGdiGetMetaFileBitsEx(HMETAFILE hmf,
- UINT Size,
- LPVOID Data)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-UINT
-STDCALL
-NtGdiGetWinMetaFileBits(HENHMETAFILE hemf,
- UINT BufSize,
- LPBYTE Buffer,
- INT MapMode,
- HDC Ref)
{
UNIMPLEMENTED;
return 0;
@@ -646,26 +570,6 @@
return FALSE;
}
-BOOL
-STDCALL
-NtGdiPlayMetaFile(HDC hDC,
- HMETAFILE hmf)
-{
- UNIMPLEMENTED;
- return FALSE;
-}
-
-BOOL
-STDCALL
-NtGdiPlayMetaFileRecord(HDC hDC,
- LPHANDLETABLE Handletable,
- LPMETARECORD MetaRecord,
- UINT Handles)
-{
- UNIMPLEMENTED;
- return FALSE;
-}
-
HENHMETAFILE
STDCALL
NtGdiSetEnhMetaFileBits(UINT BufSize,
@@ -675,25 +579,4 @@
return 0;
}
-HMETAFILE
-STDCALL
-NtGdiSetMetaFileBitsEx(UINT Size,
- CONST PBYTE Data)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-HENHMETAFILE
-STDCALL
-NtGdiSetWinMetaFileBits(UINT BufSize,
- CONST PBYTE Buffer,
- HDC Ref,
-// CONST METAFILEPICT *mfp)
- PVOID mfp)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
/* EOF */
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sun Aug 5 02:02:39 2007
@@ -11,12 +11,10 @@
NtGdiCancelDC 1
NtGdiCloseEnhMetaFile 1
NtGdiCloseFigure 1
-NtGdiCloseMetaFile 1
NtGdiColorMatchToTarget 3
NtGdiCombineRgn 4
NtGdiCombineTransform 3
NtGdiCopyEnhMetaFile 2
-NtGdiCopyMetaFile 2
NtGdiCreateBitmap 5
NtGdiCreateClientObj 1
NtGdiCreateColorSpace 1
@@ -29,7 +27,6 @@
NtGdiCreateEnhMetaFile 4
NtGdiCreateHalftonePalette 1
NtGdiCreateHatchBrushInternal 3
-NtGdiCreateMetaFile 1
NtGdiCreatePalette 1
NtGdiCreatePatternBrushInternal 3
NtGdiCreatePen 4
@@ -44,7 +41,6 @@
NtGdiDeleteColorSpace 1
NtGdiDeleteObjectApp 1
NtGdiDeleteEnhMetaFile 1
-NtGdiDeleteMetaFile 1
NtGdiDeleteObject 1
NtGdiDescribePixelFormat 4
#NtGdiDeviceCapabilitiesEx ?
@@ -56,7 +52,6 @@
NtGdiEnumEnhMetaFile 5
NtGdiEnumFonts 4
NtGdiEnumICMProfiles 3
-NtGdiEnumMetaFile 4
NtGdiEnumObjects 4
NtGdiEqualRgn 2
NtGdiEscape 5
@@ -120,9 +115,6 @@
NtGdiGetKerningPairs 3
NtGdiGetLogColorSpace 3
NtGdiGetMapMode 1
-NtGdiGetMetaFile 1
-NtGdiGetMetaFileBitsEx 3
-NtGdiGetMetaRgn 2
NtGdiGetMiterLimit 2
NtGdiGetNearestColor 2
NtGdiGetNearestPaletteIndex 2
@@ -153,7 +145,6 @@
NtGdiGetTextMetricsW 3
NtGdiGetViewportExtEx 2
NtGdiGetViewportOrgEx 2
-NtGdiGetWinMetaFileBits 5
NtGdiGetWindowExtEx 2
NtGdiGetWindowOrgEx 2
NtGdiGetWorldTransform 2
@@ -177,8 +168,6 @@
NtGdiPie 9
NtGdiPlayEnhMetaFile 3
NtGdiPlayEnhMetaFileRecord 4
-NtGdiPlayMetaFile 2
-NtGdiPlayMetaFileRecord 4
NtGdiPlgBlt 11
NtGdiPolyBezier 3
NtGdiPolyBezierTo 3
@@ -232,7 +221,6 @@
NtGdiSetICMProfile 2
NtGdiSetMapMode 2
NtGdiSetMapperFlags 2
-NtGdiSetMetaFileBitsEx 2
NtGdiSetMetaRgn 1
NtGdiSetMiterLimit 3
NtGdiSetPaletteEntries 4
@@ -250,7 +238,6 @@
NtGdiSetTextJustification 3
NtGdiSetViewportExtEx 4
NtGdiSetViewportOrgEx 4
-#NtGdiSetWinMetaFileBits 1
NtGdiSetWindowExtEx 4
NtGdiSetWindowOrgEx 4
NtGdiSetWorldTransform 2