Alexandre Julliard : ntdll: memcpy should behave like memmove in ntdll too.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 2a192064e819bde69ce556f92c7d5d124356d39b
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2a192064e819bde69ce556f9...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Jan 24 12:28:34 2006 +0100

ntdll: memcpy should behave like memmove in ntdll too.

---

 dlls/msvcrt/msvcrt.spec |    2 +-
 dlls/ntdll/ntdll.spec   |    2 +-
 dlls/ntdll/string.c     |   13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 6169e82..9f68417 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -666,7 +666,7 @@
 @ cdecl mbtowc(wstr str long) MSVCRT_mbtowc
 @ cdecl memchr(ptr long long) ntdll.memchr
 @ cdecl memcmp(ptr ptr long) ntdll.memcmp
-@ cdecl memcpy(ptr ptr long) ntdll.memmove #sic
+@ cdecl memcpy(ptr ptr long) ntdll.memcpy
 @ cdecl memmove(ptr ptr long) ntdll.memmove
 @ cdecl memset(ptr long long) ntdll.memset
 @ cdecl mktime(ptr) MSVCRT_mktime
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 5502c76..3304ead 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1308,7 +1308,7 @@
 @ cdecl -private mbstowcs(ptr str long) NTDLL_mbstowcs
 @ cdecl -private memchr(ptr long long)
 @ cdecl -private memcmp(ptr ptr long)
-@ cdecl -private memcpy(ptr ptr long)
+@ cdecl -private memcpy(ptr ptr long) NTDLL_memcpy
 @ cdecl -private memmove(ptr ptr long)
 @ cdecl -private memset(ptr long long)
 @ cdecl -private pow(double double)
diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c
index e05f7c3..45d36d8 100644
--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <ctype.h>
 #include <stdarg.h>
@@ -62,6 +63,18 @@ INT __cdecl NTDLL__memicmp( LPCSTR s1, L
 
 
 /*********************************************************************
+ *                  memcpy   (NTDLL.@)
+ *
+ * NOTES
+ *  Behaves like memmove.
+ */
+void * __cdecl NTDLL_memcpy( void *dst, const void *src, size_t n )
+{
+    return memmove( dst, src, n );
+}
+
+
+/*********************************************************************
  *                  _strupr   (NTDLL.@)
  *
  * Convert a string to upper case.