rpcrt4/tests: Comment out a couple of tests that crash on older Windows versions.
This commit is contained in:
parent
7571c1fd53
commit
bb18c5ab07
|
@ -301,21 +301,24 @@ todo_wine {
|
||||||
NdrPointerFree(&StubMsg, mem, formattypes);
|
NdrPointerFree(&StubMsg, mem, formattypes);
|
||||||
|
|
||||||
/* again pass address of NULL ptr, but pretend we're a server */
|
/* again pass address of NULL ptr, but pretend we're a server */
|
||||||
mem = NULL;
|
if (0) /* crashes on Win9x and NT4 */
|
||||||
StubMsg.Buffer = StubMsg.BufferStart;
|
{
|
||||||
StubMsg.IsClient = 0;
|
mem = NULL;
|
||||||
ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 );
|
StubMsg.Buffer = StubMsg.BufferStart;
|
||||||
ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
|
StubMsg.IsClient = 0;
|
||||||
if (formattypes[2] == 0xd /* FC_ENUM16 */)
|
ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 );
|
||||||
ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
|
ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
|
||||||
else
|
if (formattypes[2] == 0xd /* FC_ENUM16 */)
|
||||||
ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
|
ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
|
||||||
ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx);
|
else
|
||||||
ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen);
|
ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
|
||||||
ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize);
|
ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx);
|
||||||
if (formattypes[2] != 0xd /* FC_ENUM16 */) {
|
ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen);
|
||||||
ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called);
|
ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize);
|
||||||
my_alloc_called = 0;
|
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);
|
HeapFree(GetProcessHeap(), 0, mem_orig);
|
||||||
|
@ -770,16 +773,19 @@ todo_wine {
|
||||||
Passing a NULL ptr while we're a client && !must_alloc
|
Passing a NULL ptr while we're a client && !must_alloc
|
||||||
crashes on Windows, so we won't do that. */
|
crashes on Windows, so we won't do that. */
|
||||||
|
|
||||||
mem = NULL;
|
if (0) /* crashes on Win9x and NT4 */
|
||||||
StubMsg.IsClient = 0;
|
{
|
||||||
StubMsg.Buffer = StubMsg.BufferStart;
|
mem = NULL;
|
||||||
ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, 0 );
|
StubMsg.IsClient = 0;
|
||||||
ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
|
StubMsg.Buffer = StubMsg.BufferStart;
|
||||||
ok(mem == StubMsg.BufferStart, "%s: mem not equal buffer\n", msgpfx);
|
ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, FALSE );
|
||||||
ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx);
|
ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
|
||||||
ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called);
|
ok(mem == StubMsg.BufferStart, "%s: mem not equal buffer\n", msgpfx);
|
||||||
my_alloc_called = 0;
|
ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx);
|
||||||
ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\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 ***/
|
/*** now must_alloc is true ***/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue