Skip to content

W
wine-cw
Commit ce8f6ecf authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

ddraw: Merge the surface thunks into surface.c.

parent 6fb9ee0e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
dlls/ddraw/Makefile.in
View file @ ce8f6ecf
...@@ -20,7 +20,6 @@ C_SRCS = \ ...@@ -20,7 +20,6 @@ C_SRCS = \
parent.c \ parent.c \
regsvr.c \ regsvr.c \
surface.c \ surface.c \
surface_thunks.c \
texture.c \ texture.c \
utils.c \ utils.c \
vertexbuffer.c \ vertexbuffer.c \
......
dlls/ddraw/ddraw.c
View file @ ce8f6ecf
...@@ -3324,7 +3324,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, ...@@ -3324,7 +3324,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface,
{ {
release_surf = object; release_surf = object;
object = object->complex_array[0]; object = object->complex_array[0];
IDirectDrawSurfaceImpl_Destroy(release_surf); ddraw_surface_destroy(release_surf);
} }
LeaveCriticalSection(&ddraw_cs); LeaveCriticalSection(&ddraw_cs);
return hr; return hr;
......
dlls/ddraw/ddraw_private.h
View file @ ce8f6ecf
...@@ -282,9 +282,7 @@ extern const IDirectDrawGammaControlVtbl IDirectDrawGammaControl_Vtbl DECLSPEC_H ...@@ -282,9 +282,7 @@ extern const IDirectDrawGammaControlVtbl IDirectDrawGammaControl_Vtbl DECLSPEC_H
extern const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl DECLSPEC_HIDDEN; extern const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl DECLSPEC_HIDDEN;
extern const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl DECLSPEC_HIDDEN; extern const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl DECLSPEC_HIDDEN;
HRESULT WINAPI IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This, void ddraw_surface_destroy(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN;
IDirectDrawSurfaceImpl *Surf) DECLSPEC_HIDDEN;
void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN;
static inline IDirectDrawSurfaceImpl *surface_from_texture1(IDirect3DTexture *iface) static inline IDirectDrawSurfaceImpl *surface_from_texture1(IDirect3DTexture *iface)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment