consolidate windlg and os2dlg files