[PATCH 3/5] ddraw: Don't bother setting *surface to NULL in CreateSurface().
Henri Verbeet
hverbeet at codeweavers.com
Tue Nov 26 03:41:49 CST 2013
None of the callers depend on this.
---
dlls/ddraw/ddraw.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 88e220e..e3373a9 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2856,12 +2856,11 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
DDSD->dwFlags &= ~DDSD_LPSURFACE;
}
- if((DDSD->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) &&
- !(ddraw->cooperative_level & DDSCL_EXCLUSIVE))
+ if ((DDSD->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE))
+ == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)
+ && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE))
{
- TRACE("(%p): Attempt to create a flipable primary surface without DDSCL_EXCLUSIVE set\n",
- ddraw);
- *surface = NULL;
+ WARN("Attempted to create a flipable primary surface without DDSCL_EXCLUSIVE.\n");
return DDERR_NOEXCLUSIVEMODE;
}
@@ -2871,11 +2870,10 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
return DDERR_INVALIDCAPS;
}
- if((DDSD->ddsCaps.dwCaps & sysvidmem) == sysvidmem)
+ /* This is a special case in ddrawex, but not allowed in ddraw. */
+ if ((DDSD->ddsCaps.dwCaps & sysvidmem) == sysvidmem)
{
- /* This is a special switch in ddrawex.dll, but not allowed in ddraw.dll */
- WARN("Application tries to put the surface in both system and video memory\n");
- *surface = NULL;
+ WARN("Tried to create a surface in both system and video memory.\n");
return DDERR_INVALIDCAPS;
}
--
1.7.10.4
More information about the wine-patches
mailing list