wine/dlls/ddraw surface_dib.c
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 14 06:27:32 CST 2005
ChangeSet ID: 21253
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/11/14 06:27:31
Modified files:
dlls/ddraw : surface_dib.c
Log message:
H. Verbeet <hverbeet at gmail.com>
Fix the default value for keylow in DIB_DirectDrawSurface_Blt.
Unset DDBLT_DDFX when lpbltfx is NULL / contains no dwDDFX.
Patch: http://cvs.winehq.org/patch.py?id=21253
Old revision New revision Changes Path
1.8 1.9 +3 -1 wine/dlls/ddraw/surface_dib.c
Index: wine/dlls/ddraw/surface_dib.c
diff -u -p wine/dlls/ddraw/surface_dib.c:1.8 wine/dlls/ddraw/surface_dib.c:1.9
--- wine/dlls/ddraw/surface_dib.c:1.8 14 Nov 2005 12:27:31 -0000
+++ wine/dlls/ddraw/surface_dib.c 14 Nov 2005 12:27:31 -0000
@@ -538,6 +538,8 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSU
IDirectDrawSurface7_Lock(iface,NULL,&ddesc,DDLOCK_WRITEONLY,0);
}
+ if (!lpbltfx || !(lpbltfx->dwDDFX)) dwFlags &= ~DDBLT_DDFX;
+
if ((sdesc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC) &&
(ddesc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC)) {
if (sdesc.u4.ddpfPixelFormat.dwFourCC != sdesc.u4.ddpfPixelFormat.dwFourCC) {
@@ -831,7 +833,7 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSU
}
} else {
LONG dstyinc = ddesc.u1.lPitch, dstxinc = bpp;
- DWORD keylow = 0, keyhigh = 0, keymask = 0xFFFFFFFF;
+ DWORD keylow = 0xFFFFFFFF, keyhigh = 0, keymask = 0xFFFFFFFF;
if (dwFlags & (DDBLT_KEYSRC | DDBLT_KEYDEST | DDBLT_KEYSRCOVERRIDE | DDBLT_KEYDESTOVERRIDE)) {
if (dwFlags & DDBLT_KEYSRC) {
More information about the wine-cvs
mailing list