Looks good to me but would you mind dropping the win32u change? I think it's probably correct but I would be more comfortable if that was fixed separately. I have reasons to believe that win32u window activation code is incorrect and needs fixing, and that could be part of it.