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
d6ecf5d1
Commit
d6ecf5d1
authored
May 06, 2008
by
Alexander Dorofeyev
Committed by
Alexandre Julliard
May 06, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Return DDERR_NOCOLORKEY when there is no colorkey.
parent
7e8be9ec
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
3 deletions
+21
-3
surface.c
dlls/ddraw/surface.c
+21
-3
No files found.
dlls/ddraw/surface.c
View file @
d6ecf5d1
...
...
@@ -1490,9 +1490,6 @@ IDirectDrawSurfaceImpl_GetColorKey(IDirectDrawSurface7 *iface,
DWORD
Flags
,
DDCOLORKEY
*
CKey
)
{
/* There is a DDERR_NOCOLORKEY error, but how do we know if a color key
* isn't there? That's like saying that an int isn't there. (Which MS
* has done in other docs.) */
ICOM_THIS_FROM
(
IDirectDrawSurfaceImpl
,
IDirectDrawSurface7
,
iface
);
TRACE
(
"(%p)->(%08x,%p)
\n
"
,
This
,
Flags
,
CKey
);
...
...
@@ -1500,21 +1497,42 @@ IDirectDrawSurfaceImpl_GetColorKey(IDirectDrawSurface7 *iface,
return
DDERR_INVALIDPARAMS
;
EnterCriticalSection
(
&
ddraw_cs
);
switch
(
Flags
)
{
case
DDCKEY_DESTBLT
:
if
(
!
(
This
->
surface_desc
.
dwFlags
&
DDSD_CKDESTBLT
))
{
LeaveCriticalSection
(
&
ddraw_cs
);
return
DDERR_NOCOLORKEY
;
}
*
CKey
=
This
->
surface_desc
.
ddckCKDestBlt
;
break
;
case
DDCKEY_DESTOVERLAY
:
if
(
!
(
This
->
surface_desc
.
dwFlags
&
DDSD_CKDESTOVERLAY
))
{
LeaveCriticalSection
(
&
ddraw_cs
);
return
DDERR_NOCOLORKEY
;
}
*
CKey
=
This
->
surface_desc
.
u3
.
ddckCKDestOverlay
;
break
;
case
DDCKEY_SRCBLT
:
if
(
!
(
This
->
surface_desc
.
dwFlags
&
DDSD_CKSRCBLT
))
{
LeaveCriticalSection
(
&
ddraw_cs
);
return
DDERR_NOCOLORKEY
;
}
*
CKey
=
This
->
surface_desc
.
ddckCKSrcBlt
;
break
;
case
DDCKEY_SRCOVERLAY
:
if
(
!
(
This
->
surface_desc
.
dwFlags
&
DDSD_CKSRCOVERLAY
))
{
LeaveCriticalSection
(
&
ddraw_cs
);
return
DDERR_NOCOLORKEY
;
}
*
CKey
=
This
->
surface_desc
.
ddckCKSrcOverlay
;
break
;
...
...
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