Module: wine Branch: master Commit: e4e3dc7eb6082978bd285aeefdf852519c6d469f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e3dc7eb6082978bd285aeef...
Author: Alexandre Julliard julliard@winehq.org Date: Sun Jan 26 10:57:37 2020 +0100
shell32/tests: Get rid of strcmpW().
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shell32/tests/string.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 5fd589300b..acd9444811 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -42,12 +42,6 @@ static WCHAR *CoDupStrW(const char* src) return szTemp; }
-static inline int strcmpW(const WCHAR *str1, const WCHAR *str2) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - static void test_StrRetToStringNA(void) { trace("StrRetToStringNAW is Ascii\n"); @@ -68,14 +62,14 @@ static void test_StrRetToStringNW(void) U(strret).pOleStr = CoDupStrW("Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, NULL); - ok(ret == TRUE && !strcmpW(buff, szTestW), + ok(ret == TRUE && !wcscmp(buff, szTestW), "STRRET_WSTR: dup failed, ret=%d\n", ret);
strret.uType = STRRET_CSTR; lstrcpyA(U(strret).cStr, "Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, NULL); - ok(ret == TRUE && !strcmpW(buff, szTestW), + ok(ret == TRUE && !wcscmp(buff, szTestW), "STRRET_CSTR: dup failed, ret=%d\n", ret);
strret.uType = STRRET_OFFSET; @@ -83,7 +77,7 @@ static void test_StrRetToStringNW(void) strcpy((char*)&iidl, " Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, iidl); - ok(ret == TRUE && !strcmpW(buff, szTestW), + ok(ret == TRUE && !wcscmp(buff, szTestW), "STRRET_OFFSET: dup failed, ret=%d\n", ret);
/* The next test crashes on W2K, WinXP and W2K3, so we don't test. */
-
Alexandre Julliard