Re: [PATCH 5/5] d3d8/tests: Merge surface.c into device.c.