Alexandre Julliard : mlang/tests: Get rid of strstrW().
Alexandre Julliard
julliard at winehq.org
Mon Jan 27 15:00:14 CST 2020
Module: wine
Branch: master
Commit: 70644be9df31adcfd883dc3758a2e7d81778d783
URL: https://source.winehq.org/git/wine.git/?a=commit;h=70644be9df31adcfd883dc3758a2e7d81778d783
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sun Jan 26 10:52:08 2020 +0100
mlang/tests: Get rid of strstrW().
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mlang/tests/mlang.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index b5d6fc6114..d3a71e935d 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1294,19 +1294,6 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
ok(processed == 0, "expected 0, got %d\n", processed);
}
-/* copied from libs/wine/string.c */
-static WCHAR *strstrW(const WCHAR *str, const WCHAR *sub)
-{
- while (*str)
- {
- const WCHAR *p1 = str, *p2 = sub;
- while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; }
- if (!*p2) return (WCHAR *)str;
- str++;
- }
- return NULL;
-}
-
static void test_rfc1766(IMultiLanguage2 *iML2)
{
IEnumRfc1766 *pEnumRfc1766;
@@ -1336,7 +1323,7 @@ static void test_rfc1766(IMultiLanguage2 *iML2)
/* not an exact 1:1 correspondence between lcid and rfc1766 in the
* mlang database, e.g., nb-no -> 1044 -> no */
- ok(strstrW(info.wszRfc1766, rfcstr) != NULL,
+ ok(wcsstr(info.wszRfc1766, rfcstr) != NULL,
"Expected matching locale names\n");
SysFreeString(rfcstr);
More information about the wine-cvs
mailing list