[ros-diffs] [jimtabor] 31620: Patch by Stefan100 stefan__100__ at hotmail.com. Removes unimplemented NtGdi functions.

Author: jimtabor
Date: Sun Jan  6 05:52:19 2008
New Revision: 31620

URL: http://svn.reactos.org/svn/reactos?rev=31620&view=rev
Log:
Patch by Stefan100 stefan__100__ at hotmail.com. Removes unimplemented NtGdi functions.

Modified:
    trunk/reactos/dll/win32/gdi32/misc/stubsw.c
    trunk/reactos/dll/win32/gdi32/objects/font.c
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/subsystems/win32/win32k/objects/text.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Sun Jan  6 05:52:19 2008
@@ -298,4 +298,19 @@
 }
 
 
+BOOL
+WINAPI
+CreateScalableFontResourceW(
+	DWORD fdwHidden,
+	LPCWSTR lpszFontRes,
+	LPCWSTR lpszFontFile,
+	LPCWSTR lpszCurrentPath
+	)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return FALSE;
+}
+  
+
 /* EOF */

Modified: trunk/reactos/dll/win32/gdi32/objects/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/font.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/font.c Sun Jan  6 05:52:19 2008
@@ -1412,26 +1412,7 @@
 
 
 /*
- * @implemented
- */
-BOOL
-STDCALL
-CreateScalableFontResourceW(
-	DWORD		fdwHidden,
-	LPCWSTR		lpszFontRes,
-	LPCWSTR		lpszFontFile,
-	LPCWSTR		lpszCurrentPath
-	)
-{
-  return NtGdiCreateScalableFontResource ( fdwHidden,
-					  lpszFontRes,
-					  lpszFontFile,
-					  lpszCurrentPath );
-}
-
-
-/*
- * @implemented
+ * @unimplemented
  */
 BOOL
 STDCALL
@@ -1442,39 +1423,7 @@
 	LPCSTR		lpszCurrentPath
 	)
 {
-  NTSTATUS Status;
-  LPWSTR lpszFontResW, lpszFontFileW, lpszCurrentPathW;
-  BOOL rc = FALSE;
-
-  Status = HEAP_strdupA2W ( &lpszFontResW, lpszFontRes );
-  if (!NT_SUCCESS (Status))
-    SetLastError (RtlNtStatusToDosError(Status));
-  else
-    {
-      Status = HEAP_strdupA2W ( &lpszFontFileW, lpszFontFile );
-      if (!NT_SUCCESS (Status))
-	SetLastError (RtlNtStatusToDosError(Status));
-      else
-	{
-	  Status = HEAP_strdupA2W ( &lpszCurrentPathW, lpszCurrentPath );
-	  if (!NT_SUCCESS (Status))
-	    SetLastError (RtlNtStatusToDosError(Status));
-	  else
-	    {
-	      rc = NtGdiCreateScalableFontResource ( fdwHidden,
-						    lpszFontResW,
-						    lpszFontFileW,
-						    lpszCurrentPathW );
-
-	      HEAP_free ( lpszCurrentPathW );
-	    }
-
-	  HEAP_free ( lpszFontFileW );
-	}
-
-      HEAP_free ( lpszFontResW );
-    }
-  return rc;
+  return FALSE;
 }
 
 
@@ -1584,7 +1533,7 @@
 }
 
 /*
- * @implemented
+ * @unimplemented
  */
 BOOL
 STDCALL
@@ -1595,7 +1544,6 @@
 {
     NTSTATUS Status;
     LPWSTR lpFileNameW;
-    BOOL rc = 0;
 
     /* FIXME the flags */
     /* FIXME the pdv */
@@ -1606,12 +1554,11 @@
     SetLastError (RtlNtStatusToDosError(Status));
     else
     {
-        rc = NtGdiRemoveFontResource ( lpFileNameW );
 
         HEAP_free ( lpFileNameW );
     }
 
-  return rc;
+  return 0;
 }
 
 /*
@@ -1626,7 +1573,7 @@
     /* FIXME the flags */
     /* FIXME the pdv */
     /* FIXME NtGdiRemoveFontResource handle flags and pdv */
-    return NtGdiRemoveFontResource ( lpFileName);
+    return 0;
 }
 
 

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 Jan  6 05:52:19 2008
@@ -59,16 +59,6 @@
     DWORD Size
 );
 
-/* The gdi32 call does all the work in user-mode, save for NtGdiMakeFontDir */
-BOOL
-NTAPI
-NtGdiCreateScalableFontResource(
-    DWORD Hidden,
-    LPCWSTR FontRes,
-    LPCWSTR FontFile,
-    LPCWSTR CurrentPath
-);
-
 /* The gdi32 call Should Use NtGdiGetTextExtent */
 BOOL
 NTAPI
