wfreerdp: integrating benoit's latest code