diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/testdatabase.c | 94 | ||||
-rw-r--r-- | tests/testdatabase.ok | 12 | ||||
-rw-r--r-- | tests/testrecord.c | 16 | ||||
-rw-r--r-- | tests/testrecord.ok | 14 |
4 files changed, 68 insertions, 68 deletions
diff --git a/tests/testdatabase.c b/tests/testdatabase.c index fca4bd7..3794636 100644 --- a/tests/testdatabase.c +++ b/tests/testdatabase.c @@ -137,10 +137,10 @@ static void test_msidatabase(void) ok( res == ERROR_SUCCESS , "Failed to close database\n" ); res = DeleteFile( msifile2 ); - ok( res == TRUE, "Failed to delete database\n" ); + ok( res == true, "Failed to delete database\n" ); res = DeleteFile( msifile ); - ok( res == TRUE, "Failed to delete database\n" ); + ok( res == true, "Failed to delete database\n" ); } static unsigned do_query(MSIOBJECT *hdb, const char *query, MSIOBJECT **phrec) @@ -367,7 +367,7 @@ static void test_msiinsert(void) ok(r == 3, "record count wrong\n"); r = MsiRecordIsNull(hrec, 0); - ok(r == FALSE, "field 0 not null\n"); + ok(r == false, "field 0 not null\n"); r = MsiRecordGetInteger(hrec, 1); ok(r == 1, "field 1 contents wrong\n"); @@ -452,7 +452,7 @@ static void test_msiinsert(void) ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); r = DeleteFile(msifile); - ok(r == TRUE, "file didn't exist after commit\n"); + ok(r == true, "file didn't exist after commit\n"); } static unsigned try_query_param( MSIOBJECT *hdb, const char *szQuery, MSIOBJECT *hrec ) @@ -715,7 +715,7 @@ static void test_msibadqueries(void) ok(r == ERROR_SUCCESS , "Failed to close database transact\n"); r = DeleteFile( msifile ); - ok(r == TRUE, "file didn't exist after commit\n"); + ok(r == true, "file didn't exist after commit\n"); } static void test_viewmodify(void) @@ -1203,7 +1203,7 @@ static unsigned get_columns_table_type(MSIOBJECT *hdb, const char *table, unsign return type; } -static BOOL check_record( MSIOBJECT *rec, unsigned field, const char *val ) +static bool check_record( MSIOBJECT *rec, unsigned field, const char *val ) { char buffer[0x20]; unsigned r; @@ -3233,7 +3233,7 @@ static void test_join(void) char buf[MAX_PATH]; unsigned r, count; unsigned size, i; - BOOL data_correct; + bool data_correct; hdb = create_db(); ok( hdb, "failed to create db\n"); @@ -3415,7 +3415,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3425,13 +3425,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_second[i].one )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_second[i].two )) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -3456,7 +3456,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3466,13 +3466,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_third[i].one ) ) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_third[i].two ) ) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -3497,7 +3497,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3507,13 +3507,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_fourth[i].one )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_fourth[i].two )) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -3538,7 +3538,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3548,13 +3548,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_fifth[i].one )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_fifth[i].two )) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -3578,7 +3578,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3588,13 +3588,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_sixth[i].one )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_sixth[i].two )) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -3619,7 +3619,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3629,13 +3629,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_seventh[i].one )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_seventh[i].two )) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -3657,7 +3657,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3667,13 +3667,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_eighth[i].one )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_eighth[i].four )) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -3694,7 +3694,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3704,25 +3704,25 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_eighth[i].one )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_eighth[i].two )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 3, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_eighth[i].three )) - data_correct = FALSE; + data_correct = false; size = MAX_PATH; r = MsiRecordGetString( hrec, 4, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); if( lstrcmp( buf, join_res_eighth[i].four )) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -3743,7 +3743,7 @@ static void test_join(void) ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); i = 0; - data_correct = TRUE; + data_correct = true; while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) { count = MsiRecordGetFieldCount( hrec ); @@ -3751,27 +3751,27 @@ static void test_join(void) r = MsiRecordGetInteger( hrec, 1 ); if( r != join_res_ninth[i].one ) - data_correct = FALSE; + data_correct = false; r = MsiRecordGetInteger( hrec, 2 ); if( r != join_res_ninth[i].two ) - data_correct = FALSE; + data_correct = false; r = MsiRecordGetInteger( hrec, 3 ); if( r != join_res_ninth[i].three ) - data_correct = FALSE; + data_correct = false; r = MsiRecordGetInteger( hrec, 4 ); if( r != join_res_ninth[i].four ) - data_correct = FALSE; + data_correct = false; r = MsiRecordGetInteger( hrec, 5 ); if( r != join_res_ninth[i].five ) - data_correct = FALSE; + data_correct = false; r = MsiRecordGetInteger( hrec, 6); if( r != join_res_ninth[i].six ) - data_correct = FALSE; + data_correct = false; i++; MsiCloseHandle(hrec); @@ -4298,7 +4298,7 @@ static void test_integers(void) ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); r = DeleteFile(msifile); - ok(r == TRUE, "file didn't exist after commit\n"); + ok(r == true, "file didn't exist after commit\n"); } static void test_update(void) @@ -5373,7 +5373,7 @@ static void test_viewmodify_update(void) r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); - while (TRUE) + while (true) { r = MsiViewFetch(hview, &hrec); if (r != ERROR_SUCCESS) @@ -6057,7 +6057,7 @@ static void enum_stream_names(IStorage *stg) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); n = 0; - while(TRUE) + while(true) { count = 0; hr = IEnumSTATSTG_Next(stgenum, 1, &stat, &count); @@ -7345,20 +7345,20 @@ static void test_where_viewmodify(void) MsiCloseHandle(hdb); } -static BOOL create_storage(const char *name) +static bool create_storage(const char *name) { WCHAR nameW[MAX_PATH]; IStorage *stg; IStream *stm; HRESULT hr; unsigned count; - BOOL res = FALSE; + bool res = false; MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, MAX_PATH); hr = StgCreateDocfile(nameW, STGM_CREATE | STGM_READWRITE | STGM_DIRECT | STGM_SHARE_EXCLUSIVE, 0, &stg); if (FAILED(hr)) - return FALSE; + return false; hr = IStorage_CreateStream(stg, nameW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); @@ -7367,7 +7367,7 @@ static BOOL create_storage(const char *name) hr = IStream_Write(stm, "stgdata", 8, &count); if (SUCCEEDED(hr)) - res = TRUE; + res = true; done: IStream_Release(stm); diff --git a/tests/testdatabase.ok b/tests/testdatabase.ok index 819f76d..0dc7e57 100644 --- a/tests/testdatabase.ok +++ b/tests/testdatabase.ok @@ -32,8 +32,8 @@ ok: res == ERROR_SUCCESS ok: res == ERROR_SUCCESS
ok: INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile )
ok: res == ERROR_SUCCESS
-ok: res == TRUE
-ok: res == TRUE
+ok: res == true
+ok: res == true
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
@@ -54,7 +54,7 @@ ok: r == ERROR_SUCCESS ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
ok: r == 3
-ok: r == FALSE
+ok: r == false
ok: r == 1
ok: r == ERROR_SUCCESS
ok: !strcmp(buf,"Abe")
@@ -80,7 +80,7 @@ ok: r == ERROR_SUCCESS ok: r == ERROR_INVALID_PARAMETER
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
-ok: r == TRUE
+ok: r == true
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
@@ -144,7 +144,7 @@ ok: r == ERROR_SUCCESS ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
-ok: r == TRUE
+ok: r == true
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
@@ -992,7 +992,7 @@ ok: i == 7 ok: i == 8
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
-ok: r == TRUE
+ok: r == true
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
diff --git a/tests/testrecord.c b/tests/testrecord.c index 2fbe469..d1f95d6 100644 --- a/tests/testrecord.c +++ b/tests/testrecord.c @@ -25,7 +25,7 @@ static const char *msifile = "winetest-record.msi"; -static BOOL create_temp_file(char *name) +static bool create_temp_file(char *name) { unsigned r; unsigned char buffer[26], i; @@ -125,7 +125,7 @@ static void test_msirecord(void) r = MsiRecordSetString(h, 0, NULL); ok(r == ERROR_SUCCESS, "Failed to set null string at 0\n"); r = MsiRecordIsNull(h, 0); - ok(r == TRUE, "null string not null field\n"); + ok(r == true, "null string not null field\n"); r = MsiRecordDataSize(h, 0); ok(r == 0, "size of string record is strlen\n"); buf[0] = 0; @@ -143,7 +143,7 @@ static void test_msirecord(void) r = MsiRecordSetString(h, 0, ""); ok(r == ERROR_SUCCESS, "Failed to set empty string at 0\n"); r = MsiRecordIsNull(h, 0); - ok(r == TRUE, "null string not null field\n"); + ok(r == true, "null string not null field\n"); r = MsiRecordDataSize(h, 0); ok(r == 0, "size of string record is strlen\n"); buf[0] = 0; @@ -497,7 +497,7 @@ static void test_fieldzero(void) ok(sz == 0, "Expectd 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); - ok(r == TRUE, "Expected TRUE, got %d\n", r); + ok(r == true, "Expected true, got %d\n", r); r = MsiRecordGetInteger(rec, 1); ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r); @@ -516,7 +516,7 @@ static void test_fieldzero(void) ok(sz == 0, "Expectd 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); - ok(r == TRUE, "Expected TRUE, got %d\n", r); + ok(r == true, "Expected true, got %d\n", r); r = MsiRecordGetInteger(rec, 1); ok(r == 42, "Expected 42, got %d\n", r); @@ -535,7 +535,7 @@ static void test_fieldzero(void) ok(sz == 0, "Expectd 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); - ok(r == TRUE, "Expected TRUE, got %d\n", r); + ok(r == true, "Expected true, got %d\n", r); sz = MAX_PATH; lstrcpyA(buf, "apple"); @@ -587,7 +587,7 @@ static void test_fieldzero(void) ok(sz == 5, "Expectd 5, got %d\n", sz); r = MsiRecordIsNull(rec, 0); - ok(r == FALSE, "Expected FALSE, got %d\n", r); + ok(r == false, "Expected false, got %d\n", r); MsiCloseHandle(rec); @@ -606,7 +606,7 @@ static void test_fieldzero(void) ok(r != MSI_NULL_INTEGER && r != 0, "Expected non-NULL value, got %d\n", r); r = MsiRecordIsNull(rec, 0); - ok(r == FALSE, "Expected FALSE, got %d\n", r); + ok(r == false, "Expected false, got %d\n", r); r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); diff --git a/tests/testrecord.ok b/tests/testrecord.ok index 70b6b8b..99f4b4e 100644 --- a/tests/testrecord.ok +++ b/tests/testrecord.ok @@ -27,7 +27,7 @@ ok: r == ERROR_INVALID_PARAMETER ok: r==0
ok: r == 1
ok: r == ERROR_SUCCESS
-ok: r == TRUE
+ok: r == true
ok: r == 0
ok: r == ERROR_SUCCESS
ok: buf[0] == 0
@@ -36,7 +36,7 @@ ok: r == ERROR_SUCCESS ok: bufW[0] == 0
ok: sz == 0
ok: r == ERROR_SUCCESS
-ok: r == TRUE
+ok: r == true
ok: r == 0
ok: r == ERROR_SUCCESS
ok: buf[0] == 0
@@ -172,21 +172,21 @@ ok: r == MSI_NULL_INTEGER ok: r == ERROR_SUCCESS
ok: !lstrcmpA(buf, "")
ok: sz == 0
-ok: r == TRUE
+ok: r == true
ok: r == MSI_NULL_INTEGER
ok: r == ERROR_SUCCESS
ok: r == MSI_NULL_INTEGER
ok: r == ERROR_SUCCESS
ok: !lstrcmpA(buf, "")
ok: sz == 0
-ok: r == TRUE
+ok: r == true
ok: r == 42
ok: r == ERROR_SUCCESS
ok: r == MSI_NULL_INTEGER
ok: r == ERROR_SUCCESS
ok: !lstrcmpA(buf, "")
ok: sz == 0
-ok: r == TRUE
+ok: r == true
ok: r == ERROR_SUCCESS
ok: !lstrcmpA(buf, "bologna")
ok: sz == 7
@@ -204,11 +204,11 @@ ok: r == MSI_NULL_INTEGER ok: r == ERROR_SUCCESS
ok: !lstrcmpA(buf, "drone")
ok: sz == 5
-ok: r == FALSE
+ok: r == false
ok: r == ERROR_INVALID_TABLE
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
ok: r == ERROR_SUCCESS
ok: r != MSI_NULL_INTEGER && r != 0
-ok: r == FALSE
+ok: r == false
ok: r == ERROR_SUCCESS
|