If a FOURCC surface specifies DDSD_PITCH, use that instead of

dwLinearSize.

If a FOURCC surface specifies DDSD_PITCH, use that instead of
9eead124 · Matthew Mastracci · Alexandre Julliard · 3e7c8e78 · 9eead124
Commit 9eead124 authored Mar 21, 2005 by Matthew Mastracci Committed by Alexandre Julliard Mar 21, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

dib.c dlls/ddraw/dsurface/dib.c +2 -1

No files found.
--- a/dlls/ddraw/dsurface/dib.c
+++ b/dlls/ddraw/dsurface/dib.c
@@ -255,7 +255,8 @@ HRESULT DIB_DirectDrawSurface_Construct(IDirectDrawSurfaceImpl *This,

 	This->surface_desc.dwFlags |= DDSD_LPSURFACE;

-	if (This->surface_desc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC) {
+	/* Ensure that DDSD_PITCH is respected for DDPF_FOURCC surfaces too */
+ 	if (This->surface_desc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC && !(This->surface_desc.dwFlags & DDSD_PITCH)) {
 	    This->surface_desc.lpSurface
 		= VirtualAlloc(NULL, This->surface_desc.u1.dwLinearSize, MEM_COMMIT, PAGE_READWRITE);
 	    This->surface_desc.dwFlags |= DDSD_LINEARSIZE;