[Git][wine/wine][master] 2 commits: win32u: Copy the shape from the old surface when surface is recreated.