Skip to content
Snippets Groups Projects

ntdll: Fix inverted TlsIndex check

Merged Evan Tang requested to merge etang-cw/wine:FixTlsIndex into master
1 unresolved thread

Looks like I missed a TlsIndex use when implementing a30a5287, making it so tls initializers weren't called on module load.

Also updates TlsIndex tests to include dlls that use tls

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54539

Edited by Evan Tang

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Evan Tang changed the description

    changed the description

    • Contributor

      Marvin replied on the mailing list:

      Hi,
      
      It looks like your patch introduced the new failures shown below.
      Please investigate and fix them before resubmitting your patch.
      If they are not new, fixing them anyway would help a lot. Otherwise
      please ask for the known failures list to be updated.
      
      The tests also ran into some preexisting test failures. If you know how
      to fix them that would be helpful. See the TestBot job for the details:
      
      The full results can be found at:
      https://testbot.winehq.org/JobDetails.pl?Key=130422
      
      Your paranoid android.
      
      
      === w7u_2qxl (32 bit report) ===
      
      kernel32:
      loader.c:2324: Test failed: wrong tls data 'hello world' at 00C54600
      
      === w7u_adm (32 bit report) ===
      
      kernel32:
      loader.c:2324: Test failed: wrong tls data 'hello world' at 00BE4600
      
      === w7u_el (32 bit report) ===
      
      kernel32:
      loader.c:2324: Test failed: wrong tls data 'hello world' at 00C546A0
      
      === w7pro64 (64 bit report) ===
      
      kernel32:
      loader.c:2324: Test failed: wrong tls data 'hello world' at 0000000000D405F0
    • This is a regression in the tests when running on Windows 7. That should have been grounds for rejection of the merge request!

    • Please register or sign in to reply
  • added 86 commits

    • e81d90fd...1a61a4e1 - 83 commits from branch wine:master
    • 18338874 - ntdll: Fix inverted TlsIndex check.
    • 2203a856 - kernel32/tests: Add test verifying that tls init functions are called.
    • a8fa80cf - ntdll/tests: Move TlsIndex test to kernel32:loader.

    Compare with previous version

  • Alexandre Julliard approved this merge request

    approved this merge request

Please register or sign in to reply
Loading