Alexandre Julliard : rpcrt4/tests: Remove tests for v1 memory list, the layout is wrong and we don't care about it anyway.

Alexandre Julliard julliard at winehq.org
Fri May 29 09:15:49 CDT 2009


Module: wine
Branch: master
Commit: 05f57146c87d63a9cdee502df3818ef8b6997b7a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=05f57146c87d63a9cdee502df3818ef8b6997b7a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu May 28 20:18:34 2009 +0200

rpcrt4/tests: Remove tests for v1 memory list, the layout is wrong and we don't care about it anyway.

---

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

diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index 1cf432f..a4f8bb4 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -1313,12 +1313,6 @@ static void test_ndr_allocate(void)
     MIDL_STUB_MESSAGE StubMsg;
     MIDL_STUB_DESC StubDesc;
     void *p1, *p2;
-    struct tag_mem_list_v1_t
-    {
-        DWORD magic;
-        void *ptr;
-        struct tag_mem_list_v1_t *next;
-    } *mem_list_v1;
     struct tag_mem_list_v2_t
     {
         DWORD magic;
@@ -1331,7 +1325,6 @@ static void test_ndr_allocate(void)
     StubDesc = Object_StubDesc;
     NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 0);
 
-    ok(StubMsg.pMemoryList == NULL, "memlist %p\n", StubMsg.pMemoryList);
     my_alloc_called = my_free_called = 0;
     p1 = NdrAllocate(&StubMsg, 10);
     p2 = NdrAllocate(&StubMsg, 24);
@@ -1358,21 +1351,7 @@ static void test_ndr_allocate(void)
                 ok(mem_list_v2->next == NULL, "next %p\n", mem_list_v2->next);
             }
         }
-        else
-        {
-            trace("v1 mem list format\n");
-            mem_list_v1 = StubMsg.pMemoryList;
-            ok(mem_list_v1->magic == magic_MEML, "magic %08x\n", mem_list_v1->magic);
-            ok(mem_list_v1->ptr == p2, "ptr != p2\n");
-            ok(mem_list_v1->next != NULL, "next NULL\n");
-            mem_list_v1 = mem_list_v1->next;
-            if(mem_list_v1)
-            {
-                ok(mem_list_v1->magic == magic_MEML, "magic %08x\n", mem_list_v1->magic);
-                ok(mem_list_v1->ptr == p1, "ptr != p1\n");
-                ok(mem_list_v1->next == NULL, "next %p\n", mem_list_v1->next);
-            }
-        }
+        else win_skip("v1 mem list format\n");
     }
     /* NdrFree isn't exported so we can't test free'ing */
 }




More information about the wine-cvs mailing list