@@ -98,27 +88,12 @@
 	UINT			Usage
 	);
 
-
-
-/* Should be done in user-mode. */
-int
-STDCALL
-NtGdiEnumFonts(HDC  hDC,
-                   LPCWSTR FaceName,
-                   FONTENUMPROCW  FontFunc,
-                   LPARAM  lParam);
-
 /* Should be done in user-mode. */
 BOOL
 STDCALL
 NtGdiGetAspectRatioFilterEx(HDC  hDC,
                                  LPSIZE  AspectRatio);
 
-/* Should be done in user-mode. */
-DWORD
-STDCALL
-NtGdiGetFontLanguageInfo(HDC  hDC);
-
 /* Use NtGdiGetDCPoint with GdiGetViewPortExt */
 BOOL STDCALL  NtGdiGetViewportExtEx(HDC  hDC, LPSIZE viewportExt);
 
@@ -150,11 +125,6 @@
 	int	YOffset,
 	LPPOINT	Point
 	);
-
-/* Should be done in user-mode. */
-BOOL
-STDCALL
-NtGdiRemoveFontResource(LPCWSTR  FileName);
 
 /* Use SetDIBitsToDevice in gdi32. */
 INT
@@ -168,12 +138,6 @@
 	CONST BITMAPINFO	* bmi,
 	UINT			ColorUse
 	);
-
-/* Needs to be done in user-mode, using shared GDI Object Attributes. */
-DWORD
-STDCALL
-NtGdiSetMapperFlags(HDC  hDC,
-                          DWORD  Flag);
 
 /* Needs to be done in user-mode. */
 BOOL

Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sun Jan  6 05:52:19 2008
@@ -575,18 +575,6 @@
 
 }
 
-
-BOOL
-STDCALL
-NtGdiCreateScalableFontResource(DWORD  Hidden,
-                                     LPCWSTR  FontRes,
-                                     LPCWSTR  FontFile,
-                                     LPCWSTR  CurrentPath)
-{
-    DPRINT1("NtGdiCreateScalableFontResource - is unimplemented, have a nice day and
keep going");
-  return FALSE;
-}
-
 /*************************************************************************
  * TranslateCharsetInfo
  *
@@ -1410,16 +1398,6 @@
   return Count;
 }
 
-int
-STDCALL
-NtGdiEnumFonts(HDC  hDC,
-                   LPCWSTR FaceName,
-                   FONTENUMPROCW  FontFunc,
-                   LPARAM  lParam)
-{
-  UNIMPLEMENTED;
-  return 0;
-}
 FT_Glyph STDCALL
 NtGdiGlyphCacheGet(
    FT_Face Face,
@@ -2443,13 +2421,6 @@
    return TRUE;
 }
 
-DWORD
-STDCALL
-NtGdiGetFontLanguageInfo(HDC  hDC)
-{
-  UNIMPLEMENTED;
-  return 0;
-}
 
  /*
  * @implemented
@@ -4002,24 +3973,6 @@
 
 BOOL
 STDCALL
-NtGdiRemoveFontResource(LPCWSTR  FileName)
-{
-  DPRINT1("NtGdiRemoveFontResource is UNIMPLEMENTED\n");
-  return FALSE;
-}
-
-DWORD
-STDCALL
-NtGdiSetMapperFlags(HDC  hDC,
-                          DWORD  Flag)
-{
-  UNIMPLEMENTED;
-  return 0;
-}
-
-
-BOOL
-STDCALL
 NtGdiSetTextJustification(HDC  hDC,
                                int  BreakExtra,
                                int  BreakCount)

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 Jan  6 05:52:19 2008
@@ -679,7 +679,6 @@
 #
 #ReactOS specific syscalls
 NtGdiSetDIBits                          7
-NtGdiSetMapperFlags                     2
 NtGdiSetViewportExtEx                   4
 NtGdiSetViewportOrgEx                   4
 NtGdiSetWindowExtEx                     4
@@ -719,15 +718,11 @@
 NtUserGetDesktopWindow                  0
 NtGdiAddFontResource                    2
 NtGdiCreateDIBitmap                     6
-NtGdiCreateScalableFontResource         4
-NtGdiEnumFonts                          4
 NtGdiGetAspectRatioFilterEx             2
 NtGdiGetFontFamilyInfo                  4
-NtGdiGetFontLanguageInfo                1
 NtGdiGetTextExtentPoint32               4
 NtGdiOffsetViewportOrgEx                4
 NtGdiOffsetWindowOrgEx                  4
-NtGdiRemoveFontResource                 1
 #
 # ReactOS only system calls
 NtUserAcquireOrReleaseInputOwnership    1