[COMCTL32] Minimize Wine diff (#2035)