Henri Verbeet : d3d8/tests: Merge surface.c into device.c.