Huw Davies : rpcrt4: Uncomment test now that it works correctly.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue May 23 11:04:48 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 00598e49cfc1bdaf7ad0009b36de8a54bd5a70f0
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00598e49cfc1bdaf7ad0009b36de8a54bd5a70f0
Author: Huw Davies <huw at codeweavers.com>
Date: Tue May 23 12:24:55 2006 +0100
rpcrt4: Uncomment test now that it works correctly.
---
dlls/rpcrt4/tests/ndr_marshall.c | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index f468327..3899867 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -496,13 +496,6 @@ #endif
Passing a NULL ptr while we're a client && !must_alloc
crashes on Windows, so we won't do that. */
-#if 0 /* This unmarshal doesn't work correctly under Wine with a
- pstruct (and worse trashes the buffer, so further tests
- fail). When reusing the buffer the ptrs get overwritten with
- newly alloc'ed ptrs. In Wine at the moment these get zero'ed
- before the call to PointerUnmarshall in
- EmbeddedPointerUnmarshall, this zeros the buffer ptrs, so
- PointerUnmarshall thinks they're null-ptrs. */
mem = NULL;
StubMsg.IsClient = 0;
StubMsg.Buffer = StubMsg.BufferStart;
@@ -513,7 +506,7 @@ #if 0 /* This unmarshal doesn't work cor
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);
-#endif
+
/*** now must_alloc is true ***/
/* with must_alloc set we always allocate new memory whether or not we're
More information about the wine-cvs
mailing list