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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2fac2e6b325455295300580c7e1a58450c52b029
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2fac2e6b325455295300580c7e1a58450c52b029

Author: Paul Gofman <pgofman at codeweavers.com>
Date:   Wed May 26 15:10:09 2021 +0300

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: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/tests/virtual.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c
index 7d457e2d5b8..22ee7f06ac7 100644
--- a/dlls/ntdll/tests/virtual.c
+++ b/dlls/ntdll/tests/virtual.c
@@ -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,