From 55888d315adfe9032d9e7310470589e7480a410e Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Tue, 25 Dec 2007 19:52:42 +0000
Subject: [PATCH] Move string object function to eng/string.c.

svn path=/trunk/; revision=31436
---
 reactos/subsystems/win32/win32k/eng/string.c  | 89 +++++++++++++++++++
 reactos/subsystems/win32/win32k/stubs/stubs.c | 79 ----------------
 reactos/subsystems/win32/win32k/win32k.rbuild |  1 +
 3 files changed, 90 insertions(+), 79 deletions(-)
 create mode 100644 reactos/subsystems/win32/win32k/eng/string.c

diff --git a/reactos/subsystems/win32/win32k/eng/string.c b/reactos/subsystems/win32/win32k/eng/string.c
new file mode 100644
index 00000000000..6ab902a1bb9
--- /dev/null
+++ b/reactos/subsystems/win32/win32k/eng/string.c
@@ -0,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 */
diff --git a/reactos/subsystems/win32/win32k/stubs/stubs.c b/reactos/subsystems/win32/win32k/stubs/stubs.c
index 2ba41172fcb..9cc91c03f51 100644
--- a/reactos/subsystems/win32/win32k/stubs/stubs.c
+++ b/reactos/subsystems/win32/win32k/stubs/stubs.c
@@ -737,36 +737,6 @@ PATHOBJ_vGetBounds(
   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;
-}
-
 BOOL
 APIENTRY
 XFORMOBJ_bApplyXform(
@@ -1084,55 +1054,6 @@ HT_Get8BPPMaskPalette(
    return 0;
 }
 
-/*
- * @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
  */
diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild
index 31dea0a020f..26016167d08 100644
--- a/reactos/subsystems/win32/win32k/win32k.rbuild
+++ b/reactos/subsystems/win32/win32k/win32k.rbuild
@@ -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>