msi/tests: Write-strings warnings fix
Andrew Talbot
Andrew.Talbot at talbotville.com
Fri Aug 11 10:29:02 CDT 2006
Changelog:
msi/tests: Write-strings warnings fix.
diff -urN a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
--- a/dlls/msi/tests/install.c 2006-07-28 17:23:46.000000000 +0100
+++ b/dlls/msi/tests/install.c 2006-08-11 16:12:57.000000000 +0100
@@ -316,7 +316,7 @@
return 0;
}
-static BOOL check_record(MSIHANDLE rec, UINT field, LPSTR val)
+static BOOL check_record(MSIHANDLE rec, UINT field, LPCSTR val)
{
CHAR buffer[0x20];
UINT r;
@@ -403,6 +403,8 @@
CCAB cabParams;
HFCI hfci;
ERF erf;
+ static CHAR four_txt[] = "four.txt",
+ five_txt[] = "five.txt";
BOOL res;
set_cab_parameters(&cabParams, name);
@@ -413,8 +415,8 @@
ok(hfci != NULL, "Failed to create an FCI context\n");
- add_file(hfci, "four.txt");
- add_file(hfci, "five.txt");
+ add_file(hfci, four_txt);
+ add_file(hfci, five_txt);
res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress);
ok(res, "Failed to flush the cabinet\n");
diff -urN a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
--- a/dlls/msi/tests/package.c 2006-08-11 12:54:29.000000000 +0100
+++ b/dlls/msi/tests/package.c 2006-08-11 15:49:57.000000000 +0100
@@ -1765,6 +1765,7 @@
{
MSIHANDLE hPackage = 0;
char prop[100];
+ static CHAR empty[] = "";
DWORD size;
UINT r;
@@ -1783,7 +1784,7 @@
/* retrieve the size, empty string */
size = 0;
- r = MsiGetProperty(hPackage, "Name", "", &size);
+ r = MsiGetProperty(hPackage, "Name", empty, &size);
ok( r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
ok( size == 5, "Expected 5, got %ld\n", size);
More information about the wine-patches
mailing list