Henri Verbeet : ddraw: Prevent mode changes when a different ddraw object is in exclusive mode.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Tue Oct 16 22:43:10 2012 +0200

ddraw: Prevent mode changes when a different ddraw object is in exclusive mode.

---

dlls/ddraw/ddraw.c |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 9d2a78a..8a554f3 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -27,6 +27,8 @@

WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

+static const struct ddraw *exclusive_ddraw;
+
 /* Device identifier. Don't relay it to WineD3D */
 static const DDDEVICEIDENTIFIER2 deviceidentifier =
 {
@@ -967,6 +969,11 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd,
     if(cooplevel & DDSCL_FPUSETUP)
         WARN("(%p) Unhandled flag DDSCL_FPUSETUP, harmless\n", This);

+    if (cooplevel & DDSCL_EXCLUSIVE)
+        exclusive_ddraw = This;
+    else if (exclusive_ddraw == This)
+        exclusive_ddraw = NULL;
+
     /* Store the cooperative_level */
     This->cooperative_level = cooplevel;
     TRACE("SetCooperativeLevel retuning DD_OK\n");
@@ -1044,6 +1051,12 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW

wined3d_mutex_lock();

+    if (exclusive_ddraw && exclusive_ddraw != ddraw)
+    {
+        wined3d_mutex_unlock();
+        return DDERR_NOEXCLUSIVEMODE;
+    }
+
     if (!width || !height)
     {
         /* It looks like Need for Speed Porsche Unleashed expects DD_OK here. */
@@ -1061,12 +1074,6 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW
         default: format = WINED3DFMT_UNKNOWN;        break;
     }

-    /* Check the exclusive mode.
-     * if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE))
-     *     return DDERR_NOEXCLUSIVEMODE;
-     * This is WRONG. Don't know if the SDK is completely wrong and if there
-     * are any conditions when DDERR_NOEXCLUSIVE is returned, but Half-Life
-     * 1.1.1.1 (Steam version) depends on this. */
     mode.width = width;
     mode.height = height;
     mode.refresh_rate = refresh_rate;
@@ -1148,6 +1155,12 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface)

wined3d_mutex_lock();

+    if (exclusive_ddraw && exclusive_ddraw != ddraw)
+    {
+        wined3d_mutex_unlock();
+        return DDERR_NOEXCLUSIVEMODE;
+    }
+
     hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &ddraw->original_mode);

wined3d_mutex_unlock();