Add trailing '\n's to ok() calls.

This commit is contained in:
Francois Gouget 2005-04-19 09:48:44 +00:00 committed by Alexandre Julliard
parent e8ec9d5fe6
commit 3b36eee083
4 changed files with 18 additions and 18 deletions

View File

@ -38,10 +38,10 @@ MSIHANDLE helper_createpackage()
/* create an empty database */ /* create an empty database */
res = MsiOpenDatabase(szName, MSIDBOPEN_CREATE, &hdb ); res = MsiOpenDatabase(szName, MSIDBOPEN_CREATE, &hdb );
ok( res == ERROR_SUCCESS , "Failed to create database" ); ok( res == ERROR_SUCCESS , "Failed to create database\n" );
res = MsiDatabaseCommit( hdb ); res = MsiDatabaseCommit( hdb );
ok( res == ERROR_SUCCESS , "Failed to commit database" ); ok( res == ERROR_SUCCESS , "Failed to commit database\n" );
/* build summmary info */ /* build summmary info */
res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo);
@ -77,14 +77,14 @@ MSIHANDLE helper_createpackage()
ok( res == ERROR_SUCCESS , "Failed to make summary info persist\n" ); ok( res == ERROR_SUCCESS , "Failed to make summary info persist\n" );
res = MsiCloseHandle( suminfo); res = MsiCloseHandle( suminfo);
ok( res == ERROR_SUCCESS , "Failed to close suminfo" ); ok( res == ERROR_SUCCESS , "Failed to close suminfo\n" );
sprintf(szPackage,"#%li",(DWORD)hdb); sprintf(szPackage,"#%li",(DWORD)hdb);
res = MsiOpenPackage(szPackage,&hPackage); res = MsiOpenPackage(szPackage,&hPackage);
ok( res == ERROR_SUCCESS , "Failed to open package\n" ); ok( res == ERROR_SUCCESS , "Failed to open package\n" );
res = MsiCloseHandle( hdb ); res = MsiCloseHandle( hdb );
ok( res == ERROR_SUCCESS , "Failed to close database" ); ok( res == ERROR_SUCCESS , "Failed to close database\n" );
return hPackage; return hPackage;
} }
@ -98,7 +98,7 @@ static void test_createpackage(void)
ok ( hPackage != 0, " Failed to create package\n"); ok ( hPackage != 0, " Failed to create package\n");
res = MsiCloseHandle( hPackage); res = MsiCloseHandle( hPackage);
ok( res == ERROR_SUCCESS , "Failed to close package" ); ok( res == ERROR_SUCCESS , "Failed to close package\n" );
} }
static void test_msidatabase(void) static void test_msidatabase(void)
@ -111,13 +111,13 @@ static void test_msidatabase(void)
/* create an empty database */ /* create an empty database */
res = MsiOpenDatabase(szName, MSIDBOPEN_CREATE, &hdb ); res = MsiOpenDatabase(szName, MSIDBOPEN_CREATE, &hdb );
ok( res == ERROR_SUCCESS , "Failed to create database" ); ok( res == ERROR_SUCCESS , "Failed to create database\n" );
res = MsiDatabaseCommit( hdb ); res = MsiDatabaseCommit( hdb );
ok( res == ERROR_SUCCESS , "Failed to commit database" ); ok( res == ERROR_SUCCESS , "Failed to commit database\n" );
res = MsiCloseHandle( hdb ); res = MsiCloseHandle( hdb );
ok( res == ERROR_SUCCESS , "Failed to close database" ); ok( res == ERROR_SUCCESS , "Failed to close database\n" );
res = DeleteFile( szName ); res = DeleteFile( szName );
ok( res == TRUE, "Falled to delete database\n" ); ok( res == TRUE, "Falled to delete database\n" );
@ -396,7 +396,7 @@ void test_msibadqueries()
ok(r == ERROR_SUCCESS , "query 4 failed\n"); ok(r == ERROR_SUCCESS , "query 4 failed\n");
r = MsiDatabaseCommit( hdb ); r = MsiDatabaseCommit( hdb );
ok(r == ERROR_SUCCESS , "Failed to commit database after write"); ok(r == ERROR_SUCCESS , "Failed to commit database after write\n");
r = try_query( hdb, "CREATE TABLE `blah` (`foo` CHAR(72) NOT NULL " r = try_query( hdb, "CREATE TABLE `blah` (`foo` CHAR(72) NOT NULL "
"PRIMARY KEY `foo`)"); "PRIMARY KEY `foo`)");
@ -406,7 +406,7 @@ void test_msibadqueries()
ok(r == ERROR_SUCCESS , "failed to insert record in db\n"); ok(r == ERROR_SUCCESS , "failed to insert record in db\n");
r = MsiDatabaseCommit( hdb ); r = MsiDatabaseCommit( hdb );
ok(r == ERROR_SUCCESS , "Failed to commit database after write"); ok(r == ERROR_SUCCESS , "Failed to commit database after write\n");
r = try_query( hdb, "CREATE TABLE `boo` (`foo` CHAR(72) NOT NULL " r = try_query( hdb, "CREATE TABLE `boo` (`foo` CHAR(72) NOT NULL "
"PRIMARY KEY `ba`)"); "PRIMARY KEY `ba`)");

