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
83a147d9
Commit
83a147d9
authored
Feb 01, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 02, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Use wined3d_texture_get_dc() in ddraw_surface7_GetDC().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
88c9ade4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
4 deletions
+3
-4
surface.c
dlls/ddraw/surface.c
+1
-1
surface.c
dlls/wined3d/surface.c
+1
-1
wined3d.spec
dlls/wined3d/wined3d.spec
+0
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-0
wined3d.h
include/wine/wined3d.h
+0
-1
No files found.
dlls/ddraw/surface.c
View file @
83a147d9
...
...
@@ -2123,7 +2123,7 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc)
if
(
surface
->
surface_desc
.
ddsCaps
.
dwCaps
&
DDSCAPS_PRIMARYSURFACE
)
hr
=
ddraw_surface_update_frontbuffer
(
surface
,
NULL
,
TRUE
);
if
(
SUCCEEDED
(
hr
))
hr
=
wined3d_
surface_getdc
(
surface
->
wined3d_surface
,
hdc
);
hr
=
wined3d_
texture_get_dc
(
surface
->
wined3d_texture
,
surface
->
sub_resource_idx
,
hdc
);
if
(
SUCCEEDED
(
hr
)
&&
format_is_paletteindexed
(
&
surface
->
surface_desc
.
u4
.
ddpfPixelFormat
))
{
...
...
dlls/wined3d/surface.c
View file @
83a147d9
...
...
@@ -2580,7 +2580,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
return
WINED3D_OK
;
}
HRESULT
CDECL
wined3d_surface_getdc
(
struct
wined3d_surface
*
surface
,
HDC
*
dc
)
HRESULT
wined3d_surface_getdc
(
struct
wined3d_surface
*
surface
,
HDC
*
dc
)
{
HRESULT
hr
;
struct
wined3d_device
*
device
=
surface
->
resource
.
device
;
...
...
dlls/wined3d/wined3d.spec
View file @
83a147d9
...
...
@@ -226,7 +226,6 @@
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
@ cdecl wined3d_surface_get_resource(ptr)
@ cdecl wined3d_surface_getdc(ptr ptr)
@ cdecl wined3d_surface_map(ptr ptr ptr long)
@ cdecl wined3d_surface_releasedc(ptr ptr)
@ cdecl wined3d_surface_set_overlay_position(ptr long long)
...
...
dlls/wined3d/wined3d_private.h
View file @
83a147d9
...
...
@@ -2507,6 +2507,7 @@ void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
HRESULT
surface_color_fill
(
struct
wined3d_surface
*
s
,
const
RECT
*
rect
,
const
struct
wined3d_color
*
color
)
DECLSPEC_HIDDEN
;
GLenum
surface_get_gl_buffer
(
const
struct
wined3d_surface
*
surface
)
DECLSPEC_HIDDEN
;
HRESULT
wined3d_surface_getdc
(
struct
wined3d_surface
*
surface
,
HDC
*
dc
)
DECLSPEC_HIDDEN
;
void
surface_get_drawable_size
(
const
struct
wined3d_surface
*
surface
,
const
struct
wined3d_context
*
context
,
unsigned
int
*
width
,
unsigned
int
*
height
)
DECLSPEC_HIDDEN
;
void
surface_invalidate_location
(
struct
wined3d_surface
*
surface
,
DWORD
location
)
DECLSPEC_HIDDEN
;
...
...
include/wine/wined3d.h
View file @
83a147d9
...
...
@@ -2476,7 +2476,6 @@ HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surfac
void
*
__cdecl
wined3d_surface_get_parent
(
const
struct
wined3d_surface
*
surface
);
DWORD
__cdecl
wined3d_surface_get_pitch
(
const
struct
wined3d_surface
*
surface
);
struct
wined3d_resource
*
__cdecl
wined3d_surface_get_resource
(
struct
wined3d_surface
*
surface
);
HRESULT
__cdecl
wined3d_surface_getdc
(
struct
wined3d_surface
*
surface
,
HDC
*
dc
);
HRESULT
__cdecl
wined3d_surface_map
(
struct
wined3d_surface
*
surface
,
struct
wined3d_map_desc
*
map_desc
,
const
struct
wined3d_box
*
box
,
DWORD
flags
);
HRESULT
__cdecl
wined3d_surface_releasedc
(
struct
wined3d_surface
*
surface
,
HDC
dc
);
...
...
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