zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-21 17:09:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

dplayx: Factor out a function for adding player to a group.

Browse source
This commit is contained in:
Anton Baskanov 2024-11-17 18:26:05 +07:00 committed by Alexandre Julliard
parent 434b5a148c
commit 91e5057906
Notes: Alexandre Julliard 2024-11-19 23:21:50 +01:00 
Approved-by: Alistair Leslie-Hughes (@alesliehughes)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/wine/merge_requests/6844
1 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
dlls/dplayx/dplay.c
View file

@ -1132,42 +1132,25 @@ static HRESULT WINAPI IDirectPlay4AImpl_AddPlayerToGroup( IDirectPlay4A *iface,
return IDirectPlayX_AddPlayerToGroup( &This->IDirectPlay4_iface, group, player ); return IDirectPlayX_AddPlayerToGroup( &This->IDirectPlay4_iface, group, player );
} }
static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DPID group, static HRESULT DP_AddPlayerToGroup( IDirectPlayImpl *This, DPID group, DPID player )
DPID player )
{ {
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
lpGroupData gdata; lpGroupData gdata;
lpPlayerList plist; lpPlayerList plist;
lpPlayerList newplist; lpPlayerList newplist;
HRESULT hr;
TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, group, player );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
return DPERR_UNINITIALIZED;
EnterCriticalSection( &This->lock );
/* Find the group */ /* Find the group */
if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL ) if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
{
LeaveCriticalSection( &This->lock );
return DPERR_INVALIDGROUP; return DPERR_INVALIDGROUP;
}
/* Find the player */ /* Find the player */
if ( ( plist = DP_FindPlayer( This, player ) ) == NULL ) if ( ( plist = DP_FindPlayer( This, player ) ) == NULL )
{
LeaveCriticalSection( &This->lock );
return DPERR_INVALIDPLAYER; return DPERR_INVALIDPLAYER;
}
/* Create a player list (ie "shortcut" ) */ /* Create a player list (ie "shortcut" ) */
newplist = calloc( 1, sizeof( *newplist ) ); newplist = calloc( 1, sizeof( *newplist ) );
if ( !newplist ) if ( !newplist )
{
LeaveCriticalSection( &This->lock );
return DPERR_CANTADDPLAYER; return DPERR_CANTADDPLAYER;
}
/* Add the shortcut */ /* Add the shortcut */
plist->lpPData->uRef++; plist->lpPData->uRef++;
@ -1187,7 +1170,37 @@ static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DP
data.idGroup = group; data.idGroup = group;
data.lpISP = This->dp2->spData.lpISP; data.lpISP = This->dp2->spData.lpISP;
(*This->dp2->spData.lpCB->AddPlayerToGroup)( &data ); hr = (*This->dp2->spData.lpCB->AddPlayerToGroup)( &data );
if ( FAILED( hr ) )
{
DPQ_REMOVE( gdata->players, newplist, players );
--plist->lpPData->uRef;
free( newplist );
return hr;
}
}
return DP_OK;
}
static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DPID group,
DPID player )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
HRESULT hr;
TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, group, player );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
return DPERR_UNINITIALIZED;
EnterCriticalSection( &This->lock );
hr = DP_AddPlayerToGroup( This, group, player );
if ( FAILED( hr ) )
{
LeaveCriticalSection( &This->lock );
return hr;
} }
/* Inform all other peers of the addition of player to the group. If there are /* Inform all other peers of the addition of player to the group. If there are