[PATCH] Stop crash under Win98 in rpcrt4 ndr_marshall tests

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Fri May 30 22:16:18 CDT 2008


---
 dlls/rpcrt4/tests/ndr_marshall.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index 1ff5e3b..1ba3ddf 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -718,7 +718,8 @@ todo_wine {
     mem = NULL;
     StubMsg.IsClient = 0;
     StubMsg.Buffer = StubMsg.BufferStart;
-    ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, 0 );
+    /* Win98 needs the fMustAlloc flag to be true when the mem buffer is NULL. */
+    ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, 1 );
     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);
-- 
1.5.4.1


--------------030705020702030602070402--




More information about the wine-patches mailing list