[ros-diffs] [jimtabor] 30234: - Removed NtGdiGetCharWidthFloat, NtGdiGetCharABCWidthsFloat and NtGdiGetCharacterPlacement. Update all related items.

Author: jimtabor
Date: Wed Nov  7 02:31:28 2007
New Revision: 30234

URL: http://svn.reactos.org/svn/reactos?rev=30234&view=rev
Log:
- Removed NtGdiGetCharWidthFloat, NtGdiGetCharABCWidthsFloat and
NtGdiGetCharacterPlacement. Update all related items.

Modified:
    trunk/reactos/dll/win32/gdi32/misc/stubs.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/stubs/stubs.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Nov  7 02:31:28 2007
@@ -2401,8 +2401,8 @@
 STDCALL
 GetCharABCWidthsFloatW(HDC hdc,UINT FirstChar,UINT LastChar,LPABCFLOAT abcF)
 {
-    /* FIXME some part are done in user mode */
-    return NtGdiGetCharABCWidthsFloat(hdc, FirstChar, LastChar, abcF);
+    
+    return FALSE;
 }
 
 /*
@@ -2456,8 +2456,8 @@
                    UINT iLastChar,
                    PFLOAT pxBuffer)
 {
-    /* FIXME some part need be done in user mode */
-    return NtGdiGetCharWidthFloat(hdc, iFirstChar, iLastChar, pxBuffer);
+
+    return FALSE;
 }
 
 /*

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 Wed Nov  7 02:31:28 2007
@@ -596,7 +596,7 @@
 	)
 {
   /* FIXME what to do with iFirstChar and iLastChar ??? */
-  return NtGdiGetCharWidthFloat ( hdc, iFirstChar, iLastChar, pxBuffer );
+  return FALSE;
 }
 
 
@@ -633,7 +633,7 @@
 DPRINT1("GCABCWFA iFirstChar %x\n",iFirstChar);
 
   /* FIXME what to do with iFirstChar and iLastChar ??? */
-  return NtGdiGetCharABCWidthsFloat ( hdc, iFirstChar, iLastChar, lpABCF );
+  return FALSE;
 }
 
 /*

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 Wed Nov  7 02:31:28 2007
@@ -222,32 +222,6 @@
                            UINT  LastChar,
                            LPABC  abc);
 
-/* Should be done in user mode. */
-BOOL
-STDCALL
-NtGdiGetCharABCWidthsFloat(HDC  hDC,
-                                UINT  FirstChar,
-                                UINT  LastChar,
-                                LPABCFLOAT  abcF);
-
-/* Should be done in user mode. */
-DWORD
-STDCALL
-NtGdiGetCharacterPlacement(HDC  hDC,
-                                 LPCWSTR  String,
-                                 int  Count,
-                                 int  MaxExtent,
-                                 LPGCP_RESULTSW Results,
-                                 DWORD  Flags);
-
-/* Should be done in user mode. */
-BOOL
-STDCALL
-NtGdiGetCharWidthFloat(HDC  hDC,
-                            UINT  FirstChar,
-                            UINT  LastChar,
-                            PFLOAT  Buffer);
-
 /* Use NtGdiGetAppClipBox. */
 int
 STDCALL

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 Wed Nov  7 02:31:28 2007
@@ -2251,28 +2251,21 @@
    return TRUE;
 }
 
+ /*
+ * @unimplemented
+ */
 BOOL
 STDCALL
-NtGdiGetCharABCWidthsFloat(HDC  hDC,
-                                UINT  FirstChar,
-                                UINT  LastChar,
-                                LPABCFLOAT  abcF)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-DWORD
-STDCALL
-NtGdiGetCharacterPlacement(HDC  hDC,
-                                 LPCWSTR  String,
-                                 int  Count,
-                                 int  MaxExtent,
-                                 LPGCP_RESULTSW  Results,
-                                 DWORD  Flags)
-{
-  UNIMPLEMENTED;
-  return 0;
+NtGdiGetCharABCWidthsW(
+    IN HDC hdc,
+    IN UINT wchFirst,
+    IN ULONG cwch,
+    IN OPTIONAL PWCHAR pwch,
+    IN FLONG fl,
+    OUT PVOID pvBuf)
+ {
+    UNIMPLEMENTED;
+    return FALSE;
 }
 
 BOOL
@@ -2370,17 +2363,6 @@
    MmCopyToCaller(Buffer, SafeBuffer, BufferSize);
    ExFreePool(SafeBuffer);
    return TRUE;
-}
-
-BOOL
-STDCALL
-NtGdiGetCharWidthFloat(HDC  hDC,
-                            UINT  FirstChar,
-                            UINT  LastChar,
-                            PFLOAT  Buffer)
-{
-  UNIMPLEMENTED;
-  return FALSE;
 }
 
 DWORD

Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original)
+++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Wed Nov  7 02:31:28 2007
@@ -2478,23 +2478,6 @@
  /*
  * @unimplemented
  */
-BOOL
-STDCALL
-NtGdiGetCharABCWidthsW(
-    IN HDC hdc,
-    IN UINT wchFirst,
-    IN ULONG cwch,
-    IN OPTIONAL PWCHAR pwch,
-    IN FLONG fl,
-    OUT PVOID pvBuf)
- {
-    UNIMPLEMENTED;
-    return FALSE;
-}
-
- /*
- * @unimplemented
- */
 DWORD
 STDCALL
 NtGdiGetCharacterPlacementW(

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 Wed Nov  7 02:31:28 2007
@@ -748,10 +748,7 @@
 NtGdiGetBkMode                          1
 NtGdiGetBrushOrgEx                      2
 NtGdiGetCharABCWidths                   4
-NtGdiGetCharABCWidthsFloat              4
-NtGdiGetCharacterPlacement              6
 NtGdiGetCharWidth32                     4
-NtGdiGetCharWidthFloat                  4
 NtGdiGetClipBox                         2
 NtGdiGetColorSpace                      1
 NtGdiGetCurrentPositionEx               2