Merge our patches onto wine-1.7.44

Change-Id: I4024d6e11513c5fca95aafcc0d3bacd32782bddc