[windows] Integrate patch for closing popup menu by right-click

Remove also the hack consisting in patches in win32/diff directory,
now that no patch exist anymore.