https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fdd4d83b3de4855cb7e8…
commit 0fdd4d83b3de4855cb7e8d114754a9ce4efddb19
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Mar 13 21:40:15 2022 +0100
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:36 2022 +0100
[WINESYNC] msi/tests: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id f211bd0a4e0b8e8911b6a64ff4f09bb9d4ec2f84 by Michael Stefaniuc
<mstefani(a)winehq.org>
---
modules/rostests/winetests/msi/custom.c | 4 +---
modules/rostests/winetests/msi/record.c | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/modules/rostests/winetests/msi/custom.c
b/modules/rostests/winetests/msi/custom.c
index caf24356948..d74d0a2d097 100644
--- a/modules/rostests/winetests/msi/custom.c
+++ b/modules/rostests/winetests/msi/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/modules/rostests/winetests/msi/record.c
b/modules/rostests/winetests/msi/record.c
index 8e4c2df4294..407d756caae 100644
--- a/modules/rostests/winetests/msi/record.c
+++ b/modules/rostests/winetests/msi/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';