Skip to content

W
wine-winehq
Commit ab959b91 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

oleaut32/tests: Fix a pointer truncation issue on 64-bit.

parent ff1dfb42
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlls/oleaut32/tests/usrmarshal.c
View file @ ab959b91
...@@ -1625,8 +1625,7 @@ static void test_marshal_VARIANT(void) ...@@ -1625,8 +1625,7 @@ static void test_marshal_VARIANT(void)
wirev = (DWORD*)buffer; wirev = (DWORD*)buffer;
wirev = check_variant_header(wirev, &v, next - buffer); wirev = check_variant_header(wirev, &v, next - buffer);
ok(*wirev == (DWORD_PTR)V_UNKNOWN(&v) /* Win9x */ || ok(*wirev == (DWORD)(DWORD_PTR)V_UNKNOWN(&v) + 1, "wv[5] %08lx\n", *wirev);
*wirev == (DWORD_PTR)V_UNKNOWN(&v) + 1 /* NT */, "wv[5] %08lx\n", *wirev);
wirev++; wirev++;
ok(*wirev == next - buffer - 0x20, "wv[6] %08lx\n", *wirev); ok(*wirev == next - buffer - 0x20, "wv[6] %08lx\n", *wirev);
wirev++; wirev++;
...@@ -1694,8 +1693,7 @@ static void test_marshal_VARIANT(void) ...@@ -1694,8 +1693,7 @@ static void test_marshal_VARIANT(void)
ok(*wirev == 4, "wv[5] %08lx\n", *wirev); ok(*wirev == 4, "wv[5] %08lx\n", *wirev);
wirev++; wirev++;
ok(*wirev == (DWORD_PTR)heap_unknown /* Win9x, Win2000 */ || ok(*wirev == (DWORD)(DWORD_PTR)heap_unknown + 1, "wv[6] %08lx\n", *wirev);
*wirev == (DWORD_PTR)heap_unknown + 1 /* XP */, "wv[6] %08lx\n", *wirev);
wirev++; wirev++;
ok(*wirev == next - buffer - 0x24, "wv[7] %08lx\n", *wirev); ok(*wirev == next - buffer - 0x24, "wv[7] %08lx\n", *wirev);
wirev++; wirev++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment