Module: wine Branch: master Commit: e869ef5c0f5a11ab5981ecb1f4590fd592c711fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e869ef5c0f5a11ab5981ecb1f4...
Author: Riccardo Bortolato rikyz619@gmail.com Date: Wed Sep 9 19:02:25 2015 +0200
wined3d: Remove wined3d_surface_get_blt_status stub.
---
dlls/ddraw/surface.c | 16 +++++++--------- dlls/wined3d/surface.c | 15 --------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4e815aa..fcdf04b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2945,18 +2945,16 @@ static HRESULT WINAPI ddraw_surface1_EnumOverlayZOrders(IDirectDrawSurface *ifac *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetBltStatus(IDirectDrawSurface7 *iface, DWORD Flags) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, Flags);
- wined3d_mutex_lock(); - hr = wined3d_surface_get_blt_status(surface->wined3d_surface, Flags); - wined3d_mutex_unlock(); - switch(hr) + switch (Flags) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; + case WINEDDGBS_CANBLT: + case WINEDDGBS_ISBLTDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; } }
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f01260c..f823e05 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1883,21 +1883,6 @@ struct wined3d_resource * CDECL wined3d_surface_get_resource(struct wined3d_surf return &surface->resource; }
-HRESULT CDECL wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags) -{ - TRACE("surface %p, flags %#x.\n", surface, flags); - - switch (flags) - { - case WINEDDGBS_CANBLT: - case WINEDDGBS_ISBLTDONE: - return WINED3D_OK; - - default: - return WINED3DERR_INVALIDCALL; - } -} - HRESULT CDECL wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags) { TRACE("surface %p, flags %#x.\n", surface, flags); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6f770a9..26bd6dd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_from_resource(ptr) -@ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_flip_status(ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d3dde35..5739899 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2478,7 +2478,6 @@ HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const R const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); -HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface);