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
9b67b1b8
Commit
9b67b1b8
authored
Dec 11, 2013
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 11, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Support getdc with user memory.
parent
a88a1210
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
surface.c
dlls/wined3d/surface.c
+2
-8
No files found.
dlls/wined3d/surface.c
View file @
9b67b1b8
...
@@ -3309,12 +3309,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc)
...
@@ -3309,12 +3309,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc)
TRACE
(
"surface %p, dc %p.
\n
"
,
surface
,
dc
);
TRACE
(
"surface %p, dc %p.
\n
"
,
surface
,
dc
);
if
(
surface
->
flags
&
SFLAG_USERPTR
)
{
ERR
(
"Not supported on surfaces with application-provided memory.
\n
"
);
return
WINEDDERR_NODC
;
}
/* Give more detailed info for ddraw. */
/* Give more detailed info for ddraw. */
if
(
surface
->
flags
&
SFLAG_DCINUSE
)
if
(
surface
->
flags
&
SFLAG_DCINUSE
)
return
WINEDDERR_DCALREADYCREATED
;
return
WINEDDERR_DCALREADYCREATED
;
...
@@ -3335,8 +3329,8 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc)
...
@@ -3335,8 +3329,8 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc)
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
return
WINED3DERR_INVALIDCALL
;
return
WINED3DERR_INVALIDCALL
;
/* Use the DIB section from now on if we are not using a PBO. */
/* Use the DIB section from now on if we are not using a PBO
or user memory
. */
if
(
!
(
surface
->
flags
&
(
SFLAG_PBO
|
SFLAG_PIN_SYSMEM
)))
if
(
!
(
surface
->
flags
&
(
SFLAG_PBO
|
SFLAG_PIN_SYSMEM
|
SFLAG_USERPTR
)))
{
{
wined3d_resource_free_sysmem
(
&
surface
->
resource
);
wined3d_resource_free_sysmem
(
&
surface
->
resource
);
surface
->
resource
.
allocatedMemory
=
surface
->
dib
.
bitmap_data
;
surface
->
resource
.
allocatedMemory
=
surface
->
dib
.
bitmap_data
;
...
...
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