Riccardo Bortolato : wined3d: Remove wined3d_surface_get_flip_status stub.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Sep 10 08:07:53 CDT 2015
Module: wine
Branch: master
Commit: 825b141e5ae293fc7f0ba51de41ca6161cf09b0d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=825b141e5ae293fc7f0ba51de41ca6161cf09b0d
Author: Riccardo Bortolato <rikyz619 at gmail.com>
Date: Wed Sep 9 19:02:26 2015 +0200
wined3d: Remove wined3d_surface_get_flip_status stub.
---
dlls/ddraw/surface.c | 17 ++++++++---------
dlls/wined3d/surface.c | 17 -----------------
dlls/wined3d/wined3d.spec | 1 -
include/wine/wined3d.h | 1 -
4 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index fcdf04b..6b6ddb9 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -3117,19 +3117,18 @@ static HRESULT WINAPI ddraw_surface1_GetColorKey(IDirectDrawSurface *iface, DWOR
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_GetFlipStatus(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_flip_status(surface->wined3d_surface, Flags);
- wined3d_mutex_unlock();
+ /* XXX: DDERR_INVALIDSURFACETYPE */
- switch(hr)
+ switch (Flags)
{
- case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS;
- default: return hr;
+ case WINEDDGFS_CANFLIP:
+ case WINEDDGFS_ISFLIPDONE:
+ return DD_OK;
+
+ default:
+ return DDERR_INVALIDPARAMS;
}
}
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index f823e05..999423d8 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1883,23 +1883,6 @@ struct wined3d_resource * CDECL wined3d_surface_get_resource(struct wined3d_surf
return &surface->resource;
}
-HRESULT CDECL wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags)
-{
- TRACE("surface %p, flags %#x.\n", surface, flags);
-
- /* XXX: DDERR_INVALIDSURFACETYPE */
-
- switch (flags)
- {
- case WINEDDGFS_CANFLIP:
- case WINEDDGFS_ISFLIPDONE:
- return WINED3D_OK;
-
- default:
- return WINED3DERR_INVALIDCALL;
- }
-}
-
HRESULT CDECL wined3d_surface_is_lost(const struct wined3d_surface *surface)
{
TRACE("surface %p.\n", surface);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 26bd6dd..9531dd3 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_flip_status(ptr long)
@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 5739899..ac1e59e 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_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);
DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);
More information about the wine-cvs
mailing list