ntdll: Clear the 32-bit TLS for ZeroTlsCell in Wow64 mode.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Clear the 32-bit TLS for ZeroTlsCell in Wow64 mode.
87948793 · Alexandre Julliard · 3469ebf9 · 87948793
Commit 87948793 authored Jul 01, 2021 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

virtual.c dlls/ntdll/unix/virtual.c +14 -0

No files found.
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -3017,6 +3017,11 @@ NTSTATUS virtual_clear_tls_index( ULONG index )
        LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry )
        {
            TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch );
+#ifdef _WIN64
+            WOW_TEB *wow_teb = get_wow_teb( teb );
+            if (wow_teb) wow_teb->TlsSlots[index] = 0;
+            else
+#endif
            teb->TlsSlots[index] = 0;
        }
        server_leave_uninterrupted_section( &virtual_mutex, &sigset );
@@ -3030,6 +3035,15 @@ NTSTATUS virtual_clear_tls_index( ULONG index )
        LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry )
        {
            TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch );
+#ifdef _WIN64
+            WOW_TEB *wow_teb = get_wow_teb( teb );
+            if (wow_teb)
+            {
+                if (wow_teb->TlsExpansionSlots)
+                    ((ULONG *)ULongToPtr( wow_teb->TlsExpansionSlots ))[index] = 0;
+            }
+            else
+#endif
            if (teb->TlsExpansionSlots) teb->TlsExpansionSlots[index] = 0;
        }
        server_leave_uninterrupted_section( &virtual_mutex, &sigset );