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

Alexandre Julliard julliard at winehq.org
Wed Mar 27 15:40:07 CDT 2013


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Wed Mar 27 16:11:59 2013 +0100

msvcrt: Don't forward memset 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 7b27220..be94008 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1368,7 +1368,7 @@
 @ cdecl memcpy_s(ptr long ptr long)
 @ cdecl memmove(ptr ptr long) ntdll.memmove
 @ cdecl memmove_s(ptr long ptr long)
-@ cdecl memset(ptr long long) ntdll.memset
+@ cdecl memset(ptr long long) MSVCRT_memset
 @ cdecl mktime(ptr) MSVCRT_mktime
 @ cdecl modf(double ptr) MSVCRT_modf
 @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 0002ff0..f7c2118 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -1567,6 +1567,14 @@ void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n )
 }
 
 /*********************************************************************
+ *		    memset (MSVCRT.@)
+ */
+void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n)
+{
+    return memset(dst, c, n);
+}
+
+/*********************************************************************
  *                  _strnicmp_l   (MSVCRT.@)
  */
 int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2,




More information about the wine-cvs mailing list