Skip to content

W
wine-winehq
Commit 5d62e55d authored by Lionel Ulmer's avatar Lionel Ulmer Committed by Alexandre Julliard
Browse files
Options

Better handling of pitch set to 0.

parent 2d27504f
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
dlls/ddraw/dsurface/dib.c
View file @ 5d62e55d
...@@ -114,6 +114,13 @@ static HRESULT create_dib(IDirectDrawSurfaceImpl* This) ...@@ -114,6 +114,13 @@ static HRESULT create_dib(IDirectDrawSurfaceImpl* This)
b_info->bmiHeader.biClrUsed = 0; b_info->bmiHeader.biClrUsed = 0;
b_info->bmiHeader.biClrImportant = 0; b_info->bmiHeader.biClrImportant = 0;
if (!This->surface_desc.u1.lPitch) {
/* This can't happen, right? */
/* or use GDI_GetObj to get it from the created DIB? */
This->surface_desc.u1.lPitch = get_dib_width_bytes(b_info->bmiHeader.biWidth, b_info->bmiHeader.biBitCount);
This->surface_desc.dwFlags |= DDSD_PITCH;
}
switch (This->surface_desc.u4.ddpfPixelFormat.u1.dwRGBBitCount) switch (This->surface_desc.u4.ddpfPixelFormat.u1.dwRGBBitCount)
{ {
case 16: case 16:
...@@ -158,12 +165,6 @@ static HRESULT create_dib(IDirectDrawSurfaceImpl* This) ...@@ -158,12 +165,6 @@ static HRESULT create_dib(IDirectDrawSurfaceImpl* This)
} }
TRACE("DIBSection at : %p\n", priv->dib.bitmap_data); TRACE("DIBSection at : %p\n", priv->dib.bitmap_data);
if (!This->surface_desc.u1.lPitch) {
/* This can't happen, right? */
/* or use GDI_GetObj to get it from the created DIB? */
This->surface_desc.u1.lPitch = get_dib_width_bytes(b_info->bmiHeader.biWidth, b_info->bmiHeader.biBitCount);
This->surface_desc.dwFlags |= DDSD_PITCH;
}
if (!This->surface_desc.lpSurface) { if (!This->surface_desc.lpSurface) {
This->surface_desc.lpSurface = priv->dib.bitmap_data; This->surface_desc.lpSurface = priv->dib.bitmap_data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment