ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi/tests: Use BOOL type where appropriate.

This commit is contained in:
Frédéric Delanoy 2013-10-28 22:18:03 +01:00 committed by Alexandre Julliard
parent 3a41ebfbf2
commit ec1888b7d3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msi/tests/msi.c
View File

@ -13062,7 +13062,7 @@ done:
static void test_MsiEnumComponents(void) static void test_MsiEnumComponents(void)
{ {
UINT r; UINT r;
int found1, found2; BOOL found1, found2;
DWORD index; DWORD index;
char comp1[39], comp2[39], guid[39]; char comp1[39], comp2[39], guid[39];
char comp_squashed1[33], comp_squashed2[33]; char comp_squashed1[33], comp_squashed2[33];
@ -13105,11 +13105,11 @@ static void test_MsiEnumComponents(void)
index = 0; index = 0;
guid[0] = 0; guid[0] = 0;
found1 = found2 = 0; found1 = found2 = FALSE;
while (!MsiEnumComponentsA( index, guid )) while (!MsiEnumComponentsA( index, guid ))
{ {
if (!strcmp( guid, comp1 )) found1 = 1; if (!strcmp( guid, comp1 )) found1 = TRUE;
if (!strcmp( guid, comp2 )) found2 = 1; if (!strcmp( guid, comp2 )) found2 = TRUE;
ok( guid[0], "empty guid\n" ); ok( guid[0], "empty guid\n" );
guid[0] = 0; guid[0] = 0;
index++; index++;
@ -13128,7 +13128,7 @@ done:
static void test_MsiEnumComponentsEx(void) static void test_MsiEnumComponentsEx(void)
{ {
UINT r; UINT r;
int found1, found2; BOOL found1, found2;
DWORD len, index; DWORD len, index;
MSIINSTALLCONTEXT context; MSIINSTALLCONTEXT context;
char comp1[39], comp2[39], guid[39], sid[128]; char comp1[39], comp2[39], guid[39], sid[128];
@ -13181,7 +13181,7 @@ static void test_MsiEnumComponentsEx(void)
context = 0xdeadbeef; context = 0xdeadbeef;
sid[0] = 0; sid[0] = 0;
len = sizeof(sid); len = sizeof(sid);
found1 = found2 = 0; found1 = found2 = FALSE;
while (!pMsiEnumComponentsExA( "S-1-1-0", MSIINSTALLCONTEXT_ALL, index, guid, &context, sid, &len )) while (!pMsiEnumComponentsExA( "S-1-1-0", MSIINSTALLCONTEXT_ALL, index, guid, &context, sid, &len ))
{ {
if (!strcmp( comp1, guid )) if (!strcmp( comp1, guid ))
@ -13189,14 +13189,14 @@ static void test_MsiEnumComponentsEx(void)
ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context ); ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context );
ok( !sid[0], "got \"%s\"\n", sid ); ok( !sid[0], "got \"%s\"\n", sid );
ok( !len, "unexpected length %u\n", len ); ok( !len, "unexpected length %u\n", len );
found1 = 1; found1 = TRUE;
} }
if (!strcmp( comp2, guid )) if (!strcmp( comp2, guid ))
{ {
ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context ); ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context );
ok( sid[0], "empty sid\n" ); ok( sid[0], "empty sid\n" );
ok( len == strlen(sid), "unexpected length %u\n", len ); ok( len == strlen(sid), "unexpected length %u\n", len );
found2 = 1; found2 = TRUE;
} }
index++; index++;
guid[0] = 0; guid[0] = 0;

2
dlls/msi/tests/record.c
View File

@ -41,7 +41,7 @@ static BOOL create_temp_file(char *name)
handle = CreateFileA(name, GENERIC_READ|GENERIC_WRITE, handle = CreateFileA(name, GENERIC_READ|GENERIC_WRITE,
0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if(handle==INVALID_HANDLE_VALUE) if(handle==INVALID_HANDLE_VALUE)
return 0; return FALSE;
for(i=0; i<26; i++) for(i=0; i<26; i++)
buffer[i]=i+'a'; buffer[i]=i+'a';
r = WriteFile(handle,buffer,sizeof buffer,&sz,NULL); r = WriteFile(handle,buffer,sizeof buffer,&sz,NULL);