Hallo,
with kernel 2.6.11 PeekNamedPipe() works as expected. This makes our test
suite report:
pipe.c:153: Test succeeded inside todo block: peek3 got 21 bytes available
pipe.c:186: Test succeeded inside todo block: peek4 got 21 bytes available
fixme:sync:SetNamedPipeHandleState 0x38 0x77a2fddc (nil) (nil)
pipe.c:153: Test succeeded inside todo block: peek3 got 21 bytes available
pipe.c:186: Test succeeded inside todo block: peek4 got 21 bytes available
fixme:sync:SetNamedPipeHandleState 0x38 0x77a2fddc (nil) (nil)
While removing todo_wine() for this cases silences the output, anybody
running on an older kernel will hit an error.
How to proceed in that case. Sould he have something like
todo_linux(kernelversion){}?
Appended a patch to remove these todo_wines, if this is considers the right
solution.
Bye
--
Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/dlls/kernel/tests/pipe.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/pipe.c,v
retrieving revision 1.14
diff -u -w -r1.14 pipe.c
--- wine/dlls/kernel/tests/pipe.c 13 Dec 2004 21:19:02 -0000 1.14
+++ wine/dlls/kernel/tests/pipe.c 10 Mar 2005 11:20:22 -0000
@@ -149,9 +149,7 @@
}
else
ok(readden == sizeof(obuf), "peek3 got %ld bytes\n", readden);
- todo_wine {
ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %ld bytes available\n", avail);
- }
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 3a check\n");
if (pipemode == PIPE_TYPE_BYTE) {
@@ -182,9 +180,7 @@
}
else
ok(readden == sizeof(obuf), "peek4 got %ld bytes\n", readden);
- todo_wine {
ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %ld bytes available\n", avail);
- }
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 4a check\n");
if (pipemode == PIPE_TYPE_BYTE) {
@@ -228,9 +224,7 @@
ok(written == sizeof(obuf2), "write file len 3b\n");
ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n");
ok(readden == sizeof(obuf), "peek5 got %ld bytes\n", readden);
- todo_wine {
ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %ld bytes available\n", avail);
- }
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n");
ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
@@ -260,9 +254,7 @@
ok(written == sizeof(obuf2), "write file len 6b\n");
ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n");
ok(readden == sizeof(obuf), "peek6 got %ld bytes\n", readden);
- todo_wine {
ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %ld bytes available\n", avail);
- }
pbuf = ibuf;
ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 6a check\n");
ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");
jakov＠vmlinux.org
Uwe Bonnes