Jacek Caban : mshtml/tests: Get rid of wstr_contains.

Alexandre Julliard julliard at winehq.org
Thu Jan 30 16:10:25 CST 2020


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jan 30 20:37:32 2020 +0100

mshtml/tests: Get rid of wstr_contains.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/tests/style.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 2e8438a2f8..67c29c3a85 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -59,13 +59,6 @@ static int strcmp_wa(LPCWSTR strw, const char *stra)
     return lstrcmpA(stra, buf);
 }
 
-static BOOL wstr_contains(const WCHAR *strw, const char *stra)
-{
-    CHAR buf[512];
-    WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
-    return strstr(buf, stra) != NULL;
-}
-
 #define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b)
 static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect)
 {
@@ -753,7 +746,7 @@ static void test_style6(IHTMLStyle6 *style)
     str = (void*)0xdeadbeef;
     hres = IHTMLStyle6_get_outline(style, &str);
     ok(hres == S_OK, "get_outline failed: %08x\n", hres);
-    ok(wstr_contains(str, "1px"), "outline = %s\n", wine_dbgstr_w(str));
+    ok(wcsstr(str, L"1px") != NULL, "outline = %s\n", wine_dbgstr_w(str));
     SysFreeString(str);
 
     str = (void*)0xdeadbeef;




More information about the wine-cvs mailing list