ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Remove wined3d_surface_get_flip_status stub.

This commit is contained in:
Riccardo Bortolato 2015-09-09 19:02:26 +02:00 committed by Alexandre Julliard
parent e869ef5c0f
commit 825b141e5a
4 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/ddraw/surface.c
View File

@ -3117,19 +3117,18 @@ static HRESULT WINAPI ddraw_surface1_GetColorKey(IDirectDrawSurface *iface, DWOR
*****************************************************************************/ *****************************************************************************/
static HRESULT WINAPI ddraw_surface7_GetFlipStatus(IDirectDrawSurface7 *iface, DWORD Flags) 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); TRACE("iface %p, flags %#x.\n", iface, Flags);
wined3d_mutex_lock(); /* XXX: DDERR_INVALIDSURFACETYPE */
hr = wined3d_surface_get_flip_status(surface->wined3d_surface, Flags);
wined3d_mutex_unlock();
switch(hr) switch (Flags)
{ {
case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; case WINEDDGFS_CANFLIP:
default: return hr; case WINEDDGFS_ISFLIPDONE:
return DD_OK;
default:
return DDERR_INVALIDPARAMS;
} }
} }

17
dlls/wined3d/surface.c
View File

@ -1883,23 +1883,6 @@ struct wined3d_resource * CDECL wined3d_surface_get_resource(struct wined3d_surf
return &surface->resource; 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) HRESULT CDECL wined3d_surface_is_lost(const struct wined3d_surface *surface)
{ {
TRACE("surface %p.\n", surface); TRACE("surface %p.\n", surface);

1
dlls/wined3d/wined3d.spec
View File

@ -224,7 +224,6 @@
@ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long)
@ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_decref(ptr)
@ cdecl wined3d_surface_from_resource(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_overlay_position(ptr ptr ptr)
@ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_pitch(ptr)

1
include/wine/wined3d.h
View File

@ -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); const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter);
ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface);
struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); 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); 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); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface);
DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);