msi/tests: Write-strings warnings fix.

This commit is contained in:
Andrew Talbot 2006-08-11 16:29:02 +01:00 committed by Alexandre Julliard
parent 92725e5299
commit 4aaf1f0b9e
2 changed files with 7 additions and 4 deletions

View File

@ -316,7 +316,7 @@ static int fci_delete(char *pszFile, int *err, void *pv)
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 @@ static void create_cab_file(const CHAR *name)
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 @@ static void create_cab_file(const CHAR *name)
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");

View File

@ -1765,6 +1765,7 @@ static void test_getproperty(void)
{
MSIHANDLE hPackage = 0;
char prop[100];
static CHAR empty[] = "";
DWORD size;
UINT r;
@ -1783,7 +1784,7 @@ static void test_getproperty(void)
/* 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);