Piotr Caban : msvcrt: Don't forward memcmp to ntdll.
Alexandre Julliard
julliard at winehq.org
Tue Sep 17 15:25:54 CDT 2013
Module: wine
Branch: master
Commit: 4fbf246298f8cef5cb40290084c8858a1b547fac
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbf246298f8cef5cb40290084c8858a1b547fac
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Sep 17 14:44:56 2013 +0200
msvcrt: Don't forward memcmp to ntdll.
---
dlls/msvcrt/msvcrt.spec | 2 +-
dlls/msvcrt/string.c | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 23d29a3..93c09ce 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1370,7 +1370,7 @@
@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
-@ cdecl memcmp(ptr ptr long) ntdll.memcmp
+@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcpy_s(ptr long ptr long)
@ cdecl memmove(ptr ptr long) ntdll.memmove
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 082029d..b6a51b6 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -1594,11 +1594,19 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1
#undef I10_OUTPUT_MAX_PREC
/*********************************************************************
+ * memcmp (MSVCRT.@)
+ */
+int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n)
+{
+ return memcmp(ptr1, ptr2, n);
+}
+
+/*********************************************************************
* memcpy (MSVCRT.@)
*/
-void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n )
+void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n)
{
- return memmove( dst, src, n );
+ return memmove(dst, src, n);
}
/*********************************************************************
More information about the wine-cvs
mailing list