Michael Stefaniuc : dplayx: Remove the unused lock from IDirectPlaySPImpl.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Wed Sep  4 23:57:16 2013 +0200

dplayx: Remove the unused lock from IDirectPlaySPImpl.

---

dlls/dplayx/dplaysp.c |   43 +------------------------------------------
 1 files changed, 1 insertions(+), 42 deletions(-)

diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c
index 03169e3..e8fea40 100644
--- a/dlls/dplayx/dplaysp.c
+++ b/dlls/dplayx/dplaysp.c
@@ -34,19 +34,12 @@
 WINE_DEFAULT_DEBUG_CHANNEL(dplay);

/* Prototypes */
-static BOOL DPSP_CreateIUnknown( LPVOID lpSP );
-static BOOL DPSP_DestroyIUnknown( LPVOID lpSP );
 static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp );
 static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP );

/* Predefine the interface */
 typedef struct IDirectPlaySPImpl IDirectPlaySPImpl;

-typedef struct tagDirectPlaySPIUnknownData
-{
-  CRITICAL_SECTION  DPSP_lock;
-} DirectPlaySPIUnknownData;
-
 typedef struct tagDirectPlaySPData
 {
   LPVOID lpSpRemoteData;
@@ -60,7 +53,6 @@ typedef struct tagDirectPlaySPData
 } DirectPlaySPData;

#define DPSP_IMPL_FIELDS \
-   DirectPlaySPIUnknownData* unk; \
    DirectPlaySPData* sp;

struct IDirectPlaySPImpl
@@ -111,9 +103,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp )
   }

/* Initialize it */
-  if( DPSP_CreateIUnknown( *ppvObj ) &&
-      DPSP_CreateDirectPlaySP( *ppvObj, dp )
-    )
+  if( DPSP_CreateDirectPlaySP( *ppvObj, dp ) )
   {
     IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj );
     return S_OK;
@@ -121,7 +111,6 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp )

/* Initialize failed, destroy it */
   DPSP_DestroyDirectPlaySP( *ppvObj );
-  DPSP_DestroyIUnknown( *ppvObj );

HeapFree( GetProcessHeap(), 0, *ppvObj );
   *ppvObj = NULL;
@@ -129,35 +118,6 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp )
   return DPERR_NOMEMORY;
 }

-static BOOL DPSP_CreateIUnknown( LPVOID lpSP )
-{
-  IDirectPlaySPImpl *This = lpSP;
-
-  This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) );
-
-  if ( This->unk == NULL )
-  {
-    return FALSE;
-  }
-
-  InitializeCriticalSection( &This->unk->DPSP_lock );
-  This->unk->DPSP_lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlaySPImpl*->DirectPlaySPIUnknownData*->DPSP_lock");
-
-  return TRUE;
-}
-
-static BOOL DPSP_DestroyIUnknown( LPVOID lpSP )
-{
-  IDirectPlaySPImpl *This = lpSP;
-
-  This->unk->DPSP_lock.DebugInfo->Spare[0] = 0;
-  DeleteCriticalSection( &This->unk->DPSP_lock );
-  HeapFree( GetProcessHeap(), 0, This->unk );
-
-  return TRUE;
-}
-
-
 static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp )
 {
   IDirectPlaySPImpl *This = lpSP;
@@ -229,7 +189,6 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface )
   if( !ref )
   {
     DPSP_DestroyDirectPlaySP( This );
-    DPSP_DestroyIUnknown( This );
     HeapFree( GetProcessHeap(), 0, This );
   }