Re: [comctl32/tests] Fix some test failures