Alexandre Julliard : rpcrt4/tests: Comment out a couple of tests that crash on older Windows versions.
Alexandre Julliard
julliard at winehq.org
Thu May 28 09:39:39 CDT 2009
Module: wine
Branch: master
Commit: bb18c5ab0764e078608406a4879252b045796298
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb18c5ab0764e078608406a4879252b045796298
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed May 27 21:38:17 2009 +0200
rpcrt4/tests: Comment out a couple of tests that crash on older Windows versions.
---
dlls/rpcrt4/tests/ndr_marshall.c | 56 +++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index 339d3c9..ded87a8 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -301,21 +301,24 @@ todo_wine {
NdrPointerFree(&StubMsg, mem, formattypes);
/* again pass address of NULL ptr, but pretend we're a server */
- mem = NULL;
- StubMsg.Buffer = StubMsg.BufferStart;
- StubMsg.IsClient = 0;
- ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 );
- ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
- if (formattypes[2] == 0xd /* FC_ENUM16 */)
- ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
- else
- ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
- ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx);
- ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen);
- ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize);
- if (formattypes[2] != 0xd /* FC_ENUM16 */) {
- ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called);
- my_alloc_called = 0;
+ if (0) /* crashes on Win9x and NT4 */
+ {
+ mem = NULL;
+ StubMsg.Buffer = StubMsg.BufferStart;
+ StubMsg.IsClient = 0;
+ ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 );
+ ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
+ if (formattypes[2] == 0xd /* FC_ENUM16 */)
+ ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
+ else
+ ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
+ ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx);
+ ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen);
+ ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize);
+ if (formattypes[2] != 0xd /* FC_ENUM16 */) {
+ ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called);
+ my_alloc_called = 0;
+ }
}
}
HeapFree(GetProcessHeap(), 0, mem_orig);
@@ -770,16 +773,19 @@ todo_wine {
Passing a NULL ptr while we're a client && !must_alloc
crashes on Windows, so we won't do that. */
- mem = NULL;
- StubMsg.IsClient = 0;
- StubMsg.Buffer = StubMsg.BufferStart;
- ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, 0 );
- ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
- ok(mem == StubMsg.BufferStart, "%s: mem not equal buffer\n", msgpfx);
- ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx);
- ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called);
- my_alloc_called = 0;
- ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx);
+ if (0) /* crashes on Win9x and NT4 */
+ {
+ mem = NULL;
+ StubMsg.IsClient = 0;
+ StubMsg.Buffer = StubMsg.BufferStart;
+ ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, FALSE );
+ ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
+ ok(mem == StubMsg.BufferStart, "%s: mem not equal buffer\n", msgpfx);
+ ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx);
+ ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called);
+ my_alloc_called = 0;
+ ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx);
+ }
/*** now must_alloc is true ***/
More information about the wine-cvs
mailing list