Piotr Caban : msvcrt: Don't forward memchr to ntdll.

Alexandre Julliard julliard at winehq.org
Fri Jun 21 11:28:10 CDT 2013


Module: wine
Branch: master
Commit: bba1db09051f954e5eb0468c5e70b9ee8274b8b7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bba1db09051f954e5eb0468c5e70b9ee8274b8b7

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Jun 21 15:39:23 2013 +0200

msvcrt: Don't forward memchr to ntdll.

---

 dlls/msvcrt/msvcrt.spec |    2 +-
 dlls/msvcrt/string.c    |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 55ebba9..afb12bf 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1367,7 +1367,7 @@
 @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
 @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
 @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
-@ cdecl memchr(ptr long long) ntdll.memchr
+@ cdecl memchr(ptr long long) MSVCRT_memchr
 @ cdecl memcmp(ptr ptr long) ntdll.memcmp
 @ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
 @ cdecl memcpy_s(ptr long ptr long)
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index f2d1e20..c5d0e18 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -1616,6 +1616,14 @@ char* __cdecl MSVCRT_strchr(const char *str, int c)
 }
 
 /*********************************************************************
+ *                  memchr   (MSVCRT.@)
+ */
+void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n)
+{
+    return memchr(ptr, c, n);
+}
+
+/*********************************************************************
  *                  strncmp   (MSVCRT.@)
  */
 int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len)




More information about the wine-cvs mailing list