Re: [winecfg 2] Merge X11DRV dialog code from Mark, bugfixes