Michael Stefaniuc : msi/tests: Use wide-char string literals.

Alexandre Julliard julliard at winehq.org
Mon Dec 14 15:51:17 CST 2020


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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Sun Dec 13 21:46:21 2020 +0100

msi/tests: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msi/tests/custom.c | 4 +---
 dlls/msi/tests/record.c | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index caf24356948..d74d0a2d097 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -518,12 +518,10 @@ static void test_db(MSIHANDLE hinst)
 
     for (i = 0; i < 20; i++)
     {
-        WCHAR emptyW[1] = { 0 };
-
         r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, "");
         ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r);
 
-        r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW);
+        r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, L"");
         ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r);
     }
 
diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c
index 8e4c2df4294..407d756caae 100644
--- a/dlls/msi/tests/record.c
+++ b/dlls/msi/tests/record.c
@@ -56,7 +56,6 @@ static void test_msirecord(void)
     char buf[10];
     WCHAR bufW[10];
     const char str[] = "hello";
-    const WCHAR strW[] = { 'h','e','l','l','o',0};
     char filename[MAX_PATH];
 
     /* check behaviour with an invalid record */
@@ -210,7 +209,7 @@ static void test_msirecord(void)
     r = MsiRecordGetStringW(h,0,bufW,&sz);
     ok(r == ERROR_MORE_DATA, "wrong error\n");
     ok(sz == 5, "MsiRecordGetStringA returned the wrong length\n");
-    ok(0==memcmp(bufW,strW,8), "MsiRecordGetStringA returned the wrong string\n");
+    ok(!memcmp(bufW, L"hello", 8), "MsiRecordGetStringA returned the wrong string\n");
 
     sz = 0;
     bufW[0] = 'x';




More information about the wine-cvs mailing list