Module: wine Branch: master Commit: 9bd13c93ab58ad34c62b70c404dde708a9807d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd13c93ab58ad34c62b70c404...
Author: Andrew Nguyen anguyen@codeweavers.com Date: Sun Jul 18 19:35:27 2010 -0500
shlwapi: Implement StrStrNW.
---
dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 34 +++++++++++++++++ dlls/shlwapi/tests/string.c | 85 +++++++++++++++++++++++++++++++++++++++++++ include/shlwapi.h | 2 + 4 files changed, 122 insertions(+), 0 deletions(-)
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 268a2e2..b0e3e0e 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -801,6 +801,7 @@ @ stdcall StrStrA(str str) @ stdcall StrStrIA(str str) @ stdcall StrStrIW(wstr wstr) +@ stdcall StrStrNW(wstr wstr long) @ stdcall StrStrW(wstr wstr) @ stdcall StrToIntA(str) @ stdcall StrToIntExA(str long ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 5647a35..96a7843 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -710,6 +710,40 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) }
/************************************************************************* + * StrStrNW [SHLWAPI.@] + * + * Find a substring within a string up to a given number of initial characters. + * + * PARAMS + * lpFirst [I] String to search in + * lpSrch [I] String to look for + * cchMax [I] Maximum number of initial search characters + * + * RETURNS + * The start of lpFirst within lpSrch, or NULL if not found. + */ +LPWSTR WINAPI StrStrNW(LPCWSTR lpFirst, LPCWSTR lpSrch, UINT cchMax) +{ + UINT i; + int len; + + TRACE("(%s, %s, %u)\n", debugstr_w(lpFirst), debugstr_w(lpSrch), cchMax); + + if (!lpFirst || !lpSrch || !*lpSrch || !cchMax) + return NULL; + + len = strlenW(lpSrch); + + for (i = cchMax; *lpFirst && (i > 0); i--, lpFirst++) + { + if (!strncmpW(lpFirst, lpSrch, len)) + return (LPWSTR)lpFirst; + } + + return NULL; +} + +/************************************************************************* * StrToIntA [SHLWAPI.@] * * Read a signed integer from a string. diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 8b4bb17..71e1d4b 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -58,6 +58,7 @@ static BOOL (WINAPI *pStrIsIntlEqualW)(BOOL,LPCWSTR,LPCWSTR,int); static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,void*,BSTR*); static HRESULT (WINAPI *pStrRetToBufA)(STRRET*,LPCITEMIDLIST,LPSTR,UINT); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); +static LPWSTR (WINAPI *pStrStrNW)(LPCWSTR,LPCWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); @@ -1165,6 +1166,88 @@ static void test_StrStrIW(void) } }
+static void test_StrStrNW(void) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR dead_lowerW[] = {'d','e','a','d',0}; + static const WCHAR adbeW[] = {'A','d','B','e',0}; + static const WCHAR adbe_lowerW[] = {'a','d','b','e',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + static const WCHAR beef_lowerW[] = {'b','e','e','f',0}; + + const struct + { + const WCHAR *search; + const UINT count; + const WCHAR *expect; + } StrStrNW_cases[] = + { + {emptyW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {deadW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW}, + {dead_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {adbeW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW + 2}, + {adbe_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {beefW, sizeof(deadbeefW)/sizeof(WCHAR), deadbeefW + 4}, + {beef_lowerW, sizeof(deadbeefW)/sizeof(WCHAR), NULL}, + {beefW, 0, NULL}, + {beefW, 1, NULL}, + {beefW, 2, NULL}, + {beefW, 3, NULL}, + {beefW, 4, NULL}, + {beefW, 5, deadbeefW + 4}, + {beefW, 6, deadbeefW + 4}, + {beefW, 7, deadbeefW + 4}, + {beefW, 8, deadbeefW + 4}, + {beefW, 9, deadbeefW + 4}, + }; + + LPWSTR ret; + UINT i; + + if (!pStrStrNW) + { + win_skip("StrStrNW() is not available\n"); + return; + } + + ret = pStrStrNW(NULL, NULL, 0); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + ret = pStrStrNW(NULL, NULL, 10); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + ret = pStrStrNW(NULL, emptyW, 10); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + ret = pStrStrNW(emptyW, NULL, 10); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + ret = pStrStrNW(emptyW, emptyW, 10); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + + for (i = 0; i < sizeof(StrStrNW_cases)/sizeof(StrStrNW_cases[0]); i++) + { + ret = pStrStrNW(deadbeefW, StrStrNW_cases[i].search, StrStrNW_cases[i].count); + ok(ret == StrStrNW_cases[i].expect, + "[%d] Expected StrStrNW to return %p, got %p\n", + i, StrStrNW_cases[i].expect, ret); + } + + /* StrStrNW accepts counts larger than the search string length but rejects + * counts larger than around 2G. The limit seems to change based on the + * caller executable itself. */ + ret = pStrStrNW(deadbeefW, beefW, 100); + ok(ret == deadbeefW + 4, "Expected StrStrNW to return deadbeefW + 4, got %p\n", ret); + + if (0) + { + ret = pStrStrNW(deadbeefW, beefW, ~0U); + ok(!ret, "Expected StrStrNW to return NULL, got %p\n", ret); + } +} + START_TEST(string) { HMODULE hShlwapi; @@ -1195,6 +1278,7 @@ START_TEST(string) pStrRetToBSTR = (void *)GetProcAddress(hShlwapi, "StrRetToBSTR"); pStrRetToBufA = (void *)GetProcAddress(hShlwapi, "StrRetToBufA"); pStrRetToBufW = (void *)GetProcAddress(hShlwapi, "StrRetToBufW"); + pStrStrNW = (void *)GetProcAddress(hShlwapi, "StrStrNW"); pwnsprintfA = (void *)GetProcAddress(hShlwapi, "wnsprintfA"); pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW");
@@ -1238,6 +1322,7 @@ START_TEST(string) test_StrStrW(); test_StrStrIA(); test_StrStrIW(); + test_StrStrNW();
CoUninitialize(); } diff --git a/include/shlwapi.h b/include/shlwapi.h index 744be84..fe58bb5 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -876,6 +876,8 @@ LPSTR WINAPI StrStrIA(LPCSTR,LPCSTR); LPWSTR WINAPI StrStrIW(LPCWSTR,LPCWSTR); #define StrStrI WINELIB_NAME_AW(StrStrI)
+LPWSTR WINAPI StrStrNW(LPCWSTR,LPCWSTR,UINT); + int WINAPI StrToIntA(LPCSTR); int WINAPI StrToIntW(LPCWSTR); #define StrToInt WINELIB_NAME_AW(StrToInt)
-
Alexandre Julliard