[ros-diffs] [jimtabor] 31436: Move string object function to eng/string.c.

Author: jimtabor
Date: Tue Dec 25 22:52:42 2007
New Revision: 31436

URL: http://svn.reactos.org/svn/reactos?rev=31436&view=rev
Log:
Move string object function to eng/string.c.

Added:
    trunk/reactos/subsystems/win32/win32k/eng/string.c   (with props)
Modified:
    trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
    trunk/reactos/subsystems/win32/win32k/win32k.rbuild

Added: trunk/reactos/subsystems/win32/win32k/eng/string.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/string.c (added)
+++ trunk/reactos/subsystems/win32/win32k/eng/string.c Tue Dec 25 22:52:42 2007
@@ -1,0 +1,89 @@
+
+#include <w32k.h>
+
+#define NDEBUG
+#include <debug.h>
+
+
+BOOL
+APIENTRY
+STROBJ_bEnum(
+	IN STROBJ  *pstro,
+	OUT ULONG  *pc,
+	OUT PGLYPHPOS  *ppgpos
+	)
+{
+  // www.osr.com/ddk/graphics/gdifncs_65uv.htm
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+DWORD
+APIENTRY
+STROBJ_dwGetCodePage ( IN STROBJ *pstro )
+{
+  // www.osr.com/ddk/graphics/gdifncs_9jmv.htm
+  PSTRGDI pStrGdi = (PSTRGDI) pstro;
+  return pStrGdi->dwCodePage;
+}
+
+VOID
+APIENTRY
+STROBJ_vEnumStart ( IN STROBJ *pstro )
+{
+  // www.osr.com/ddk/graphics/gdifncs_32uf.htm
+  UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL APIENTRY
+STROBJ_bEnumPositionsOnly(
+   IN STROBJ *StringObj,
+   OUT ULONG *Count,
+   OUT PGLYPHPOS *Pos)
+{
+   UNIMPLEMENTED;
+   return (BOOL) DDI_ERROR;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL APIENTRY
+STROBJ_bGetAdvanceWidths(
+   IN STROBJ *StringObj,
+   IN ULONG First,
+   IN ULONG Count,
+   OUT POINTQF *Widths)
+{
+   UNIMPLEMENTED;
+   return FALSE;
+}
+
+/*
+ * @implemented
+ */
+FIX APIENTRY
+STROBJ_fxBreakExtra(
+   IN STROBJ *StringObj)
+{
+  PSTRGDI pStrGdi = (PSTRGDI) StringObj;
+  if (pStrGdi->StrObj.flAccel & SO_BREAK_EXTRA) return pStrGdi->fxBreakExtra;
+  return (FIX) 0;
+}
+
+/*
+ * @implemented
+ */
+FIX APIENTRY
+STROBJ_fxCharacterExtra(
+   IN STROBJ *StringObj)
+{
+  PSTRGDI pStrGdi = (PSTRGDI) StringObj;
+  if (pStrGdi->StrObj.flAccel & SO_CHARACTER_EXTRA) return pStrGdi->fxExtra;
+  return (FIX) 0;
+}
+
+/* EOF */

Propchange: trunk/reactos/subsystems/win32/win32k/eng/string.c
------------------------------------------------------------------------------
    svn:eol-style = native

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 Tue Dec 25 22:52:42 2007
@@ -734,36 +734,6 @@
 	)
 {
   // www.osr.com/ddk/graphics/gdifncs_8qp3.htm
-  UNIMPLEMENTED;
-}
-
-BOOL
-APIENTRY
-STROBJ_bEnum(
-	IN STROBJ  *pstro,
-	OUT ULONG  *pc,
-	OUT PGLYPHPOS  *ppgpos
-	)
-{
-  // www.osr.com/ddk/graphics/gdifncs_65uv.htm
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-DWORD
-APIENTRY
-STROBJ_dwGetCodePage ( IN STROBJ *pstro )
-{
-  // www.osr.com/ddk/graphics/gdifncs_9jmv.htm
-  UNIMPLEMENTED;
-  return 0;
-}
-
-VOID
-APIENTRY
-STROBJ_vEnumStart ( IN STROBJ *pstro )
-{
-  // www.osr.com/ddk/graphics/gdifncs_32uf.htm
   UNIMPLEMENTED;
 }
 
@@ -1087,55 +1057,6 @@
 /*
  * @unimplemented
  */
-BOOL APIENTRY
-STROBJ_bEnumPositionsOnly(
-   IN STROBJ *StringObj,
-   OUT ULONG *Count,
-   OUT PGLYPHPOS *Pos)
-{
-   UNIMPLEMENTED;
-   return (BOOL) DDI_ERROR;
-}
-
-/*
- * @unimplemented
- */
-BOOL APIENTRY
-STROBJ_bGetAdvanceWidths(
-   IN STROBJ *StringObj,
-   IN ULONG First,
-   IN ULONG Count,
-   OUT POINTQF *Widths)
-{
-   UNIMPLEMENTED;
-   return FALSE;
-}
-
-/*
- * @unimplemented
- */
-FIX APIENTRY
-STROBJ_fxBreakExtra(
-   IN STROBJ *StringObj)
-{
-   UNIMPLEMENTED;
-   return (FIX) 0;
-}
-
-/*
- * @unimplemented
- */
-FIX APIENTRY
-STROBJ_fxCharacterExtra(
-   IN STROBJ *StringObj)
-{
-   UNIMPLEMENTED;
-   return (FIX) 0;
-}
-
-/*
- * @unimplemented
- */
 HANDLE APIENTRY
 XLATEOBJ_hGetColorTransform(
    IN XLATEOBJ *XlateObj)

Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original)
+++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Tue Dec 25 22:52:42 2007
@@ -64,6 +64,7 @@
 		<file>perfcnt.c</file>
 		<file>semaphor.c</file>
 		<file>sort.c</file>
+		<file>string.c</file>
 		<file>surface.c</file>
 		<file>transblt.c</file>
 		<file>engwindow.c</file>