Piotr Caban : msvcrt: Don't use strstrW in wcsstr.
Alexandre Julliard
julliard at winehq.org
Wed Jul 15 16:44:45 CDT 2020
Module: wine
Branch: master
Commit: ae9c385e13cff233527b55090dc8ae55de6664ae
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9c385e13cff233527b55090dc8ae55de6664ae
Author: Piotr Caban <piotr at codeweavers.com>
Date: Wed Jul 15 14:05:36 2020 +0200
msvcrt: Don't use strstrW in wcsstr.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/wcs.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 59ff24e196..ff066fb5c5 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -2652,7 +2652,19 @@ int CDECL MSVCRT_wcslen(const MSVCRT_wchar_t *str)
*/
MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *sub)
{
- return strstrW(str, sub);
+ while(*str)
+ {
+ const MSVCRT_wchar_t *p1 = str, *p2 = sub;
+ while(*p1 && *p2 && *p1 == *p2)
+ {
+ p1++;
+ p2++;
+ }
+ if(!*p2)
+ return (MSVCRT_wchar_t*)str;
+ str++;
+ }
+ return NULL;
}
/*********************************************************************
More information about the wine-cvs
mailing list