Henri Verbeet : ddraw: Don' t overwrite the caller specified pitch in ddraw_surface_init().
Alexandre Julliard
julliard at winehq.org
Tue Mar 4 14:08:51 CST 2014
Module: wine
Branch: master
Commit: 10db40cecc7455542f13abb097b8167359e05f23
URL: http://source.winehq.org/git/wine.git/?a=commit;h=10db40cecc7455542f13abb097b8167359e05f23
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Mar 4 10:21:36 2014 +0100
ddraw: Don't overwrite the caller specified pitch in ddraw_surface_init().
---
dlls/ddraw/surface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index af578b3..8cfba29 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6059,10 +6059,10 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s
else
surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight);
}
- else
+ else if (!(desc->dwFlags & DDSD_LPSURFACE))
{
- surface->surface_desc.dwFlags |= DDSD_PITCH;
- surface->surface_desc.u1.lPitch = wined3d_surface_get_pitch(wined3d_surface);
+ desc->dwFlags |= DDSD_PITCH;
+ desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface);
}
if (desc->dwFlags & DDSD_LPSURFACE)
More information about the wine-cvs
mailing list