Merge second part of the comctl32 Wine 1.2 sync.