Henri Verbeet : ddraw: Reject explicitly creating a flippable front buffer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a9afc9356e5469b24cdf6f8b4be912e33b52c422
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a9afc9356e5469b24cdf6f8b4b...

Author: Henri Verbeet 
Date:   Wed Dec  4 09:49:36 2013 +0100

ddraw: Reject explicitly creating a flippable front buffer.

---

dlls/ddraw/ddraw.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 7fca84c..ee1d19c 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2921,11 +2921,10 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface,
         return DDERR_INVALIDPARAMS;
     }

-    /* Remove front buffer flag, this causes failure in v7, and its added to normal
-     * primaries anyway. */
-    surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER;
     if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER))
-            == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER))
+            == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)
+            || (surface_desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER))
+            == ((DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER)))
     {
         WARN("Application tried to create an explicit front or back buffer.\n");
         wined3d_mutex_unlock();