ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Return DDERR_NOCOLORKEY when there is no colorkey.

This commit is contained in:
Alexander Dorofeyev 2008-05-06 00:49:32 +03:00 committed by Alexandre Julliard
parent 7e8be9ecc0
commit d6ecf5d14d
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/ddraw/surface.c
View File

@ -1490,9 +1490,6 @@ IDirectDrawSurfaceImpl_GetColorKey(IDirectDrawSurface7 *iface,
DWORD Flags, DWORD Flags,
DDCOLORKEY *CKey) 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); ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface);
TRACE("(%p)->(%08x,%p)\n", This, Flags, CKey); TRACE("(%p)->(%08x,%p)\n", This, Flags, CKey);
@ -1500,21 +1497,42 @@ IDirectDrawSurfaceImpl_GetColorKey(IDirectDrawSurface7 *iface,
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
EnterCriticalSection(&ddraw_cs); EnterCriticalSection(&ddraw_cs);
switch (Flags) switch (Flags)
{ {
case DDCKEY_DESTBLT: case DDCKEY_DESTBLT:
if (!(This->surface_desc.dwFlags & DDSD_CKDESTBLT))
{
LeaveCriticalSection(&ddraw_cs);
return DDERR_NOCOLORKEY;
}
*CKey = This->surface_desc.ddckCKDestBlt; *CKey = This->surface_desc.ddckCKDestBlt;
break; break;
case DDCKEY_DESTOVERLAY: case DDCKEY_DESTOVERLAY:
if (!(This->surface_desc.dwFlags & DDSD_CKDESTOVERLAY))
{
LeaveCriticalSection(&ddraw_cs);
return DDERR_NOCOLORKEY;
}
*CKey = This->surface_desc.u3.ddckCKDestOverlay; *CKey = This->surface_desc.u3.ddckCKDestOverlay;
break; break;
case DDCKEY_SRCBLT: case DDCKEY_SRCBLT:
if (!(This->surface_desc.dwFlags & DDSD_CKSRCBLT))
{
LeaveCriticalSection(&ddraw_cs);
return DDERR_NOCOLORKEY;
}
*CKey = This->surface_desc.ddckCKSrcBlt; *CKey = This->surface_desc.ddckCKSrcBlt;
break; break;
case DDCKEY_SRCOVERLAY: case DDCKEY_SRCOVERLAY:
if (!(This->surface_desc.dwFlags & DDSD_CKSRCOVERLAY))
{
LeaveCriticalSection(&ddraw_cs);
return DDERR_NOCOLORKEY;
}
*CKey = This->surface_desc.ddckCKSrcOverlay; *CKey = This->surface_desc.ddckCKSrcOverlay;
break; break;