首先你的1就是错的,只能说who was drinking,记住是be+doing
主语回答用宾格形式,如
Who did homework yesterday?
I did it myself、Him、Her、Susan did it