ddraw: Merge the surface thunks into surface.c.

dlls/ddraw/Makefile.in

@@ -20,7 +20,6 @@ C_SRCS = \
 	parent.c \
 	regsvr.c \
 	surface.c \
-	surface_thunks.c \
 	texture.c \
 	utils.c \
 	vertexbuffer.c \

dlls/ddraw/ddraw.c

@@ -3324,7 +3324,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface,
             {
                 release_surf = object;
                 object = object->complex_array[0];
-                IDirectDrawSurfaceImpl_Destroy(release_surf);
+                ddraw_surface_destroy(release_surf);
             }
             LeaveCriticalSection(&ddraw_cs);
             return hr;

dlls/ddraw/ddraw_private.h

@@ -282,9 +282,7 @@ extern const IDirectDrawGammaControlVtbl IDirectDrawGammaControl_Vtbl DECLSPEC_H
 extern const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl DECLSPEC_HIDDEN;
 extern const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl DECLSPEC_HIDDEN;
 
-HRESULT WINAPI IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This,
-        IDirectDrawSurfaceImpl *Surf) DECLSPEC_HIDDEN;
-void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN;
+void ddraw_surface_destroy(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN;
 
 static inline IDirectDrawSurfaceImpl *surface_from_texture1(IDirect3DTexture *iface)
 {