[PATCH 2/5] dplayx: Allow storing group SP data.

[Anton Baskanov]

From: Anton Baskanov

---
 dlls/dplayx/dplay.c        | 43 +++++++++++++++++++++++++++++++-------
 dlls/dplayx/dplay_global.h |  3 +++
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index ecdb4d9a2df..9f1153fed19 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -1153,6 +1153,16 @@ static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, cons
   /* FIXME: Should we validate the dwFlags? */
   lpGData->dwFlags = dwFlags;

+  /* Initialize the SP data section */
+  lpGData->lpSPPlayerData = DPSP_CreateSPPlayerData();
+  if ( !lpGData->lpSPPlayerData )
+  {
+    free( lpGData->nameA );
+    free( lpGData->name );
+    free( lpGData );
+    return NULL;
+  }
+
   TRACE( "Created group id 0x%08lx\n", *lpid );

return lpGData;
@@ -1180,6 +1190,7 @@ static void DP_DeleteGroup( IDirectPlayImpl *This, DPID dpid )
   }

/* Delete player */
+  free( lpGList->lpGData->lpSPPlayerData );
   free( lpGList->lpGData->nameA );
   free( lpGList->lpGData->name );
   free( lpGList->lpGData );
@@ -5971,42 +5982,58 @@ HRESULT dplay_create( REFIID riid, void **ppv )

HRESULT DP_GetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void **lplpData )
 {
+  struct GroupData *group;
   lpPlayerList lpPlayer;

EnterCriticalSection( &lpDP->lock );

lpPlayer = DP_FindPlayer( lpDP, idPlayer );
-  if( lpPlayer == NULL )
+  if( lpPlayer )
   {
+    *lplpData = lpPlayer->lpPData->lpSPPlayerData;
     LeaveCriticalSection( &lpDP->lock );
-    return DPERR_INVALIDPLAYER;
+    return DP_OK;
   }

-  *lplpData = lpPlayer->lpPData->lpSPPlayerData;
+  group = DP_FindAnyGroup( lpDP, idPlayer );
+  if( group )
+  {
+    *lplpData = group->lpSPPlayerData;
+    LeaveCriticalSection( &lpDP->lock );
+    return DP_OK;
+  }

LeaveCriticalSection( &lpDP->lock );

-  return DP_OK;
+  return DPERR_INVALIDPLAYER;
 }

HRESULT DP_SetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void *lpData )
 {
+  struct GroupData *group;
   lpPlayerList lpPlayer;

EnterCriticalSection( &lpDP->lock );

lpPlayer = DP_FindPlayer( lpDP, idPlayer );
-  if( lpPlayer == NULL )
+  if( lpPlayer )
   {
+    lpPlayer->lpPData->lpSPPlayerData = lpData;
     LeaveCriticalSection( &lpDP->lock );
-    return DPERR_INVALIDPLAYER;
+    return DP_OK;
   }

-  lpPlayer->lpPData->lpSPPlayerData = lpData;
+  group = DP_FindAnyGroup( lpDP, idPlayer );
+  if( group )
+  {
+    group->lpSPPlayerData = lpData;
+    LeaveCriticalSection( &lpDP->lock );
+    return DP_OK;
+  }

LeaveCriticalSection( &lpDP->lock );

-  return DP_OK;
+  return DPERR_INVALIDPLAYER;
 }

/***************************************************************************
diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h
index 360114320fd..74f20977c62 100644
--- a/dlls/dplayx/dplay_global.h
+++ b/dlls/dplayx/dplay_global.h
@@ -116,6 +116,9 @@ struct GroupData
   /* View of remote data */
   LPVOID lpRemoteData;
   DWORD  dwRemoteDataSize;
+
+  /* SP data on a per player basis */
+  LPVOID lpSPPlayerData;
 };
 typedef struct GroupData  GroupData;
 typedef struct GroupData* lpGroupData;