Skip to content

W
wine-winehq
Commit 2fac2e6b authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard
Browse files
Options

ntdll/tests: Do not test old xstate structure details in test_user_shared_data().

Fixes test failures on 32 bit Testbot machines. Signed-off-by: 's avatarPaul Gofman <pgofman@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ea931c82
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
dlls/ntdll/tests/virtual.c
View file @ 2fac2e6b
......@@ -928,12 +928,10 @@ static void test_user_shared_data(void)
struct old_xstate_configuration *xs_old
= (struct old_xstate_configuration *)((char *)user_shared_data + 0x3e0);
memset(&xstate, 0, sizeof(xstate));
xstate.EnabledFeatures = xstate.EnabledVolatileFeatures = xs_old->EnabledFeatures;
memcpy(&xstate.Size, &xs_old->Size, sizeof(*xs_old) - offsetof(struct old_xstate_configuration, Size));
for (i = 0; i < 3; ++i)
xstate.AllFeatures[i] = xs_old->Features[i].Size;
xstate.AllFeatureSize = 512 + sizeof(XSTATE);
ok(feature_mask == xs_old->EnabledFeatures, "Got unexpected xs_old->EnabledFeatures %s.\n",
wine_dbgstr_longlong(xs_old->EnabledFeatures));
win_skip("Old structure layout.\n");
return;
}
trace("XState EnabledFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledFeatures));
......@@ -960,7 +958,7 @@ static void test_user_shared_data(void)
for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i)
{
ok(xstate.AllFeatures[i] == feature_sizes[i]
|| broken(!xstate.AllFeatures[i]) /* win10pro */,
|| broken(!xstate.AllFeatures[i]) /* win10 on Testbot VMs */,
"Got unexpected AllFeatures[%u] %u, expected %u.\n", i,
xstate.AllFeatures[i], feature_sizes[i]);
ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i,
......
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