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
06f393dc
Commit
06f393dc
authored
Nov 28, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 28, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Move the DDSD_LPSURFACE fixups from CreateSurface() to ddraw_surface_create_texture().
parent
f2e98544
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
13 deletions
+5
-13
ddraw.c
dlls/ddraw/ddraw.c
+0
-13
surface.c
dlls/ddraw/surface.c
+5
-0
No files found.
dlls/ddraw/ddraw.c
View file @
06f393dc
...
...
@@ -2842,19 +2842,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
DDSD
->
dwFlags
|=
DDSD_CAPS
;
}
if
(
DDSD
->
ddsCaps
.
dwCaps
&
DDSCAPS_ALLOCONLOAD
)
{
/* If the surface is of the 'alloconload' type, ignore the LPSURFACE field */
DDSD
->
dwFlags
&=
~
DDSD_LPSURFACE
;
}
if
((
DDSD
->
dwFlags
&
DDSD_LPSURFACE
)
&&
(
DDSD
->
lpSurface
==
NULL
))
{
/* Frank Herbert's Dune specifies a null pointer for the surface, ignore the LPSURFACE field */
WARN
(
"(%p) Null surface pointer specified, ignore it!
\n
"
,
ddraw
);
DDSD
->
dwFlags
&=
~
DDSD_LPSURFACE
;
}
/* Modify some flags */
copy_to_surfacedesc2
(
&
desc2
,
DDSD
);
...
...
dlls/ddraw/surface.c
View file @
06f393dc
...
...
@@ -5608,6 +5608,11 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc,
DDRAW_dump_surface_desc
(
desc
);
}
/* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE
* field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */
if
((
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_ALLOCONLOAD
)
||
!
desc
->
lpSurface
)
desc
->
dwFlags
&=
~
DDSD_LPSURFACE
;
if
((
desc
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_FLIP
|
DDSCAPS_PRIMARYSURFACE
))
==
(
DDSCAPS_FLIP
|
DDSCAPS_PRIMARYSURFACE
)
&&
!
(
ddraw
->
cooperative_level
&
DDSCL_EXCLUSIVE
))
...
...
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