From cc4ef02bd01dc43c70def40de9be2dc5f8bd4946 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sun, 26 Oct 2014 17:32:00 +0000
Subject: [PATCH] [CRT] - Fix strlen/wcslen FPO specification. Spotted by Timo.
 - Also add FPO info for memset, memchr, memmove/memcpy

svn path=/trunk/; revision=65021
---
 reactos/lib/sdk/crt/mem/i386/memchr_asm.s   | 4 +++-
 reactos/lib/sdk/crt/mem/i386/memmove_asm.s  | 4 +++-
 reactos/lib/sdk/crt/mem/i386/memset_asm.s   | 4 +++-
 reactos/lib/sdk/crt/string/i386/tcsnlen.inc | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/sdk/crt/mem/i386/memchr_asm.s b/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
index 37e5deb9f52..5a72c94e691 100644
--- a/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
+++ b/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
@@ -14,7 +14,8 @@
 PUBLIC	_memchr
 .code
 
-_memchr:
+FUNC _memchr
+	FPO 0, 3, 4, 1, 1, FRAME_NONFPO
 	push ebp
 	mov ebp, esp
 	push edi
@@ -33,5 +34,6 @@ _memchr:
 	pop edi
 	leave
 	ret
+ENDFUNC
 
 END
diff --git a/reactos/lib/sdk/crt/mem/i386/memmove_asm.s b/reactos/lib/sdk/crt/mem/i386/memmove_asm.s
index 476f843befe..299b2cc8d38 100644
--- a/reactos/lib/sdk/crt/mem/i386/memmove_asm.s
+++ b/reactos/lib/sdk/crt/mem/i386/memmove_asm.s
@@ -11,7 +11,8 @@ PUBLIC _memmove
 .code
 
 _memcpy:
-_memmove:
+FUNC _memmove
+	FPO 0, 3, 5, 2, 1, FRAME_NONFPO
 	push ebp
 	mov ebp, esp
 	
@@ -116,5 +117,6 @@ _memmove:
 	dec esi
 	dec edi
 	jmp .L8
+ENDFUNC
 
 END
diff --git a/reactos/lib/sdk/crt/mem/i386/memset_asm.s b/reactos/lib/sdk/crt/mem/i386/memset_asm.s
index dc964ac3969..ba04724b443 100644
--- a/reactos/lib/sdk/crt/mem/i386/memset_asm.s
+++ b/reactos/lib/sdk/crt/mem/i386/memset_asm.s
@@ -9,7 +9,8 @@
 PUBLIC _memset
 .code
 
-_memset:
+FUNC _memset
+	FPO 0, 3, 4, 1, 1, FRAME_NONFPO
 	push ebp
 	mov ebp, esp
 	push edi
@@ -45,5 +46,6 @@ _memset:
 	mov eax, [ebp + 8]
 	leave
 	ret
+ENDFUNC
 
 END
diff --git a/reactos/lib/sdk/crt/string/i386/tcsnlen.inc b/reactos/lib/sdk/crt/string/i386/tcsnlen.inc
index d8741188c59..58febca97a6 100644
--- a/reactos/lib/sdk/crt/string/i386/tcsnlen.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcsnlen.inc
@@ -6,7 +6,7 @@ PUBLIC _tcsnlen
 .code
 
 FUNC _tcsnlen
-    FPO 0, 1, 1, 1, 0, FRAME_FPO
+    FPO 0, 2, 1, 1, 0, FRAME_FPO
     push edi
     mov edi, [esp + 8]
     mov ecx, [esp + 12]