Hans Leidekker : msi/tests: Fix a test failure on Ultimate editions.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Sep 25 15:22:02 CDT 2015


Module: wine
Branch: master
Commit: 100c043e89485a1fd6d7071fd5f8291d8104d5fa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=100c043e89485a1fd6d7071fd5f8291d8104d5fa

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Sep 23 11:02:32 2015 +0200

msi/tests: Fix a test failure on Ultimate editions.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>

---

 dlls/msi/tests/msi.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index b98a8c2..feeb1ff 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -4229,12 +4229,11 @@ static void test_MsiGetFileVersion(void)
     ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
 
     /* pcchLangBuf not big enough */
-    langsz = 3;
+    langsz = 4;
     lstrcpyA(lang, "lang");
     r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz);
     ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
-    ok(!strncmp(lang, langcheck, 2),
-       "Expected first character of \"%s\", got \"%s\"\n", langcheck, lang);
+    ok(lstrcmpA(lang, "lang"), "lang not set\n");
     ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz);
 
     /* pcchVersionBuf big enough, pcchLangBuf not big enough */
@@ -4255,7 +4254,7 @@ static void test_MsiGetFileVersion(void)
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
     ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz);
-    ok(lstrcmpA(lang, "lang"), "lang buffer not modified\n");
+    ok(strstr(lang, langcheck) != NULL, "expected %s in %s\n", langcheck, lang);
 
     /* NULL pcchVersionBuf and pcchLangBuf */
     r = MsiGetFileVersionA(path, version, NULL, lang, NULL);




More information about the wine-cvs mailing list