Merge "fix null pointer crash in Win32 because esp register is broken"