From 342efc07e7e3c78227ea3a570b900754acc31ee8 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Sat, 4 Aug 2007 22:02:39 +0000 Subject: [PATCH] Removed non Enh Metafile stubs from win32k: - Updated ntgdibad.h. - List of known functions: NtGidConvertMetafileRect NtGdiCreateMetafileDC NtGdiCreateServerMetaFile NtGdiGetServerMetaFileBits NtGdiSetMetaRgn - No updates for Enh Metafile. svn path=/trunk/; revision=28166 --- reactos/include/reactos/win32k/ntgdibad.h | 99 --------------- .../win32/win32k/objects/metafile.c | 117 ------------------ reactos/subsystems/win32/win32k/w32ksvc.db | 13 -- 3 files changed, 229 deletions(-) diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h index b0e7fe8adad..af4023792cc 100644 --- a/reactos/include/reactos/win32k/ntgdibad.h +++ b/reactos/include/reactos/win32k/ntgdibad.h @@ -125,13 +125,6 @@ NtGdiCloseEnhMetaFile ( HDC hDC ); -/* Metafiles are user mode */ -HMETAFILE -STDCALL -NtGdiCloseMetaFile ( - HDC hDC - ); - /* Does not exist */ BOOL STDCALL @@ -147,14 +140,6 @@ NtGdiCopyEnhMetaFile ( LPCWSTR File ); -/* Metafiles are user mode */ -HMETAFILE -STDCALL -NtGdiCopyMetaFile ( - HMETAFILE Src, - LPCWSTR File - ); - /* Use NtGdiCreateDIBitmapInternal */ HBITMAP STDCALL @@ -177,13 +162,6 @@ NtGdiCreateEnhMetaFile ( LPCWSTR Description ); -/* Metafiles are user mode */ -HDC -STDCALL -NtGdiCreateMetaFile ( - LPCWSTR File - ); - /* Use NtGdiCreatePaletteInternal with palNumEntries at the end. */ HPALETTE STDCALL @@ -222,13 +200,6 @@ NtGdiDeleteEnhMetaFile ( HENHMETAFILE emf ); -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiDeleteMetaFile ( - HMETAFILE mf - ); - /* Should be done in user-mode. */ BOOL STDCALL NtGdiDeleteObject(HGDIOBJ hObject); @@ -258,16 +229,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 STDCALL @@ -483,30 +444,6 @@ NtGdiGetLogColorSpace(HCOLORSPACE hColorSpace, /* 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 @@ -566,17 +503,6 @@ BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt); /* 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); @@ -666,24 +592,6 @@ NtGdiPlayEnhMetaFileRecord ( 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. */ BOOL STDCALL @@ -893,13 +801,6 @@ STDCALL NtGdiSetMapperFlags(HDC hDC, DWORD Flag); -/* Metafiles are user-mode. */ -HMETAFILE -STDCALL -NtGdiSetMetaFileBitsEx ( - UINT Size, - CONST PBYTE Data - ); /* Use NtGdiDoPalette with GdiPalSetEntries, TRUE. */ UINT diff --git a/reactos/subsystems/win32/win32k/objects/metafile.c b/reactos/subsystems/win32/win32k/objects/metafile.c index 2f5b4ade809..a2b61f45658 100644 --- a/reactos/subsystems/win32/win32k/objects/metafile.c +++ b/reactos/subsystems/win32/win32k/objects/metafile.c @@ -255,14 +255,6 @@ NtGdiCloseEnhMetaFile(HDC hDC) return hmf; } -HMETAFILE -STDCALL -NtGdiCloseMetaFile(HDC hDC) -{ - UNIMPLEMENTED; - return 0; -} - HENHMETAFILE STDCALL NtGdiCopyEnhMetaFile(HENHMETAFILE Src, @@ -272,14 +264,6 @@ NtGdiCopyEnhMetaFile(HENHMETAFILE Src, 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,17 +471,6 @@ NtGdiCreateEnhMetaFile(HDC hDCRef, return ret; } - - - -HDC -STDCALL -NtGdiCreateMetaFile(LPCWSTR File) -{ - UNIMPLEMENTED; - return 0; -} - BOOL STDCALL NtGdiDeleteEnhMetaFile(HENHMETAFILE emf) @@ -506,14 +479,6 @@ NtGdiDeleteEnhMetaFile(HENHMETAFILE emf) return FALSE; } -BOOL -STDCALL -NtGdiDeleteMetaFile(HMETAFILE mf) -{ - UNIMPLEMENTED; - return FALSE; -} - BOOL STDCALL NtGdiEnumEnhMetaFile(HDC hDC, @@ -526,17 +491,6 @@ NtGdiEnumEnhMetaFile(HDC hDC, return FALSE; } -BOOL -STDCALL -NtGdiEnumMetaFile(HDC hDC, - HMETAFILE mf, - MFENUMPROC MetaFunc, - LPARAM lParam) -{ - UNIMPLEMENTED; - return FALSE; -} - BOOL STDCALL NtGdiGdiComment(HDC hDC, @@ -595,36 +549,6 @@ NtGdiGetEnhMetaFilePaletteEntries(HENHMETAFILE hemf, 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; -} - BOOL STDCALL NtGdiPlayEnhMetaFile(HDC hDC, @@ -646,26 +570,6 @@ NtGdiPlayEnhMetaFileRecord(HDC hDC, 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 @@ NtGdiSetEnhMetaFileBits(UINT BufSize, 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 */ diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db index e8f686df9d1..19577590210 100644 --- a/reactos/subsystems/win32/win32k/w32ksvc.db +++ b/reactos/subsystems/win32/win32k/w32ksvc.db @@ -11,12 +11,10 @@ NtGdiBitBlt 11 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 @@ NtGdiCreateEllipticRgn 4 NtGdiCreateEnhMetaFile 4 NtGdiCreateHalftonePalette 1 NtGdiCreateHatchBrushInternal 3 -NtGdiCreateMetaFile 1 NtGdiCreatePalette 1 NtGdiCreatePatternBrushInternal 3 NtGdiCreatePen 4 @@ -44,7 +41,6 @@ NtGdiDeleteClientObj 1 NtGdiDeleteColorSpace 1 NtGdiDeleteObjectApp 1 NtGdiDeleteEnhMetaFile 1 -NtGdiDeleteMetaFile 1 NtGdiDeleteObject 1 NtGdiDescribePixelFormat 4 #NtGdiDeviceCapabilitiesEx ? @@ -56,7 +52,6 @@ NtGdiEndPath 1 NtGdiEnumEnhMetaFile 5 NtGdiEnumFonts 4 NtGdiEnumICMProfiles 3 -NtGdiEnumMetaFile 4 NtGdiEnumObjects 4 NtGdiEqualRgn 2 NtGdiEscape 5 @@ -120,9 +115,6 @@ NtGdiGetICMProfile 3 NtGdiGetKerningPairs 3 NtGdiGetLogColorSpace 3 NtGdiGetMapMode 1 -NtGdiGetMetaFile 1 -NtGdiGetMetaFileBitsEx 3 -NtGdiGetMetaRgn 2 NtGdiGetMiterLimit 2 NtGdiGetNearestColor 2 NtGdiGetNearestPaletteIndex 2 @@ -153,7 +145,6 @@ NtGdiGetTextFaceW 4 NtGdiGetTextMetricsW 3 NtGdiGetViewportExtEx 2 NtGdiGetViewportOrgEx 2 -NtGdiGetWinMetaFileBits 5 NtGdiGetWindowExtEx 2 NtGdiGetWindowOrgEx 2 NtGdiGetWorldTransform 2 @@ -177,8 +168,6 @@ NtGdiPathToRegion 1 NtGdiPie 9 NtGdiPlayEnhMetaFile 3 NtGdiPlayEnhMetaFileRecord 4 -NtGdiPlayMetaFile 2 -NtGdiPlayMetaFileRecord 4 NtGdiPlgBlt 11 NtGdiPolyBezier 3 NtGdiPolyBezierTo 3 @@ -232,7 +221,6 @@ NtGdiSetICMMode 2 NtGdiSetICMProfile 2 NtGdiSetMapMode 2 NtGdiSetMapperFlags 2 -NtGdiSetMetaFileBitsEx 2 NtGdiSetMetaRgn 1 NtGdiSetMiterLimit 3 NtGdiSetPaletteEntries 4 @@ -250,7 +238,6 @@ NtGdiSetTextColor 2 NtGdiSetTextJustification 3 NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 -#NtGdiSetWinMetaFileBits 1 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 NtGdiSetWorldTransform 2