RESEND: Get AdjustWindowRect working better