Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
825b141e
Commit
825b141e
authored
Sep 09, 2015
by
Riccardo Bortolato
Committed by
Alexandre Julliard
Sep 10, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove wined3d_surface_get_flip_status stub.
parent
e869ef5c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
28 deletions
+8
-28
surface.c
dlls/ddraw/surface.c
+8
-9
surface.c
dlls/wined3d/surface.c
+0
-17
wined3d.spec
dlls/wined3d/wined3d.spec
+0
-1
wined3d.h
include/wine/wined3d.h
+0
-1
No files found.
dlls/ddraw/surface.c
View file @
825b141e
...
...
@@ -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
;
}
}
...
...
dlls/wined3d/surface.c
View file @
825b141e
...
...
@@ -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
);
...
...
dlls/wined3d/wined3d.spec
View file @
825b141e
...
...
@@ -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)
...
...
include/wine/wined3d.h
View file @
825b141e
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment