[PATCH 0/1] MR6896: dplayx: Add a few more locks (Coverity)

[Fabian Maurer (＠DarkShadow44)]

It's done like this everywhere else, so add locks everywhere.

[PATCH 1/1] dplayx: Add a few more locks (Coverity)

[Fabian Maurer]

From: Fabian Maurer

It's done like this everywhere else, so add locks everywhere.
---
 dlls/dplayx/dplay.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 9ed4c25b737..103a47e4182 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -2116,10 +2116,13 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, DPID *lpidPlayer,
     return DPERR_UNINITIALIZED;
   }

+  EnterCriticalSection( &This->lock );
   if( !This->dp2->bConnectionOpen )
   {
+    LeaveCriticalSection( &This->lock );
     return DPERR_INVALIDPARAM;
   }
+  LeaveCriticalSection( &This->lock );

if( lpidPlayer == NULL )
   {
@@ -2948,8 +2951,13 @@ static HRESULT DP_IF_EnumSessions( IDirectPlayImpl *This, DPSESSIONDESC2 *sdesc,
         return DPERR_INVALIDPARAM;

/* Can't enumerate if the interface is already open */
+    EnterCriticalSection( &This->lock );
     if ( This->dp2->bConnectionOpen )
+    {
+        LeaveCriticalSection( &This->lock );
         return DPERR_GENERIC;
+    }
+    LeaveCriticalSection( &This->lock );

/* The loading of a lobby provider _seems_ to require a backdoor loading
      * of the service provider to also associate with this DP object. This is
@@ -3746,11 +3754,14 @@ static HRESULT DP_SecureOpen( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpsd,
     return DPERR_UNINITIALIZED;
   }

+  EnterCriticalSection( &This->lock );
   if( This->dp2->bConnectionOpen )
   {
     TRACE( ": rejecting already open connection.\n" );
+    LeaveCriticalSection( &This->lock );
     return DPERR_ALREADYINITIALIZED;
   }
+  LeaveCriticalSection( &This->lock );

/* If we're enumerating, kill the thread */
   DP_KillEnumSessionThread( This );

[PATCH 0/1] MR6896: dplayx: Add a few more locks (Coverity) - approved

[Alistair Leslie-Hughes (＠alesliehughes)]

This merge request was approved by Alistair Leslie-Hughes.