Re: Fix comctl32 tests