Alexandre Julliard : oledlg/test: Get rid of strstrW().

Alexandre Julliard julliard at winehq.org
Mon Jan 27 15:00:15 CST 2020


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sun Jan 26 10:57:21 2020 +0100

oledlg/test: Get rid of strstrW().

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/oledlg/tests/main.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c
index cef55eb9ca..3bb384710b 100644
--- a/dlls/oledlg/tests/main.c
+++ b/dlls/oledlg/tests/main.c
@@ -26,18 +26,6 @@
 #include "initguid.h"
 #include "oledlg.h"
 
-static const 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 str;
-        str++;
-    }
-    return NULL;
-}
-
 static HRESULT WINAPI enumverbs_QueryInterface(IEnumOLEVERB *iface, REFIID riid, void **ppv)
 {
     if (IsEqualIID(riid, &IID_IEnumOLEVERB) || IsEqualIID(riid, &IID_IUnknown)) {
@@ -411,7 +399,7 @@ static void test_OleUIAddVerbMenu(void)
     ok(ret, "got %d\n", ret);
     /* Item string contains verb, usertype and localized string for 'Object' word,
        exact format depends on localization. */
-    ok(strstrW(buffW, verbW) != NULL, "str %s\n", wine_dbgstr_w(buffW));
+    ok(wcsstr(buffW, verbW) != NULL, "str %s\n", wine_dbgstr_w(buffW));
     ok(info.fState == 0, "got state 0x%08x\n", info.fState);
     ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu);
 




More information about the wine-cvs mailing list