Module: wine Branch: master Commit: 019c34ca1ebc9cae7e334e8e08edea2d2f5f9f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019c34ca1ebc9cae7e334e8e08...
Author: Piotr Caban piotr@codeweavers.com Date: Tue Sep 17 14:46:07 2013 +0200
msvcrt: Don't forward strstr 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 304881a..4de1722 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1437,7 +1437,7 @@ @ cdecl strpbrk(str str) ntdll.strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) ntdll.strstr +@ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 9232d63..d3bde66 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1735,3 +1735,11 @@ int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) { return MSVCRT__strnicmp_l(s1, s2, -1, NULL); } + +/********************************************************************* + * strstr (MSVCRT.@) + */ +char* __cdecl MSVCRT_strstr(const char *haystack, const char *needle) +{ + return strstr(haystack, needle); +}