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
6cba2285
Commit
6cba2285
authored
Dec 04, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Reject creating primary surfaces with DDSCAPS_TEXTURE.
parent
a9afc935
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
6 deletions
+14
-6
surface.c
dlls/ddraw/surface.c
+14
-6
No files found.
dlls/ddraw/surface.c
View file @
6cba2285
...
@@ -5627,13 +5627,21 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
...
@@ -5627,13 +5627,21 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
if
((
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_ALLOCONLOAD
)
||
!
desc
->
lpSurface
)
if
((
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_ALLOCONLOAD
)
||
!
desc
->
lpSurface
)
desc
->
dwFlags
&=
~
DDSD_LPSURFACE
;
desc
->
dwFlags
&=
~
DDSD_LPSURFACE
;
if
((
desc
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_FLIP
|
DDSCAPS_PRIMARYSURFACE
))
if
(
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_PRIMARYSURFACE
)
==
(
DDSCAPS_FLIP
|
DDSCAPS_PRIMARYSURFACE
)
&&
!
(
ddraw
->
cooperative_level
&
DDSCL_EXCLUSIVE
))
{
{
WARN
(
"Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.
\n
"
);
if
(
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_TEXTURE
)
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
{
return
DDERR_NOEXCLUSIVEMODE
;
WARN
(
"Tried to create a primary surface with DDSCAPS_TEXTURE.
\n
"
);
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
return
DDERR_INVALIDCAPS
;
}
if
((
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_FLIP
)
&&
!
(
ddraw
->
cooperative_level
&
DDSCL_EXCLUSIVE
))
{
WARN
(
"Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.
\n
"
);
HeapFree
(
GetProcessHeap
(),
0
,
texture
);
return
DDERR_NOEXCLUSIVEMODE
;
}
}
}
/* This is a special case in ddrawex, but not allowed in ddraw. */
/* This is a special case in ddrawex, but not allowed in ddraw. */
...
...
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