Alexandre Julliard : rpcrt4/tests: Enable some tests that no longer crash Wine.
Alexandre Julliard
julliard at winehq.org
Thu May 28 09:39:39 CDT 2009
Module: wine
Branch: master
Commit: 49f1433cdcdb8414c9b54669aff13308c24259de
URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f1433cdcdb8414c9b54669aff13308c24259de
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu May 28 11:41:12 2009 +0200
rpcrt4/tests: Enable some tests that no longer crash Wine.
---
dlls/rpcrt4/tests/ndr_marshall.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index ded87a8..d562d09 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -957,11 +957,7 @@ static void test_simple_struct(void)
else
*(unsigned int *)wiredata = (UINT_PTR)&s1;
memcpy(wiredata + 4, &s1, wiredatalen);
- if (0)
- {
- /* one of the unmarshallings crashes Wine */
test_pointer_marshal(fmtstr_simple_struct, &s1, 24, wiredata, 28, NULL, 0, "struct");
- }
/* zero the entire structure, including the hole */
memset(&ps1, 0, sizeof(ps1));
@@ -988,14 +984,14 @@ static void test_simple_struct(void)
test_simple_struct_marshal(fmtstr_pointer_struct + 4, &ps1, 17, wiredata + 4, 17, ps1_cmp, 2, "pointer_struct");
if (use_pointer_ids)
+ {
*(unsigned int *)wiredata = 0x20000;
+ *(unsigned int *)(wiredata + 8) = 0x20004;
+ *(unsigned int *)(wiredata + 12) = 0x20008;
+ }
else
*(unsigned int *)wiredata = (UINT_PTR)&ps1;
- if (0)
- {
- /* one of the unmarshallings crashes Wine */
test_pointer_marshal(fmtstr_pointer_struct, &ps1, 17, wiredata, 21, ps1_cmp, 2, "pointer_struct");
- }
}
static void test_fullpointer_xlat(void)
More information about the wine-cvs
mailing list