View File

@ -246,26 +246,26 @@ void test_msirecord(void)
sz = sizeof buf; sz = sizeof buf;
r = MsiRecordReadStream(h, 1, NULL, &sz); r = MsiRecordReadStream(h, 1, NULL, &sz);
ok(r == ERROR_SUCCESS, "failed to read stream\n"); ok(r == ERROR_SUCCESS, "failed to read stream\n");
ok(sz==26,"couldn't get size of stream"); ok(sz==26,"couldn't get size of stream\n");
sz = 0; sz = 0;
r = MsiRecordReadStream(h, 1, buf, &sz); r = MsiRecordReadStream(h, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "failed to read stream\n"); ok(r == ERROR_SUCCESS, "failed to read stream\n");
ok(sz==0,"short read"); ok(sz==0,"short read\n");
sz = sizeof buf; sz = sizeof buf;
r = MsiRecordReadStream(h, 1, buf, &sz); r = MsiRecordReadStream(h, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "failed to read stream\n"); ok(r == ERROR_SUCCESS, "failed to read stream\n");
ok(sz==sizeof buf,"short read"); ok(sz==sizeof buf,"short read\n");
ok(!strncmp(buf,"abcdefghij",10), "read the wrong thing\n"); ok(!strncmp(buf,"abcdefghij",10), "read the wrong thing\n");
sz = sizeof buf; sz = sizeof buf;
r = MsiRecordReadStream(h, 1, buf, &sz); r = MsiRecordReadStream(h, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "failed to read stream\n"); ok(r == ERROR_SUCCESS, "failed to read stream\n");
ok(sz==sizeof buf,"short read"); ok(sz==sizeof buf,"short read\n");
ok(!strncmp(buf,"klmnopqrst",10), "read the wrong thing\n"); ok(!strncmp(buf,"klmnopqrst",10), "read the wrong thing\n");
memset(buf,0,sizeof buf); memset(buf,0,sizeof buf);
sz = sizeof buf; sz = sizeof buf;
r = MsiRecordReadStream(h, 1, buf, &sz); r = MsiRecordReadStream(h, 1, buf, &sz);
ok(r == ERROR_SUCCESS, "failed to read stream\n"); ok(r == ERROR_SUCCESS, "failed to read stream\n");
ok(sz==6,"short read"); ok(sz==6,"short read\n");
ok(!strcmp(buf,"uvwxyz"), "read the wrong thing\n"); ok(!strcmp(buf,"uvwxyz"), "read the wrong thing\n");
memset(buf,0,sizeof buf); memset(buf,0,sizeof buf);
sz = sizeof buf; sz = sizeof buf;

View File

@ -52,7 +52,7 @@ static LPITEMIDLIST path_to_pidl(const char* path)
HMODULE hdll=LoadLibraryA("shell32.dll"); HMODULE hdll=LoadLibraryA("shell32.dll");
pSHSimpleIDListFromPathA=(void*)GetProcAddress(hdll, (char*)162); pSHSimpleIDListFromPathA=(void*)GetProcAddress(hdll, (char*)162);
if (!pSHSimpleIDListFromPathA) if (!pSHSimpleIDListFromPathA)
trace("SHSimpleIDListFromPathA not found in shell32.dll"); trace("SHSimpleIDListFromPathA not found in shell32.dll\n");
} }
pidl=NULL; pidl=NULL;
@ -528,7 +528,7 @@ START_TEST(shelllink)
HRESULT r; HRESULT r;
r = CoInitialize(NULL); r = CoInitialize(NULL);
ok(SUCCEEDED(r), "CoInitialize failed (0x%08lx)\b", r); ok(SUCCEEDED(r), "CoInitialize failed (0x%08lx)\n", r);
if (!SUCCEEDED(r)) if (!SUCCEEDED(r))
return; return;

View File

@ -5245,7 +5245,7 @@ static void test_winevents(void)
ok_sequence(WmGlobalHookSeq_2, "global hook 2", FALSE); ok_sequence(WmGlobalHookSeq_2, "global hook 2", FALSE);
ret = UnhookWindowsHookEx(hCBT_global_hook); ret = UnhookWindowsHookEx(hCBT_global_hook);
ok( ret, "UnhookWindowsHookEx error %ld", GetLastError()); ok( ret, "UnhookWindowsHookEx error %ld\n", GetLastError());
PostThreadMessageA(tid, WM_QUIT, 0, 0); PostThreadMessageA(tid, WM_QUIT, 0, 0);
ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");