From 75b952dde1a118af0bcda9336cd016efbbc124a3 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Thu, 8 Nov 2007 12:15:39 +0000
Subject: [PATCH] - Move ctype into strings. - Separate msvcrt-specific
 exception handling routine into prolog.s file. - Move bsearch to the search
 directory.

svn path=/trunk/; revision=30267
---
 reactos/lib/sdk/crt/crt.rbuild                |  5 ++--
 reactos/lib/sdk/crt/except/i386/prolog.s      | 27 +++++++++++++++++++
 reactos/lib/sdk/crt/except/i386/seh.s         | 13 ---------
 .../lib/sdk/crt/{math => search}/bsearch.c    |  0
 reactos/lib/sdk/crt/{ctype => string}/ctype.c |  0
 5 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 reactos/lib/sdk/crt/except/i386/prolog.s
 rename reactos/lib/sdk/crt/{math => search}/bsearch.c (100%)
 rename reactos/lib/sdk/crt/{ctype => string}/ctype.c (100%)

diff --git a/reactos/lib/sdk/crt/crt.rbuild b/reactos/lib/sdk/crt/crt.rbuild
index b7ff3da6495..e08dbce33b1 100644
--- a/reactos/lib/sdk/crt/crt.rbuild
+++ b/reactos/lib/sdk/crt/crt.rbuild
@@ -23,9 +23,6 @@
 		<file>putch.c</file>
 		<file>ungetch.c</file>
 	</directory>
-	<directory name="ctype">
-		<file>ctype.c</file>
-	</directory>
 	<directory name="direct">
 		<file>chdir.c</file>
 		<file>chdrive.c</file>
@@ -47,6 +44,7 @@
 		<file>matherr.c</file>
 		<if property="ARCH" value="i386">
 			<directory name="i386">
+				<file>prolog.s</file>
 				<file>seh.s</file>
 				<file>unwind.c</file>
 			</directory>
@@ -413,6 +411,7 @@
 			<file>wcsrchr.c</file>
 		</ifnot>
 		<file>atof.c</file>
+		<file>ctype.c</file>
 		<file>lasttok.c</file>
 		<file>strcoll.c</file>
 		<file>strdup.c</file>
diff --git a/reactos/lib/sdk/crt/except/i386/prolog.s b/reactos/lib/sdk/crt/except/i386/prolog.s
new file mode 100644
index 00000000000..5ff588d6746
--- /dev/null
+++ b/reactos/lib/sdk/crt/except/i386/prolog.s
@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS CRT
+ * FILE:            lib/crt/misc/i386/prolog.s
+ * PURPOSE:         SEH Support for the CRT
+ * PROGRAMMERS:     Wine Development Team
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <ndk/asm.h>
+
+/* GLOBALS *******************************************************************/
+
+.globl __EH_prolog
+
+// Copied from Wine.
+__EH_prolog:
+    pushl    $-1
+    pushl    %eax
+    pushl    %fs:0
+    movl     %esp, %fs:0
+    movl     12(%esp), %eax
+    movl     %ebp, 12(%esp)
+    leal     12(%esp), %ebp
+    pushl    %eax
+    ret
diff --git a/reactos/lib/sdk/crt/except/i386/seh.s b/reactos/lib/sdk/crt/except/i386/seh.s
index 8a2c984fc09..351a7dff7e9 100755
--- a/reactos/lib/sdk/crt/except/i386/seh.s
+++ b/reactos/lib/sdk/crt/except/i386/seh.s
@@ -56,7 +56,6 @@
 
 .globl __local_unwind2
 .globl __except_handler3
-.globl __EH_prolog
 
 // EAX = value to print
 _do_debug:
@@ -366,15 +365,3 @@ _except_finish:
 
     // We should never get here
     ret
-
-// Copied from Wine.
-__EH_prolog:
-    pushl    $-1
-    pushl    %eax
-    pushl    %fs:0
-    movl     %esp, %fs:0
-    movl     12(%esp), %eax
-    movl     %ebp, 12(%esp)
-    leal     12(%esp), %ebp
-    pushl    %eax
-    ret
diff --git a/reactos/lib/sdk/crt/math/bsearch.c b/reactos/lib/sdk/crt/search/bsearch.c
similarity index 100%
rename from reactos/lib/sdk/crt/math/bsearch.c
rename to reactos/lib/sdk/crt/search/bsearch.c
diff --git a/reactos/lib/sdk/crt/ctype/ctype.c b/reactos/lib/sdk/crt/string/ctype.c
similarity index 100%
rename from reactos/lib/sdk/crt/ctype/ctype.c
rename to reactos/lib/sdk/crt/string/ctype.c