ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dplayx: Merge the IDirectPlay4_DeletePlayerFromGroup helper.

This commit is contained in:
Michael Stefaniuc 2013-03-29 16:52:30 +01:00 committed by Alexandre Julliard
parent 878a6a5a06
commit dfe8563d92
1 changed files with 54 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
dlls/dplayx/dplay.c
View File

@ -78,9 +78,6 @@ static BOOL CALLBACK cbRemoveGroupOrPlayer( DPID dpId, DWORD dwPlayerType,
static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid ); static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid );
/* Helper methods for player/group interfaces */ /* Helper methods for player/group interfaces */
static HRESULT DP_IF_DeletePlayerFromGroup
( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup,
DPID idPlayer, BOOL bAnsi );
static HRESULT DP_IF_CreatePlayer static HRESULT DP_IF_CreatePlayer
( IDirectPlay2Impl* This, LPVOID lpMsgHdr, LPDPID lpidPlayer, ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, LPDPID lpidPlayer,
LPDPNAME lpPlayerName, HANDLE hEvent, LPVOID lpData, LPDPNAME lpPlayerName, HANDLE hEvent, LPVOID lpData,
@ -1448,55 +1445,53 @@ static DPID DP_GetRemoteNextObjectId(void)
return DP_NextObjectId(); return DP_NextObjectId();
} }
static HRESULT DP_IF_DeletePlayerFromGroup static HRESULT WINAPI IDirectPlay4AImpl_DeletePlayerFromGroup( IDirectPlay4A *iface, DPID group,
( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, DPID player )
DPID idPlayer, BOOL bAnsi )
{ {
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
return IDirectPlayX_DeletePlayerFromGroup( &This->IDirectPlay4_iface, group, player );
}
static HRESULT WINAPI IDirectPlay4Impl_DeletePlayerFromGroup( IDirectPlay4 *iface, DPID group,
DPID player )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
lpGroupData lpGData; lpGroupData gdata;
lpPlayerList lpPList; lpPlayerList plist;
TRACE( "(%p)->(%p,0x%08x,0x%08x,%u)\n", TRACE( "(%p)->(0x%08x,0x%08x)\n", This, group, player );
This, lpMsgHdr, idGroup, idPlayer, bAnsi );
/* Find the group */ /* Find the group */
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL ) if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
{
return DPERR_INVALIDGROUP; return DPERR_INVALIDGROUP;
}
/* Find the player */ /* Find the player */
if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL ) if ( ( plist = DP_FindPlayer( This, player ) ) == NULL )
{
return DPERR_INVALIDPLAYER; return DPERR_INVALIDPLAYER;
}
/* Remove the player shortcut from the group */ /* Remove the player shortcut from the group */
DPQ_REMOVE_ENTRY( lpGData->players, players, lpPData->dpid, ==, idPlayer, lpPList ); DPQ_REMOVE_ENTRY( gdata->players, players, lpPData->dpid, ==, player, plist );
if( lpPList == NULL ) if ( !plist )
{
return DPERR_INVALIDPLAYER; return DPERR_INVALIDPLAYER;
}
/* One less reference */ /* One less reference */
lpPList->lpPData->uRef--; plist->lpPData->uRef--;
/* Delete the Player List element */ /* Delete the Player List element */
HeapFree( GetProcessHeap(), 0, lpPList ); HeapFree( GetProcessHeap(), 0, plist );
/* Inform the SP if they care */ /* Inform the SP if they care */
if( This->dp2->spData.lpCB->RemovePlayerFromGroup ) if ( This->dp2->spData.lpCB->RemovePlayerFromGroup )
{ {
DPSP_REMOVEPLAYERFROMGROUPDATA data; DPSP_REMOVEPLAYERFROMGROUPDATA data;
TRACE( "Calling SP RemovePlayerFromGroup\n" ); TRACE( "Calling SP RemovePlayerFromGroup\n" );
data.idPlayer = player;
data.idPlayer = idPlayer; data.idGroup = group;
data.idGroup = idGroup;
data.lpISP = This->dp2->spData.lpISP; data.lpISP = This->dp2->spData.lpISP;
hr = (*This->dp2->spData.lpCB->RemovePlayerFromGroup)( &data ); hr = (*This->dp2->spData.lpCB->RemovePlayerFromGroup)( &data );
} }
@ -1506,20 +1501,6 @@ static HRESULT DP_IF_DeletePlayerFromGroup
return hr; return hr;
} }
static HRESULT WINAPI IDirectPlay4AImpl_DeletePlayerFromGroup( IDirectPlay4A *iface, DPID idGroup,
DPID idPlayer )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
return DP_IF_DeletePlayerFromGroup( This, NULL, idGroup, idPlayer, TRUE );
}
static HRESULT WINAPI DirectPlay2WImpl_DeletePlayerFromGroup
( LPDIRECTPLAY2 iface, DPID idGroup, DPID idPlayer )
{
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_DeletePlayerFromGroup( This, NULL, idGroup, idPlayer, FALSE );
}
typedef struct _DPRGOPContext typedef struct _DPRGOPContext
{ {
IDirectPlay3Impl* This; IDirectPlay3Impl* This;
@ -1551,18 +1532,9 @@ cbRemoveGroupOrPlayer(
dpId, lpCtxt->idGroup ); dpId, lpCtxt->idGroup );
} }
} }
else else if ( FAILED( IDirectPlayX_DeletePlayerFromGroup( &lpCtxt->This->IDirectPlay4_iface,
{ lpCtxt->idGroup, dpId ) ) )
if( FAILED( DP_IF_DeletePlayerFromGroup( (IDirectPlay2Impl*)lpCtxt->This, ERR( "Unable to delete player 0x%08x from grp 0x%08x\n", dpId, lpCtxt->idGroup );
NULL, lpCtxt->idGroup,
dpId, lpCtxt->bAnsi )
)
)
{
ERR( "Unable to delete player 0x%08x from grp 0x%08x\n",
dpId, lpCtxt->idGroup );
}
}
return TRUE; /* Continue enumeration */ return TRUE; /* Continue enumeration */
} }
@ -1708,8 +1680,7 @@ cbDeletePlayerFromAllGroups(
if( dwPlayerType == DPPLAYERTYPE_GROUP ) if( dwPlayerType == DPPLAYERTYPE_GROUP )
{ {
DP_IF_DeletePlayerFromGroup( lpCtxt->This, NULL, dpId, lpCtxt->idPlayer, IDirectPlayX_DeletePlayerFromGroup( &lpCtxt->This->IDirectPlay4_iface, dpId, lpCtxt->idPlayer );
lpCtxt->bAnsi );
/* Enumerate all groups in this group since this will normally only /* Enumerate all groups in this group since this will normally only
* be called for top level groups * be called for top level groups
@ -4588,7 +4559,7 @@ static const IDirectPlay4Vtbl dp4_vt =
IDirectPlay4Impl_Close, IDirectPlay4Impl_Close,
XCAST(CreateGroup)DirectPlay2WImpl_CreateGroup, XCAST(CreateGroup)DirectPlay2WImpl_CreateGroup,
XCAST(CreatePlayer)DirectPlay2WImpl_CreatePlayer, XCAST(CreatePlayer)DirectPlay2WImpl_CreatePlayer,
XCAST(DeletePlayerFromGroup)DirectPlay2WImpl_DeletePlayerFromGroup, IDirectPlay4Impl_DeletePlayerFromGroup,
XCAST(DestroyGroup)DirectPlay2WImpl_DestroyGroup, XCAST(DestroyGroup)DirectPlay2WImpl_DestroyGroup,
XCAST(DestroyPlayer)DirectPlay2WImpl_DestroyPlayer, XCAST(DestroyPlayer)DirectPlay2WImpl_DestroyPlayer,
XCAST(EnumGroupPlayers)DirectPlay2WImpl_EnumGroupPlayers, XCAST(EnumGroupPlayers)DirectPlay2WImpl_EnumGroupPlayers,