Add trailing '\n's to ok() calls (kernel 10)
Francois Gouget
fgouget at free.fr
Thu Feb 5 08:15:36 CST 2004
Changelog:
* dlls/kernel/tests/locale.c
dlls/kernel/tests/mailslot.c
Add trailing '\n's to ok() calls.
Index: dlls/kernel/tests/locale.c
===================================================================
RCS file: /home/cvs/wine/dlls/kernel/tests/locale.c,v
retrieving revision 1.25
diff -u -r1.25 locale.c
--- dlls/kernel/tests/locale.c 6 Jan 2004 22:08:34 -0000 1.25
+++ dlls/kernel/tests/locale.c 5 Feb 2004 11:10:20 -0000
@@ -118,7 +118,7 @@
#define STRINGSA(x,y) strcpy(input, x); strcpy(Expected, y); SetLastError(0); buffer[0] = '\0'
#define EXPECT_LENA EXPECT_LEN((int)strlen(Expected)+1)
#define EXPECT_EQA ok(strncmp(buffer, Expected, strlen(Expected)) == 0, \
- "Expected '%s', got '%s'", Expected, buffer)
+ "Expected '%s', got '%s'\n", Expected, buffer)
#define STRINGSW(x,y) MultiByteToWideChar(CP_ACP,0,x,-1,input,COUNTOF(input)); \
MultiByteToWideChar(CP_ACP,0,y,-1,Expected,COUNTOF(Expected)); \
@@ -791,141 +791,141 @@
ok(!ret, "CompareStringA must fail with invalid flag\n");
ret = lstrcmpA("", "");
- ok (!ret, "lstrcmpA(\"\", \"\") should return 0, got %d", ret);
+ ok (!ret, "lstrcmpA(\"\", \"\") should return 0, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT,0,"EndDialog",-1,"_Property",-1);
- ok( ret == 3, "EndDialog vs _Property ... expected 3, got %d", ret);
+ ok( ret == 3, "EndDialog vs _Property ... expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT,0,"osp_vba.sreg0070",-1,"_IEWWBrowserComp",-1);
- ok( ret == 3, "osp_vba.sreg0070 vs _IEWWBrowserComp ... expected 3, got %d", ret);
+ ok( ret == 3, "osp_vba.sreg0070 vs _IEWWBrowserComp ... expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT,0,"r",-1,"\\",-1);
- ok( ret == 3, "r vs \\ ... expected 3, got %d", ret);
+ ok( ret == 3, "r vs \\ ... expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT,0,"osp_vba.sreg0031", -1, "OriginalDatabase", -1 );
- ok( ret == 3, "osp_vba.sreg0031 vs OriginalDatabase ... expected 3, got %d", ret);
+ ok( ret == 3, "osp_vba.sreg0031 vs OriginalDatabase ... expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "aaa", -1 );
- ok( ret == 3, "AAA vs aaa expected 3, got %d", ret);
+ ok( ret == 3, "AAA vs aaa expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "aab", -1 );
- ok( ret == 1, "AAA vs aab expected 1, got %d", ret);
+ ok( ret == 1, "AAA vs aab expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "Aab", -1 );
- ok( ret == 1, "AAA vs Aab expected 1, got %d", ret);
+ ok( ret == 1, "AAA vs Aab expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, ".AAA", -1, "Aab", -1 );
- ok( ret == 1, ".AAA vs Aab expected 1, got %d", ret);
+ ok( ret == 1, ".AAA vs Aab expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, ".AAA", -1, "A.ab", -1 );
- ok( ret == 1, ".AAA vs A.ab expected 1, got %d", ret);
+ ok( ret == 1, ".AAA vs A.ab expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "aa", -1, "AB", -1 );
- ok( ret == 1, "aa vs AB expected 1, got %d", ret);
+ ok( ret == 1, "aa vs AB expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "aa", -1, "Aab", -1 );
- ok( ret == 1, "aa vs Aab expected 1, got %d", ret);
+ ok( ret == 1, "aa vs Aab expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "aB", -1, "Aab", -1 );
- ok( ret == 3, "aB vs Aab expected 3, got %d", ret);
+ ok( ret == 3, "aB vs Aab expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "Ba", -1, "bab", -1 );
- ok( ret == 1, "Ba vs bab expected 1, got %d", ret);
+ ok( ret == 1, "Ba vs bab expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "{100}{83}{71}{71}{71}", -1, "Global_DataAccess_JRO", -1 );
- ok( ret == 1, "{100}{83}{71}{71}{71} vs Global_DataAccess_JRO expected 1, got %d", ret);
+ ok( ret == 1, "{100}{83}{71}{71}{71} vs Global_DataAccess_JRO expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "a", -1, "{", -1 );
- ok( ret == 3, "a vs { expected 3, got %d", ret);
+ ok( ret == 3, "a vs { expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "A", -1, "{", -1 );
- ok( ret == 3, "A vs { expected 3, got %d", ret);
+ ok( ret == 3, "A vs { expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "3.5", 0, "4.0", -1 );
- ok(ret == 1, "3.5/0 vs 4.0/-1 expected 1, got %d", ret);
+ ok(ret == 1, "3.5/0 vs 4.0/-1 expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "3.5", -1, "4.0", -1 );
- ok(ret == 1, "3.5 vs 4.0 expected 1, got %d", ret);
+ ok(ret == 1, "3.5 vs 4.0 expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "3.520.4403.2", -1, "4.0.2927.10", -1 );
- ok(ret == 1, "3.520.4403.2 vs 4.0.2927.10 expected 1, got %d", ret);
+ ok(ret == 1, "3.520.4403.2 vs 4.0.2927.10 expected 1, got %d\n", ret);
/* hyphen and apostrophe are treated differently depending on
* whether SORT_STRINGSORT specified or not
*/
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "-o", -1, "/m", -1 );
- ok(ret == 3, "-o vs /m expected 3, got %d", ret);
+ ok(ret == 3, "-o vs /m expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "/m", -1, "-o", -1 );
- ok(ret == 1, "/m vs -o expected 1, got %d", ret);
+ ok(ret == 1, "/m vs -o expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "-o", -1, "/m", -1 );
- ok(ret == 1, "-o vs /m expected 1, got %d", ret);
+ ok(ret == 1, "-o vs /m expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "-o", -1 );
- ok(ret == 3, "/m vs -o expected 3, got %d", ret);
+ ok(ret == 3, "/m vs -o expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "/m", -1 );
- ok(ret == 3, "'o vs /m expected 3, got %d", ret);
+ ok(ret == 3, "'o vs /m expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "/m", -1, "'o", -1 );
- ok(ret == 1, "/m vs 'o expected 1, got %d", ret);
+ ok(ret == 1, "/m vs 'o expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "/m", -1 );
- ok(ret == 1, "'o vs /m expected 1, got %d", ret);
+ ok(ret == 1, "'o vs /m expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "'o", -1 );
- ok(ret == 3, "/m vs 'o expected 3, got %d", ret);
+ ok(ret == 3, "/m vs 'o expected 3, got %d\n", ret);
#if 0 /* this requires collation table patch to make it MS compatible */
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "-o", -1 );
- ok(ret == 1, "'o vs -o expected 1, got %d", ret);
+ ok(ret == 1, "'o vs -o expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "-o", -1 );
- ok(ret == 1, "'o vs -o expected 1, got %d", ret);
+ ok(ret == 1, "'o vs -o expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'", -1, "-", -1 );
- ok(ret == 1, "' vs - expected 1, got %d", ret);
+ ok(ret == 1, "' vs - expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'", -1, "-", -1 );
- ok(ret == 1, "' vs - expected 1, got %d", ret);
+ ok(ret == 1, "' vs - expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "`o", -1, "/m", -1 );
- ok(ret == 3, "`o vs /m expected 3, got %d", ret);
+ ok(ret == 3, "`o vs /m expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "/m", -1, "`o", -1 );
- ok(ret == 1, "/m vs `o expected 1, got %d", ret);
+ ok(ret == 1, "/m vs `o expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "`o", -1, "/m", -1 );
- ok(ret == 3, "`o vs /m expected 3, got %d", ret);
+ ok(ret == 3, "`o vs /m expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "`o", -1 );
- ok(ret == 1, "/m vs `o expected 1, got %d", ret);
+ ok(ret == 1, "/m vs `o expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "`o", -1, "-m", -1 );
- ok(ret == 1, "`o vs -m expected 1, got %d", ret);
+ ok(ret == 1, "`o vs -m expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "-m", -1, "`o", -1 );
- ok(ret == 3, "-m vs `o expected 3, got %d", ret);
+ ok(ret == 3, "-m vs `o expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "`o", -1, "-m", -1 );
- ok(ret == 3, "`o vs -m expected 3, got %d", ret);
+ ok(ret == 3, "`o vs -m expected 3, got %d\n", ret);
ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "-m", -1, "`o", -1 );
- ok(ret == 1, "-m vs `o expected 1, got %d", ret);
+ ok(ret == 1, "-m vs `o expected 1, got %d\n", ret);
#endif
ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ", 9);
- ok(ret == 2, "aLuZkUtZ vs aLuZkUtZ\\0 expected 2, got %d", ret);
+ ok(ret == 2, "aLuZkUtZ vs aLuZkUtZ\\0 expected 2, got %d\n", ret);
ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10);
- ok(ret == 1, "aLuZkUtZ vs aLuZkUtZ\\0A expected 1, got %d", ret);
+ ok(ret == 1, "aLuZkUtZ vs aLuZkUtZ\\0A expected 1, got %d\n", ret);
ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ\0A", 10);
- ok(ret == 2, "aLuZkUtZ vs aLuZkUtZ\\0A expected 2, got %d", ret);
+ ok(ret == 2, "aLuZkUtZ vs aLuZkUtZ\\0A expected 2, got %d\n", ret);
ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLu\0ZkUtZ", 8, "aLu\0ZkUtZ\0A", 10);
- ok(ret == 2, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected 2, got %d", ret);
+ ok(ret == 2, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected 2, got %d\n", ret);
}
void test_LCMapStringA(void)
@@ -1085,7 +1085,7 @@
/* test srclen = 0 */
SetLastError(0xdeadbeef);
ret = LCMapStringA(LOCALE_USER_DEFAULT, 0, upper_case, 0, buf, sizeof(buf));
- ok(!ret, "LCMapStringA should fail with srclen = 0");
+ ok(!ret, "LCMapStringA should fail with srclen = 0\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER,
"unexpected error code %ld\n", GetLastError());
}
@@ -1244,7 +1244,7 @@
/* test srclen = 0 */
SetLastError(0xdeadbeef);
ret = LCMapStringW(LOCALE_USER_DEFAULT, 0, upper_case, 0, buf, sizeof(buf));
- ok(!ret, "LCMapStringW should fail with srclen = 0");
+ ok(!ret, "LCMapStringW should fail with srclen = 0\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER,
"unexpected error code %ld\n", GetLastError());
}
@@ -1841,7 +1841,7 @@
ret = pFoldStringW(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);
EXPECT_LEN(sizeof(ligatures_dst)/sizeof(ligatures_dst[0])); EXPECT_VALID;
ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)),
- "MAP_EXPAND_LIGATURES: Expanded incorrrectly\n");
+ "MAP_EXPAND_LIGATURES: Expanded incorrectly\n");
for (i = 1; i <= 0xffff; i++)
{
if (!strchrW(ligatures_src, i))
Index: dlls/kernel/tests/mailslot.c
===================================================================
RCS file: /home/cvs/wine/dlls/kernel/tests/mailslot.c,v
retrieving revision 1.1
diff -u -r1.1 mailslot.c
--- dlls/kernel/tests/mailslot.c 30 Oct 2003 23:24:12 -0000 1.1
+++ dlls/kernel/tests/mailslot.c 5 Feb 2004 11:13:39 -0000
@@ -46,81 +46,81 @@
/* sanity check on GetMailslotInfo */
dwMax = dwNext = dwMsgCount = dwTimeout = 0;
ok( !GetMailslotInfo( INVALID_HANDLE_VALUE, &dwMax, &dwNext,
- &dwMsgCount, &dwTimeout ), "getmailslotinfo succeeded");
+ &dwMsgCount, &dwTimeout ), "getmailslotinfo succeeded\n");
/* open a mailslot that doesn't exist */
hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter == INVALID_HANDLE_VALUE, "non-existing mailslot");
+ ok( hWriter == INVALID_HANDLE_VALUE, "non-existing mailslot\n");
/* open a mailslot without the right name */
hSlot = CreateMailslot( "blah", 0, 0, NULL );
ok( hSlot == INVALID_HANDLE_VALUE,
- "Created mailslot with invalid name");
+ "Created mailslot with invalid name\n");
todo_wine
{
ok( GetLastError() == ERROR_INVALID_NAME,
- "error should be ERROR_INVALID_NAME");
+ "error should be ERROR_INVALID_NAME\n");
}
/* open a mailslot with a null name */
hSlot = CreateMailslot( NULL, 0, 0, NULL );
ok( hSlot == INVALID_HANDLE_VALUE,
- "Created mailslot with invalid name");
+ "Created mailslot with invalid name\n");
todo_wine
{
ok( GetLastError() == ERROR_PATH_NOT_FOUND,
- "error should be ERROR_PATH_NOT_FOUND");
+ "error should be ERROR_PATH_NOT_FOUND\n");
}
todo_wine
{
/* valid open, but with wacky parameters ... then check them */
hSlot = CreateMailslot( szmspath, -1, -1, NULL );
- ok( hSlot != INVALID_HANDLE_VALUE , "mailslot with valid name failed");
+ ok( hSlot != INVALID_HANDLE_VALUE , "mailslot with valid name failed\n");
dwMax = dwNext = dwMsgCount = dwTimeout = 0;
ok( GetMailslotInfo( hSlot, &dwMax, &dwNext, &dwMsgCount, &dwTimeout ),
- "getmailslotinfo failed");
- ok( dwMax == -1, "dwMax incorrect");
- ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect");
+ "getmailslotinfo failed\n");
+ ok( dwMax == -1, "dwMax incorrect\n");
+ ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect\n");
}
- ok( dwMsgCount == 0, "dwMsgCount incorrect");
+ ok( dwMsgCount == 0, "dwMsgCount incorrect\n");
todo_wine
{
- ok( dwTimeout == -1, "dwTimeout incorrect");
+ ok( dwTimeout == -1, "dwTimeout incorrect\n");
ok( GetMailslotInfo( hSlot, NULL, NULL, NULL, NULL ),
- "getmailslotinfo failed");
- ok( CloseHandle(hSlot), "failed to close mailslot");
+ "getmailslotinfo failed\n");
+ ok( CloseHandle(hSlot), "failed to close mailslot\n");
}
todo_wine
{
/* now open it for real */
hSlot = CreateMailslot( szmspath, 0, 0, NULL );
- ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed");
+ ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n");
}
/* try and read/write to it */
count = 0;
memset(buffer, 0, sizeof buffer);
ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
- "slot read");
+ "slot read\n");
ok( !WriteFile( hSlot, buffer, sizeof buffer, &count, NULL),
- "slot write");
+ "slot write\n");
/* now try and openthe client, but with the wrong sharing mode */
hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
0, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter == INVALID_HANDLE_VALUE, "bad sharing mode");
+ ok( hWriter == INVALID_HANDLE_VALUE, "bad sharing mode\n");
todo_wine
{
ok( GetLastError() == ERROR_SHARING_VIOLATION,
- "error should be ERROR_SHARING_VIOLATION");
+ "error should be ERROR_SHARING_VIOLATION\n");
/* now open the client with the correct sharing mode */
hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot");
+ ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot\n");
}
/*
@@ -128,23 +128,23 @@
* whether we can read or write the mailslot
*/
ok( !ReadFile( hSlot, buffer, sizeof buffer/2, &count, NULL),
- "slot read");
+ "slot read\n");
ok( !WriteFile( hSlot, buffer, sizeof buffer/2, &count, NULL),
- "slot write");
+ "slot write\n");
/*
* we can't read from this client,
* but we should be able to write to it
*/
ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL),
- "can read client");
+ "can read client\n");
todo_wine
{
ok( WriteFile( hWriter, buffer, sizeof buffer/2, &count, NULL),
- "can't write client");
+ "can't write client\n");
}
ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL),
- "can read client");
+ "can read client\n");
/*
* seeing as there's something in the slot,
@@ -153,37 +153,37 @@
todo_wine
{
ok( ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
- "slot read");
- ok( count == (sizeof buffer/2), "short read" );
+ "slot read\n");
+ ok( count == (sizeof buffer/2), "short read\n" );
}
/* but not again */
ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
- "slot read");
+ "slot read\n");
/* now try open another writer... should fail */
hWriter2 = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter2 == INVALID_HANDLE_VALUE, "two writers");
+ ok( hWriter2 == INVALID_HANDLE_VALUE, "two writers\n");
/* now try open another as a reader ... also fails */
hWriter2 = CreateFile(szmspath, GENERIC_READ,
FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter2 == INVALID_HANDLE_VALUE, "writer + reader");
+ ok( hWriter2 == INVALID_HANDLE_VALUE, "writer + reader\n");
/* now try open another as a writer ... still fails */
hWriter2 = CreateFile(szmspath, GENERIC_WRITE,
FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter2 == INVALID_HANDLE_VALUE, "writer");
+ ok( hWriter2 == INVALID_HANDLE_VALUE, "writer\n");
/* now open another one */
hSlot2 = CreateMailslot( szmspath, 0, 0, NULL );
- ok( hSlot2 == INVALID_HANDLE_VALUE , "opened two mailslots");
+ ok( hSlot2 == INVALID_HANDLE_VALUE , "opened two mailslots\n");
todo_wine
{
/* close the client again */
- ok( CloseHandle( hWriter ), "closing the client");
+ ok( CloseHandle( hWriter ), "closing the client\n");
/*
* now try reopen it with slightly different permissions ...
@@ -191,7 +191,7 @@
*/
hWriter = CreateFile(szmspath, GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter != INVALID_HANDLE_VALUE, "sharing writer");
+ ok( hWriter != INVALID_HANDLE_VALUE, "sharing writer\n");
}
/*
@@ -200,61 +200,61 @@
*/
hWriter2 = CreateFile(szmspath, GENERIC_WRITE,
FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter2 == INVALID_HANDLE_VALUE, "greedy writer succeeded");
+ ok( hWriter2 == INVALID_HANDLE_VALUE, "greedy writer succeeded\n");
todo_wine
{
/* now try open another as a writer ... and share with the first */
hWriter2 = CreateFile(szmspath, GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
- ok( hWriter2 != INVALID_HANDLE_VALUE, "2nd sharing writer");
+ ok( hWriter2 != INVALID_HANDLE_VALUE, "2nd sharing writer\n");
/* check the mailslot info */
dwMax = dwNext = dwMsgCount = dwTimeout = 0;
ok( GetMailslotInfo( hSlot, &dwMax, &dwNext, &dwMsgCount, &dwTimeout ),
- "getmailslotinfo failed");
- ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect");
+ "getmailslotinfo failed\n");
+ ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect\n");
}
- ok( dwMax == 0, "dwMax incorrect");
- ok( dwMsgCount == 0, "dwMsgCount incorrect");
- ok( dwTimeout == 0, "dwTimeout incorrect");
+ ok( dwMax == 0, "dwMax incorrect\n");
+ ok( dwMsgCount == 0, "dwMsgCount incorrect\n");
+ ok( dwTimeout == 0, "dwTimeout incorrect\n");
/* check there's still no data */
- ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read");
+ ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n");
/* write two messages */
todo_wine
{
buffer[0] = 'a';
- ok( WriteFile( hWriter, buffer, 1, &count, NULL), "1st write failed");
+ ok( WriteFile( hWriter, buffer, 1, &count, NULL), "1st write failed\n");
/* check the mailslot info */
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
- "getmailslotinfo failed");
- ok( dwNext == 1, "dwNext incorrect");
- ok( dwMsgCount == 1, "dwMsgCount incorrect");
+ "getmailslotinfo failed\n");
+ ok( dwNext == 1, "dwNext incorrect\n");
+ ok( dwMsgCount == 1, "dwMsgCount incorrect\n");
buffer[0] = 'b';
buffer[1] = 'c';
- ok( WriteFile( hWriter2, buffer, 2, &count, NULL), "2nd write failed");
+ ok( WriteFile( hWriter2, buffer, 2, &count, NULL), "2nd write failed\n");
/* check the mailslot info */
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
- "getmailslotinfo failed");
- ok( dwNext == 1, "dwNext incorrect");
- ok( dwMsgCount == 2, "dwMsgCount incorrect");
+ "getmailslotinfo failed\n");
+ ok( dwNext == 1, "dwNext incorrect\n");
+ ok( dwMsgCount == 2, "dwMsgCount incorrect\n");
/* write a 3rd message with zero size */
- ok( WriteFile( hWriter2, buffer, 0, &count, NULL), "3rd write failed");
+ ok( WriteFile( hWriter2, buffer, 0, &count, NULL), "3rd write failed\n");
/* check the mailslot info */
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
- "getmailslotinfo failed");
- ok( dwNext == 1, "dwNext incorrect");
- ok( dwMsgCount == 3, "dwMsgCount incorrect");
+ "getmailslotinfo failed\n");
+ ok( dwNext == 1, "dwNext incorrect\n");
+ ok( dwMsgCount == 3, "dwMsgCount incorrect\n");
buffer[0]=buffer[1]=0;
@@ -263,38 +263,38 @@
* then the slot is empty
*/
ok( ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
- "1st slot read failed");
- ok( count == 1, "failed to get 1st message");
- ok( buffer[0] == 'a', "1st message wrong");
+ "1st slot read failed\n");
+ ok( count == 1, "failed to get 1st message\n");
+ ok( buffer[0] == 'a', "1st message wrong\n");
/* check the mailslot info */
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
- "getmailslotinfo failed");
- ok( dwNext == 2, "dwNext incorrect");
- ok( dwMsgCount == 2, "dwMsgCount incorrect");
+ "getmailslotinfo failed\n");
+ ok( dwNext == 2, "dwNext incorrect\n");
+ ok( dwMsgCount == 2, "dwMsgCount incorrect\n");
/* read the second message */
ok( ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
- "2nd slot read failed");
- ok( count == 2, "failed to get 2nd message");
- ok( ( buffer[0] == 'b' ) && ( buffer[1] == 'c' ), "2nd message wrong");
+ "2nd slot read failed\n");
+ ok( count == 2, "failed to get 2nd message\n");
+ ok( ( buffer[0] == 'b' ) && ( buffer[1] == 'c' ), "2nd message wrong\n");
/* check the mailslot info */
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
- "getmailslotinfo failed");
+ "getmailslotinfo failed\n");
}
- ok( dwNext == 0, "dwNext incorrect");
+ ok( dwNext == 0, "dwNext incorrect\n");
todo_wine
{
- ok( dwMsgCount == 1, "dwMsgCount incorrect");
+ ok( dwMsgCount == 1, "dwMsgCount incorrect\n");
/* read the 3rd (zero length) message */
ok( ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
- "3rd slot read failed");
+ "3rd slot read failed\n");
}
- ok( count == 0, "failed to get 3rd message");
+ ok( count == 0, "failed to get 3rd message\n");
/*
* now there should be no more messages
@@ -304,21 +304,21 @@
{
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
- "getmailslotinfo failed");
- ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect");
+ "getmailslotinfo failed\n");
+ ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect\n");
}
- ok( dwMsgCount == 0, "dwMsgCount incorrect");
+ ok( dwMsgCount == 0, "dwMsgCount incorrect\n");
/* check that reads fail */
ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
- "3rd slot read succeeded");
+ "3rd slot read succeeded\n");
/* finally close the mailslot and its client */
todo_wine
{
- ok( CloseHandle( hWriter2 ), "closing 2nd client");
- ok( CloseHandle( hWriter ), "closing the client");
- ok( CloseHandle( hSlot ), "closing the mailslot");
+ ok( CloseHandle( hWriter2 ), "closing 2nd client\n");
+ ok( CloseHandle( hWriter ), "closing the client\n");
+ ok( CloseHandle( hSlot ), "closing the mailslot\n");
}
return 0;
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
I haven't lost my mind, it's backed up on tape around here somewhere...
More information about the wine-patches
mailing list