Michael Stefaniuc : shlwapi/tests: Get rid of strcmp_wa().

Alexandre Julliard julliard at winehq.org
Thu Feb 6 15:44:18 CST 2020


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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Thu Feb  6 22:41:16 2020 +0200

shlwapi/tests: Get rid of strcmp_wa().

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

---

 dlls/shlwapi/tests/ordinal.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 135d82ead1..f1527eb6b8 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -95,13 +95,6 @@ static const CHAR ie_international[] = {
 static const CHAR acceptlanguage[] = {
     'A','c','c','e','p','t','L','a','n','g','u','a','g','e',0};
 
-static int strcmp_wa(LPCWSTR strw, const char *stra)
-{
-    CHAR buf[512];
-    WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
-    return lstrcmpA(stra, buf);
-}
-
 typedef struct {
     int id;
     const void *args[5];
@@ -2740,11 +2733,11 @@ static void test_SHGetIniString(void)
 
     ret = pSHGetIniStringW(TestAppW, AKeyW, out, ARRAY_SIZE(out), pathW);
     ok(ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret);
-    ok(!strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out));
+    ok(!lstrcmpW(out, L"1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out));
 
     ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, ARRAY_SIZE(out), pathW);
     ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret);
-    ok(!strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out));
+    ok(!lstrcmpW(out, L"asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out));
 
     out[0] = 1;
     ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, ARRAY_SIZE(out), pathW);




More information about the wine-cvs mailing list