[PATCH 2/3] ddraw: SetSurfaceDesc can set width, height and pitch under certain conditions (try 2)
Stefan Dösinger
stefan at codeweavers.com
Thu Dec 8 08:59:06 CST 2011
This fixes bug 29162.
Try 2: Fix test failures on VMware.
---
dlls/ddraw/surface.c | 53 +++++++++++++++-
dlls/ddraw/tests/dsurface.c | 149 +++++++++++++++++++++++++++++++++++++++---
2 files changed, 190 insertions(+), 12 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index ff53a56..e80f208 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -4008,6 +4008,8 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface);
enum wined3d_format_id newFormat = WINED3DFMT_UNKNOWN;
HRESULT hr;
+ const DWORD allowed_flags = DDSD_LPSURFACE | DDSD_PIXELFORMAT | DDSD_WIDTH
+ | DDSD_HEIGHT | DDSD_PITCH | DDSD_CAPS;
TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags);
@@ -4021,10 +4023,15 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
WARN("Flags is %x, returning DDERR_INVALIDPARAMS\n", Flags);
return DDERR_INVALIDPARAMS;
}
+ if (!(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY))
+ {
+ WARN("Surface is not in system memory, returning DDERR_INVALIDSURFACETYPE.\n");
+ return DDERR_INVALIDSURFACETYPE;
+ }
/* Tests show that only LPSURFACE and PIXELFORMAT can be set, and LPSURFACE is required
* for PIXELFORMAT to work */
- if (DDSD->dwFlags & ~(DDSD_LPSURFACE | DDSD_PIXELFORMAT))
+ if (DDSD->dwFlags & ~allowed_flags)
{
WARN("Invalid flags (0x%08x) set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags);
return DDERR_INVALIDPARAMS;
@@ -4034,6 +4041,50 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n");
return DDERR_INVALIDPARAMS;
}
+ if (DDSD->dwFlags & DDSD_CAPS)
+ {
+ WARN("DDSD_CAPS is set, returning DDERR_INVALIDCAPS.\n");
+ return DDERR_INVALIDCAPS;
+ }
+ if (DDSD->dwFlags & DDSD_WIDTH)
+ {
+ if (!(DDSD->dwFlags & DDSD_PITCH))
+ {
+ WARN("DDSD_WIDTH is set, but DDSD_PITCH is not, returning DDERR_INVALIDPARAMS.\n");
+ return DDERR_INVALIDPARAMS;
+ }
+ if (!DDSD->dwWidth || DDSD->u1.lPitch <= 0 || DDSD->u1.lPitch & 0x3)
+ {
+ WARN("Pitch is %d, width is %u, returning DDERR_INVALIDPARAMS.\n",
+ DDSD->u1.lPitch, DDSD->dwWidth);
+ return DDERR_INVALIDPARAMS;
+ }
+ if (DDSD->dwWidth != This->surface_desc.dwWidth)
+ {
+ FIXME("Surface width changed from %u to %u.\n", This->surface_desc.dwWidth, DDSD->dwWidth);
+ }
+ if (DDSD->u1.lPitch != This->surface_desc.u1.lPitch)
+ {
+ FIXME("Surface pitch changed from %u to %u.\n", This->surface_desc.u1.lPitch, DDSD->u1.lPitch);
+ }
+ }
+ else if (DDSD->dwFlags & DDSD_PITCH)
+ {
+ WARN("DDSD_PITCH is set, but DDSD_WIDTH is not, returning DDERR_INVALIDPARAMS.\n");
+ return DDERR_INVALIDPARAMS;
+ }
+ if (DDSD->dwFlags & DDSD_HEIGHT)
+ {
+ if (!DDSD->dwHeight)
+ {
+ WARN("Height is 0, returning DDERR_INVALIDPARAMS.\n");
+ return DDERR_INVALIDPARAMS;
+ }
+ if (DDSD->dwHeight != This->surface_desc.dwHeight)
+ {
+ FIXME("Surface height changed from %u to %u.\n", This->surface_desc.dwHeight, DDSD->dwHeight);
+ }
+ }
wined3d_mutex_lock();
if (DDSD->dwFlags & DDSD_PIXELFORMAT)
diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c
index 45aa602..3be0382 100644
--- a/dlls/ddraw/tests/dsurface.c
+++ b/dlls/ddraw/tests/dsurface.c
@@ -4482,7 +4482,7 @@ static void set_surface_desc_test(void)
DDSURFACEDESC ddsd;
IDirectDrawSurface *surface;
IDirectDrawSurface3 *surface3;
- BYTE data[8*8*4];
+ BYTE data[16*16*4];
DWORD old_pitch;
hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL);
@@ -4547,15 +4547,36 @@ static void set_surface_desc_test(void)
ok(SUCCEEDED(hr), "GetSurfaceDesc failed, hr %#x.\n", hr);
old_pitch = U1(ddsd).lPitch;
- /* Setting width and height is an error */
+ /* Setting the caps is an error. This also means the original description cannot be reapplied */
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
+ ddsd.dwFlags = DDSD_CAPS;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
+ /* TODO: The INVALIDCAPS return value suggests that some caps can be set. */
+ ddsd.dwFlags = DDSD_CAPS | DDSD_LPSURFACE;
+ ddsd.lpSurface = data;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDCAPS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDCAPS);
+ ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDCAPS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDCAPS);
+
+ /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too */
reset_ddsd(&ddsd);
- ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT;
- ddsd.dwWidth = 16;
+ ddsd.dwFlags = DDSD_HEIGHT;
ddsd.dwHeight = 16;
hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
ddsd.lpSurface = data;
- ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE;
+ ddsd.dwFlags = DDSD_HEIGHT | DDSD_LPSURFACE;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(SUCCEEDED(hr), "SetSurfaceDesc failed, hr %#x.\n", hr);
+
+ ddsd.dwHeight = 0;
hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
@@ -4563,24 +4584,86 @@ static void set_surface_desc_test(void)
hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd);
ok(SUCCEEDED(hr), "GetSurfaceDesc failed, hr %#x.\n", hr);
ok(ddsd.dwWidth == 8, "SetSurfaceDesc: Expected width 8, got %u.\n", ddsd.dwWidth);
- ok(ddsd.dwHeight == 8, "SetSurfaceDesc: Expected height 8, got %u.\n", ddsd.dwHeight);
+ todo_wine ok(ddsd.dwHeight == 16, "SetSurfaceDesc: Expected height 16, got %u.\n", ddsd.dwHeight);
- /* Setting the pitch is an error */
+ /* Pitch and width can be set, but only together, and only with LPSURFACE. They must not be 0 */
reset_ddsd(&ddsd);
ddsd.dwFlags = DDSD_PITCH;
- U1(ddsd).lPitch = 1024;
+ U1(ddsd).lPitch = 8 * 4;
hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
+ ddsd.dwFlags = DDSD_WIDTH;
+ ddsd.dwWidth = 16;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
ddsd.dwFlags = DDSD_PITCH | DDSD_LPSURFACE;
ddsd.lpSurface = data;
hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
- U1(ddsd).lPitch = old_pitch;
+
+ ddsd.dwFlags = DDSD_WIDTH | DDSD_LPSURFACE;
hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
- /* Setting the pixelformat without lpsurface is an error, but with LPSURFACE it works */
+ ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_LPSURFACE;
+ U1(ddsd).lPitch = 16 * 4;
+ ddsd.dwWidth = 16;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(SUCCEEDED(hr), "SetSurfaceDesc failed, hr %#x.\n", hr);
+
reset_ddsd(&ddsd);
+ hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd);
+ ok(SUCCEEDED(hr), "GetSurfaceDesc failed, hr %#x.\n", hr);
+ todo_wine ok(ddsd.dwWidth == 16, "SetSurfaceDesc: Expected width 8, got %u.\n", ddsd.dwWidth);
+ todo_wine ok(ddsd.dwHeight == 16, "SetSurfaceDesc: Expected height 16, got %u.\n", ddsd.dwHeight);
+ todo_wine ok(U1(ddsd).lPitch == 16 * 4, "SetSurfaceDesc: Expected pitch 64, got %u.\n", U1(ddsd).lPitch);
+
+ /* The pitch must be 32 bit aligned and > 0, but is not verified for sanity otherwise
+ *
+ * VMware rejects those calls, but all real drivers accept it. Mark the VMware behavior broken. */
+ ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_LPSURFACE;
+ U1(ddsd).lPitch = 4 * 4;
+ ddsd.lpSurface = data;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(SUCCEEDED(hr) || broken(hr == DDERR_INVALIDPARAMS), "SetSurfaceDesc failed, hr %#x.\n", hr);
+
+ U1(ddsd).lPitch = 4;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(SUCCEEDED(hr) || broken(hr == DDERR_INVALIDPARAMS), "SetSurfaceDesc failed, hr %#x.\n", hr);
+
+ U1(ddsd).lPitch = 16 * 4 + 1;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
+ U1(ddsd).lPitch = 16 * 4 + 3;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
+ U1(ddsd).lPitch = -4; /* lPitch is signed */
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
+ U1(ddsd).lPitch = 16 * 4;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(SUCCEEDED(hr), "SetSurfaceDesc failed, hr %#x.\n", hr);
+
+ reset_ddsd(&ddsd);
+ ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_LPSURFACE;
+ U1(ddsd).lPitch = 0;
+ ddsd.dwWidth = 16;
+ ddsd.lpSurface = data;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
+ ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_LPSURFACE;
+ U1(ddsd).lPitch = 16 * 4;
+ ddsd.dwWidth = 0;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
+ /* Setting the pixelformat without lpsurface is an error, but with LPSURFACE it works */
ddsd.dwFlags = DDSD_PIXELFORMAT;
ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat);
ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB;
@@ -4590,8 +4673,8 @@ static void set_surface_desc_test(void)
U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff;
hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_LPSURFACE;
- ddsd.lpSurface = data;
hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
ok(hr == DD_OK, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DD_OK);
@@ -4603,7 +4686,51 @@ static void set_surface_desc_test(void)
hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+ ddsd.dwFlags = DDSD_CKSRCBLT | DDSD_LPSURFACE;
+ ddsd.lpSurface = data;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS);
+
IDirectDrawSurface_Release(surface3);
+
+ /* Need systemmemory surfaces
+ *
+ * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing DDSD_LINEARSIZE is moot */
+ reset_ddsd(&ddsd);
+ ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT;
+ ddsd.dwWidth = 8;
+ ddsd.dwHeight = 8;
+ ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat);
+ ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB;
+ U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32;
+ U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000;
+ U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00;
+ U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff;
+ ddsd.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY;
+
+ hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL);
+ ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "CreateSurface failed, hr %#x.\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot create a video memory surface, skipping vidmem SetSurfaceDesc test.\n");
+ return;
+ }
+ hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **) &surface3);
+ ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr);
+ IDirectDrawSurface_Release(surface);
+
+ reset_ddsd(&ddsd);
+ ddsd.dwFlags = DDSD_LPSURFACE;
+ ddsd.lpSurface = data;
+ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0);
+ ok(hr == DDERR_INVALIDSURFACETYPE, "SetSurfaceDesc returned %#x, expected %#x.\n",
+ hr, DDERR_INVALIDSURFACETYPE);
+
+ ddsd.dwFlags = DDSD_WIDTH;
+ ok(hr == DDERR_INVALIDSURFACETYPE, "SetSurfaceDesc returned %#x, expected %#x.\n",
+ hr, DDERR_INVALIDSURFACETYPE);
+
+ IDirectDrawSurface3_Release(surface3);
}
static BOOL fourcc_supported(DWORD fourcc, DWORD caps)
--
1.7.3.4
More information about the wine-patches
mailing list