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

dplayx: Assimilate the inherited methods into IDirectPlay4A.

This commit is contained in:
Michael Stefaniuc 2013-03-29 16:44:15 +01:00 committed by Alexandre Julliard
parent f19968a57c
commit 5922ad98cb
1 changed files with 131 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

282
dlls/dplayx/dplay.c
View File

@ -701,8 +701,8 @@ static HRESULT DP_IF_AddPlayerToGroup
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_AddPlayerToGroup static HRESULT WINAPI IDirectPlay4AImpl_AddPlayerToGroup( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY2A iface, DPID idGroup, DPID idPlayer ) DPID idPlayer )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_AddPlayerToGroup( This, NULL, idGroup, idPlayer, TRUE ); return DP_IF_AddPlayerToGroup( This, NULL, idGroup, idPlayer, TRUE );
@ -747,8 +747,7 @@ static HRESULT DP_IF_Close( IDirectPlay2Impl* This, BOOL bAnsi )
return hr; return hr;
} }
static HRESULT WINAPI DirectPlay2AImpl_Close static HRESULT WINAPI IDirectPlay4AImpl_Close( IDirectPlay4A *iface )
( LPDIRECTPLAY2A iface )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_Close( This, TRUE ); return DP_IF_Close( This, TRUE );
@ -968,9 +967,8 @@ static HRESULT DP_IF_CreateGroup
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_CreateGroup static HRESULT WINAPI IDirectPlay4AImpl_CreateGroup( IDirectPlay4A *iface, DPID *lpidGroup,
( LPDIRECTPLAY2A iface, LPDPID lpidGroup, LPDPNAME lpGroupName, DPNAME *lpGroupName, void *lpData, DWORD dwDataSize, DWORD dwFlags )
LPVOID lpData, DWORD dwDataSize, DWORD dwFlags )
{ {
*lpidGroup = DPID_UNKNOWN; *lpidGroup = DPID_UNKNOWN;
@ -1449,9 +1447,8 @@ static HRESULT DP_IF_CreatePlayer
return hr; return hr;
} }
static HRESULT WINAPI DirectPlay2AImpl_CreatePlayer static HRESULT WINAPI IDirectPlay4AImpl_CreatePlayer( IDirectPlay4A *iface, DPID *lpidPlayer,
( LPDIRECTPLAY2A iface, LPDPID lpidPlayer, LPDPNAME lpPlayerName, DPNAME *lpPlayerName, HANDLE hEvent, void *lpData, DWORD dwDataSize, DWORD dwFlags )
HANDLE hEvent, LPVOID lpData, DWORD dwDataSize, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
@ -1563,8 +1560,8 @@ static HRESULT DP_IF_DeletePlayerFromGroup
return hr; return hr;
} }
static HRESULT WINAPI DirectPlay2AImpl_DeletePlayerFromGroup static HRESULT WINAPI IDirectPlay4AImpl_DeletePlayerFromGroup( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY2A iface, DPID idGroup, DPID idPlayer ) DPID idPlayer )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_DeletePlayerFromGroup( This, NULL, idGroup, idPlayer, TRUE ); return DP_IF_DeletePlayerFromGroup( This, NULL, idGroup, idPlayer, TRUE );
@ -1682,8 +1679,7 @@ static HRESULT DP_IF_DestroyGroup
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_DestroyGroup static HRESULT WINAPI IDirectPlay4AImpl_DestroyGroup( IDirectPlay4A *iface, DPID idGroup )
( LPDIRECTPLAY2A iface, DPID idGroup )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_DestroyGroup( This, NULL, idGroup, TRUE ); return DP_IF_DestroyGroup( This, NULL, idGroup, TRUE );
@ -1787,8 +1783,7 @@ cbDeletePlayerFromAllGroups(
return TRUE; return TRUE;
} }
static HRESULT WINAPI DirectPlay2AImpl_DestroyPlayer static HRESULT WINAPI IDirectPlay4AImpl_DestroyPlayer( IDirectPlay4A *iface, DPID idPlayer )
( LPDIRECTPLAY2A iface, DPID idPlayer )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_DestroyPlayer( This, NULL, idPlayer, TRUE ); return DP_IF_DestroyPlayer( This, NULL, idPlayer, TRUE );
@ -1866,10 +1861,9 @@ static HRESULT DP_IF_EnumGroupPlayers
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_EnumGroupPlayers static HRESULT WINAPI IDirectPlay4AImpl_EnumGroupPlayers( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY2A iface, DPID idGroup, LPGUID lpguidInstance, GUID *lpguidInstance, LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2,
LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, void *lpContext, DWORD dwFlags )
LPVOID lpContext, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_EnumGroupPlayers( This, idGroup, lpguidInstance, return DP_IF_EnumGroupPlayers( This, idGroup, lpguidInstance,
@ -2181,10 +2175,9 @@ static HRESULT DP_IF_EnumSessions
return hr; return hr;
} }
static HRESULT WINAPI DirectPlay2AImpl_EnumSessions static HRESULT WINAPI IDirectPlay4AImpl_EnumSessions( IDirectPlay4A *iface, DPSESSIONDESC2 *lpsd,
( LPDIRECTPLAY2A iface, LPDPSESSIONDESC2 lpsd, DWORD dwTimeout, DWORD dwTimeout, LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2, void *lpContext,
LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2, DWORD dwFlags )
LPVOID lpContext, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_EnumSessions( This, lpsd, dwTimeout, lpEnumSessionsCallback2, return DP_IF_EnumSessions( This, lpsd, dwTimeout, lpEnumSessionsCallback2,
@ -2229,8 +2222,8 @@ static HRESULT DP_IF_GetCaps
return DP_IF_GetPlayerCaps( This, DPID_ALLPLAYERS, lpDPCaps, dwFlags ); return DP_IF_GetPlayerCaps( This, DPID_ALLPLAYERS, lpDPCaps, dwFlags );
} }
static HRESULT WINAPI DirectPlay2AImpl_GetCaps static HRESULT WINAPI IDirectPlay4AImpl_GetCaps( IDirectPlay4A *iface, DPCAPS *lpDPCaps,
( LPDIRECTPLAY2A iface, LPDPCAPS lpDPCaps, DWORD dwFlags ) DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_GetCaps( This, lpDPCaps, dwFlags ); return DP_IF_GetCaps( This, lpDPCaps, dwFlags );
@ -2285,9 +2278,8 @@ static HRESULT DP_IF_GetGroupData
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_GetGroupData static HRESULT WINAPI IDirectPlay4AImpl_GetGroupData( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY2A iface, DPID idGroup, LPVOID lpData, void *lpData, DWORD *lpdwDataSize, DWORD dwFlags )
LPDWORD lpdwDataSize, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_GetGroupData( This, idGroup, lpData, lpdwDataSize, return DP_IF_GetGroupData( This, idGroup, lpData, lpdwDataSize,
@ -2365,9 +2357,8 @@ static HRESULT DP_IF_GetGroupName
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_GetGroupName static HRESULT WINAPI IDirectPlay4AImpl_GetGroupName( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY2A iface, DPID idGroup, LPVOID lpData, void *lpData, DWORD *lpdwDataSize )
LPDWORD lpdwDataSize )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_GetGroupName( This, idGroup, lpData, lpdwDataSize, TRUE ); return DP_IF_GetGroupName( This, idGroup, lpData, lpdwDataSize, TRUE );
@ -2393,12 +2384,12 @@ static HRESULT WINAPI IDirectPlay4Impl_GetMessageCount( IDirectPlay4 *iface, DPI
return IDirectPlayX_GetMessageQueue( iface, 0, player, DPMESSAGEQUEUE_RECEIVE, count, NULL ); return IDirectPlayX_GetMessageQueue( iface, 0, player, DPMESSAGEQUEUE_RECEIVE, count, NULL );
} }
static HRESULT WINAPI DirectPlay2AImpl_GetPlayerAddress static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerAddress( IDirectPlay4A *iface, DPID player,
( LPDIRECTPLAY2A iface, DPID idPlayer, LPVOID lpData, LPDWORD lpdwDataSize ) void *data, DWORD *size )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
FIXME("(%p)->(0x%08x,%p,%p): stub\n", This, idPlayer, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,%p,%p): stub\n", This, player, data, size );
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2WImpl_GetPlayerAddress static HRESULT WINAPI DirectPlay2WImpl_GetPlayerAddress
@ -2409,9 +2400,8 @@ static HRESULT WINAPI DirectPlay2WImpl_GetPlayerAddress
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_GetPlayerCaps static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerCaps( IDirectPlay4A *iface, DPID idPlayer,
( LPDIRECTPLAY2A iface, DPID idPlayer, LPDPCAPS lpPlayerCaps, DPCAPS *lpPlayerCaps, DWORD dwFlags )
DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_GetPlayerCaps( This, idPlayer, lpPlayerCaps, dwFlags ); return DP_IF_GetPlayerCaps( This, idPlayer, lpPlayerCaps, dwFlags );
@ -2472,9 +2462,8 @@ static HRESULT DP_IF_GetPlayerData
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_GetPlayerData static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerData( IDirectPlay4A *iface, DPID idPlayer,
( LPDIRECTPLAY2A iface, DPID idPlayer, LPVOID lpData, void *lpData, DWORD *lpdwDataSize, DWORD dwFlags )
LPDWORD lpdwDataSize, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_GetPlayerData( This, idPlayer, lpData, lpdwDataSize, return DP_IF_GetPlayerData( This, idPlayer, lpData, lpdwDataSize,
@ -2557,9 +2546,8 @@ static HRESULT DP_IF_GetPlayerName
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_GetPlayerName static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerName( IDirectPlay4A *iface, DPID idPlayer,
( LPDIRECTPLAY2A iface, DPID idPlayer, LPVOID lpData, void *lpData, DWORD *lpdwDataSize )
LPDWORD lpdwDataSize )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_GetPlayerName( This, idPlayer, lpData, lpdwDataSize, TRUE ); return DP_IF_GetPlayerName( This, idPlayer, lpData, lpdwDataSize, TRUE );
@ -2607,8 +2595,8 @@ static HRESULT DP_GetSessionDesc
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_GetSessionDesc static HRESULT WINAPI IDirectPlay4AImpl_GetSessionDesc( IDirectPlay4A *iface, void *lpData,
( LPDIRECTPLAY2A iface, LPVOID lpData, LPDWORD lpdwDataSize ) DWORD *lpdwDataSize )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_GetSessionDesc( This, lpData, lpdwDataSize, TRUE ); return DP_GetSessionDesc( This, lpData, lpdwDataSize, TRUE );
@ -2622,12 +2610,11 @@ static HRESULT WINAPI DirectPlay2WImpl_GetSessionDesc
} }
/* Intended only for COM compatibility. Always returns an error. */ /* Intended only for COM compatibility. Always returns an error. */
static HRESULT WINAPI DirectPlay2AImpl_Initialize static HRESULT WINAPI IDirectPlay4AImpl_Initialize( IDirectPlay4A *iface, GUID *guid )
( LPDIRECTPLAY2A iface, LPGUID lpGUID )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
TRACE("(%p)->(%p): stub\n", This, lpGUID ); TRACE("(%p)->(%p): no-op\n", This, guid );
return DPERR_ALREADYINITIALIZED; return DPERR_ALREADYINITIALIZED;
} }
/* Intended only for COM compatibility. Always returns an error. */ /* Intended only for COM compatibility. Always returns an error. */
@ -2822,9 +2809,8 @@ static HRESULT DP_IF_Receive
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_Receive static HRESULT WINAPI IDirectPlay4AImpl_Receive( IDirectPlay4A *iface, DPID *lpidFrom,
( LPDIRECTPLAY2A iface, LPDPID lpidFrom, LPDPID lpidTo, DPID *lpidTo, DWORD dwFlags, void *lpData, DWORD *lpdwDataSize )
DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_Receive( This, lpidFrom, lpidTo, dwFlags, return DP_IF_Receive( This, lpidFrom, lpidTo, dwFlags,
@ -2896,9 +2882,8 @@ static HRESULT DP_IF_SetGroupData
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_SetGroupData static HRESULT WINAPI IDirectPlay4AImpl_SetGroupData( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY2A iface, DPID idGroup, LPVOID lpData, void *lpData, DWORD dwDataSize, DWORD dwFlags )
DWORD dwDataSize, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_SetGroupData( This, idGroup, lpData, dwDataSize, dwFlags, TRUE ); return DP_IF_SetGroupData( This, idGroup, lpData, dwDataSize, dwFlags, TRUE );
@ -2934,9 +2919,8 @@ static HRESULT DP_IF_SetGroupName
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_SetGroupName static HRESULT WINAPI IDirectPlay4AImpl_SetGroupName( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY2A iface, DPID idGroup, LPDPNAME lpGroupName, DPNAME *lpGroupName, DWORD dwFlags )
DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_SetGroupName( This, idGroup, lpGroupName, dwFlags, TRUE ); return DP_IF_SetGroupName( This, idGroup, lpGroupName, dwFlags, TRUE );
@ -2996,9 +2980,8 @@ static HRESULT DP_IF_SetPlayerData
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_SetPlayerData static HRESULT WINAPI IDirectPlay4AImpl_SetPlayerData( IDirectPlay4A *iface, DPID idPlayer,
( LPDIRECTPLAY2A iface, DPID idPlayer, LPVOID lpData, void *lpData, DWORD dwDataSize, DWORD dwFlags )
DWORD dwDataSize, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_SetPlayerData( This, idPlayer, lpData, dwDataSize, return DP_IF_SetPlayerData( This, idPlayer, lpData, dwDataSize,
@ -3041,9 +3024,8 @@ static HRESULT DP_IF_SetPlayerName
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_SetPlayerName static HRESULT WINAPI IDirectPlay4AImpl_SetPlayerName( IDirectPlay4A *iface, DPID idPlayer,
( LPDIRECTPLAY2A iface, DPID idPlayer, LPDPNAME lpPlayerName, DPNAME *lpPlayerName, DWORD dwFlags )
DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_SetPlayerName( This, idPlayer, lpPlayerName, dwFlags, TRUE ); return DP_IF_SetPlayerName( This, idPlayer, lpPlayerName, dwFlags, TRUE );
@ -3115,8 +3097,8 @@ static HRESULT DP_SetSessionDesc
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay2AImpl_SetSessionDesc static HRESULT WINAPI IDirectPlay4AImpl_SetSessionDesc( IDirectPlay4A *iface,
( LPDIRECTPLAY2A iface, LPDPSESSIONDESC2 lpSessDesc, DWORD dwFlags ) DPSESSIONDESC2 *lpSessDesc, DWORD dwFlags )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_SetSessionDesc( This, lpSessDesc, dwFlags, FALSE, TRUE ); return DP_SetSessionDesc( This, lpSessDesc, dwFlags, FALSE, TRUE );
@ -3271,8 +3253,8 @@ static HRESULT DP_IF_AddGroupToGroup
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_AddGroupToGroup static HRESULT WINAPI IDirectPlay4AImpl_AddGroupToGroup( IDirectPlay4A *iface, DPID idParentGroup,
( LPDIRECTPLAY3A iface, DPID idParentGroup, DPID idGroup ) DPID idGroup )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
return DP_IF_AddGroupToGroup( This, idParentGroup, idGroup ); return DP_IF_AddGroupToGroup( This, idParentGroup, idGroup );
@ -3379,10 +3361,9 @@ static HRESULT DP_IF_CreateGroupInGroup
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_CreateGroupInGroup static HRESULT WINAPI IDirectPlay4AImpl_CreateGroupInGroup( IDirectPlay4A *iface,
( LPDIRECTPLAY3A iface, DPID idParentGroup, LPDPID lpidGroup, DPID idParentGroup, DPID *lpidGroup, DPNAME *lpGroupName, void *lpData, DWORD dwDataSize,
LPDPNAME lpGroupName, LPVOID lpData, DWORD dwDataSize, DWORD dwFlags )
DWORD dwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
@ -3441,8 +3422,8 @@ static HRESULT DP_IF_DeleteGroupFromGroup
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_DeleteGroupFromGroup static HRESULT WINAPI IDirectPlay4AImpl_DeleteGroupFromGroup( IDirectPlay4A *iface,
( LPDIRECTPLAY3 iface, DPID idParentGroup, DPID idGroup ) DPID idParentGroup, DPID idGroup )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
return DP_IF_DeleteGroupFromGroup( This, idParentGroup, idGroup ); return DP_IF_DeleteGroupFromGroup( This, idParentGroup, idGroup );
@ -3492,8 +3473,9 @@ static BOOL DP_BuildSPCompoundAddr( LPGUID lpcSpGuid, LPVOID* lplpAddrBuf,
return TRUE; return TRUE;
} }
static HRESULT WINAPI DirectPlay3AImpl_EnumConnections static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface,
( LPDIRECTPLAY3A iface, LPCGUID lpguidApplication, LPDPENUMCONNECTIONSCALLBACK lpEnumCallback, LPVOID lpContext, DWORD dwFlags ) const GUID *lpguidApplication, LPDPENUMCONNECTIONSCALLBACK lpEnumCallback, void *lpContext,
DWORD dwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
TRACE("(%p)->(%p,%p,%p,0x%08x)\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags ); TRACE("(%p)->(%p,%p,%p,0x%08x)\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags );
@ -3785,10 +3767,9 @@ static HRESULT DP_IF_EnumGroupsInGroup
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_EnumGroupsInGroup static HRESULT WINAPI IDirectPlay4AImpl_EnumGroupsInGroup( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY3A iface, DPID idGroup, LPGUID lpguidInstance, GUID *lpguidInstance, LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, void *lpContext,
LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, LPVOID lpContext, DWORD dwFlags )
DWORD dwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
return DP_IF_EnumGroupsInGroup( This, idGroup, lpguidInstance, return DP_IF_EnumGroupsInGroup( This, idGroup, lpguidInstance,
@ -3807,12 +3788,12 @@ static HRESULT WINAPI DirectPlay3WImpl_EnumGroupsInGroup
FALSE ); FALSE );
} }
static HRESULT WINAPI DirectPlay3AImpl_GetGroupConnectionSettings static HRESULT WINAPI IDirectPlay4AImpl_GetGroupConnectionSettings( IDirectPlay4A *iface,
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize ) DWORD flags, DPID group, void *data, DWORD *size )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, dwFlags, idGroup, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, flags, group, data, size );
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3WImpl_GetGroupConnectionSettings static HRESULT WINAPI DirectPlay3WImpl_GetGroupConnectionSettings
@ -4137,8 +4118,8 @@ static HRESULT DP_IF_InitializeConnection
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_InitializeConnection static HRESULT WINAPI IDirectPlay4AImpl_InitializeConnection( IDirectPlay4A *iface,
( LPDIRECTPLAY3A iface, LPVOID lpConnection, DWORD dwFlags ) void *lpConnection, DWORD dwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
@ -4165,9 +4146,9 @@ static HRESULT WINAPI DirectPlay3WImpl_InitializeConnection
return DP_IF_InitializeConnection( This, lpConnection, dwFlags, FALSE ); return DP_IF_InitializeConnection( This, lpConnection, dwFlags, FALSE );
} }
static HRESULT WINAPI DirectPlay3AImpl_SecureOpen static HRESULT WINAPI IDirectPlay4AImpl_SecureOpen( IDirectPlay4A *iface,
( LPDIRECTPLAY3A iface, LPCDPSESSIONDESC2 lpsd, DWORD dwFlags, const DPSESSIONDESC2 *lpsd, DWORD dwFlags, const DPSECURITYDESC *lpSecurity,
LPCDPSECURITYDESC lpSecurity, LPCDPCREDENTIALS lpCredentials ) const DPCREDENTIALS *lpCredentials )
{ {
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; /* Yes a dp 2 interface */ IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; /* Yes a dp 2 interface */
return DP_SecureOpen( This, lpsd, dwFlags, lpSecurity, lpCredentials, TRUE ); return DP_SecureOpen( This, lpsd, dwFlags, lpSecurity, lpCredentials, TRUE );
@ -4181,12 +4162,12 @@ static HRESULT WINAPI DirectPlay3WImpl_SecureOpen
return DP_SecureOpen( This, lpsd, dwFlags, lpSecurity, lpCredentials, FALSE ); return DP_SecureOpen( This, lpsd, dwFlags, lpSecurity, lpCredentials, FALSE );
} }
static HRESULT WINAPI DirectPlay3AImpl_SendChatMessage static HRESULT WINAPI IDirectPlay4AImpl_SendChatMessage( IDirectPlay4A *iface, DPID from,
( LPDIRECTPLAY3A iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPDPCHAT lpChatMessage ) DPID to, DWORD flags, DPCHAT *chatmsg )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08x,0x%08x,0x%08x,%p): stub\n", This, idFrom, idTo, dwFlags, lpChatMessage ); FIXME("(%p)->(0x%08x,0x%08x,0x%08x,%p): stub\n", This, from, to, flags, chatmsg );
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3WImpl_SendChatMessage static HRESULT WINAPI DirectPlay3WImpl_SendChatMessage
@ -4197,12 +4178,12 @@ static HRESULT WINAPI DirectPlay3WImpl_SendChatMessage
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_SetGroupConnectionSettings static HRESULT WINAPI IDirectPlay4AImpl_SetGroupConnectionSettings( IDirectPlay4A *iface,
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup, LPDPLCONNECTION lpConnection ) DWORD flags, DPID group, DPLCONNECTION *connection )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08x,0x%08x,%p): stub\n", This, dwFlags, idGroup, lpConnection ); FIXME("(%p)->(0x%08x,0x%08x,%p): stub\n", This, flags, group, connection );
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3WImpl_SetGroupConnectionSettings static HRESULT WINAPI DirectPlay3WImpl_SetGroupConnectionSettings
@ -4213,8 +4194,8 @@ static HRESULT WINAPI DirectPlay3WImpl_SetGroupConnectionSettings
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_StartSession static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWORD dwFlags,
( LPDIRECTPLAY3A iface, DWORD dwFlags, DPID idGroup ) DPID idGroup )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, dwFlags, idGroup ); FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, dwFlags, idGroup );
@ -4229,8 +4210,8 @@ static HRESULT WINAPI DirectPlay3WImpl_StartSession
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_GetGroupFlags static HRESULT WINAPI IDirectPlay4AImpl_GetGroupFlags( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY3A iface, DPID idGroup, LPDWORD lpdwFlags ) DWORD *lpdwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpdwFlags ); FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpdwFlags );
@ -4263,8 +4244,8 @@ static HRESULT DP_IF_GetGroupParent
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_GetGroupParent static HRESULT WINAPI IDirectPlay4AImpl_GetGroupParent( IDirectPlay4A *iface, DPID idGroup,
( LPDIRECTPLAY3A iface, DPID idGroup, LPDPID lpidGroup ) DPID *lpidGroup )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
return DP_IF_GetGroupParent( This, idGroup, lpidGroup, TRUE ); return DP_IF_GetGroupParent( This, idGroup, lpidGroup, TRUE );
@ -4276,12 +4257,12 @@ static HRESULT WINAPI DirectPlay3WImpl_GetGroupParent
return DP_IF_GetGroupParent( This, idGroup, lpidGroup, FALSE ); return DP_IF_GetGroupParent( This, idGroup, lpidGroup, FALSE );
} }
static HRESULT WINAPI DirectPlay3AImpl_GetPlayerAccount static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerAccount( IDirectPlay4A *iface, DPID player,
( LPDIRECTPLAY3A iface, DPID idPlayer, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize ) DWORD flags, void *data, DWORD *size )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, idPlayer, dwFlags, lpData, lpdwDataSize ); FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, player, flags, data, size );
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3WImpl_GetPlayerAccount static HRESULT WINAPI DirectPlay3WImpl_GetPlayerAccount
@ -4292,8 +4273,8 @@ static HRESULT WINAPI DirectPlay3WImpl_GetPlayerAccount
return DP_OK; return DP_OK;
} }
static HRESULT WINAPI DirectPlay3AImpl_GetPlayerFlags static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerFlags( IDirectPlay4A *iface, DPID idPlayer,
( LPDIRECTPLAY3A iface, DPID idPlayer, LPDWORD lpdwFlags ) DWORD *lpdwFlags )
{ {
IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
FIXME("(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwFlags ); FIXME("(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwFlags );
@ -4734,51 +4715,50 @@ static const IDirectPlay4Vtbl directPlay4AVT =
XCAST(AddRef)DP_AddRef, XCAST(AddRef)DP_AddRef,
XCAST(Release)DP_Release, XCAST(Release)DP_Release,
XCAST(AddPlayerToGroup)DirectPlay2AImpl_AddPlayerToGroup, IDirectPlay4AImpl_AddPlayerToGroup,
XCAST(Close)DirectPlay2AImpl_Close, IDirectPlay4AImpl_Close,
XCAST(CreateGroup)DirectPlay2AImpl_CreateGroup, IDirectPlay4AImpl_CreateGroup,
XCAST(CreatePlayer)DirectPlay2AImpl_CreatePlayer, IDirectPlay4AImpl_CreatePlayer,
XCAST(DeletePlayerFromGroup)DirectPlay2AImpl_DeletePlayerFromGroup, IDirectPlay4AImpl_DeletePlayerFromGroup,
XCAST(DestroyGroup)DirectPlay2AImpl_DestroyGroup, IDirectPlay4AImpl_DestroyGroup,
XCAST(DestroyPlayer)DirectPlay2AImpl_DestroyPlayer, IDirectPlay4AImpl_DestroyPlayer,
XCAST(EnumGroupPlayers)DirectPlay2AImpl_EnumGroupPlayers, IDirectPlay4AImpl_EnumGroupPlayers,
IDirectPlay4AImpl_EnumGroups, IDirectPlay4AImpl_EnumGroups,
IDirectPlay4AImpl_EnumPlayers, IDirectPlay4AImpl_EnumPlayers,
XCAST(EnumSessions)DirectPlay2AImpl_EnumSessions, IDirectPlay4AImpl_EnumSessions,
XCAST(GetCaps)DirectPlay2AImpl_GetCaps, IDirectPlay4AImpl_GetCaps,
XCAST(GetGroupData)DirectPlay2AImpl_GetGroupData, IDirectPlay4AImpl_GetGroupData,
XCAST(GetGroupName)DirectPlay2AImpl_GetGroupName, IDirectPlay4AImpl_GetGroupName,
IDirectPlay4AImpl_GetMessageCount, IDirectPlay4AImpl_GetMessageCount,
XCAST(GetPlayerAddress)DirectPlay2AImpl_GetPlayerAddress, IDirectPlay4AImpl_GetPlayerAddress,
XCAST(GetPlayerCaps)DirectPlay2AImpl_GetPlayerCaps, IDirectPlay4AImpl_GetPlayerCaps,
XCAST(GetPlayerData)DirectPlay2AImpl_GetPlayerData, IDirectPlay4AImpl_GetPlayerData,
XCAST(GetPlayerName)DirectPlay2AImpl_GetPlayerName, IDirectPlay4AImpl_GetPlayerName,
XCAST(GetSessionDesc)DirectPlay2AImpl_GetSessionDesc, IDirectPlay4AImpl_GetSessionDesc,
XCAST(Initialize)DirectPlay2AImpl_Initialize, IDirectPlay4AImpl_Initialize,
IDirectPlay4AImpl_Open, IDirectPlay4AImpl_Open,
XCAST(Receive)DirectPlay2AImpl_Receive, IDirectPlay4AImpl_Receive,
IDirectPlay4AImpl_Send, IDirectPlay4AImpl_Send,
XCAST(SetGroupData)DirectPlay2AImpl_SetGroupData, IDirectPlay4AImpl_SetGroupData,
XCAST(SetGroupName)DirectPlay2AImpl_SetGroupName, IDirectPlay4AImpl_SetGroupName,
XCAST(SetPlayerData)DirectPlay2AImpl_SetPlayerData, IDirectPlay4AImpl_SetPlayerData,
XCAST(SetPlayerName)DirectPlay2AImpl_SetPlayerName, IDirectPlay4AImpl_SetPlayerName,
XCAST(SetSessionDesc)DirectPlay2AImpl_SetSessionDesc, IDirectPlay4AImpl_SetSessionDesc,
IDirectPlay4AImpl_AddGroupToGroup,
XCAST(AddGroupToGroup)DirectPlay3AImpl_AddGroupToGroup, IDirectPlay4AImpl_CreateGroupInGroup,
XCAST(CreateGroupInGroup)DirectPlay3AImpl_CreateGroupInGroup, IDirectPlay4AImpl_DeleteGroupFromGroup,
XCAST(DeleteGroupFromGroup)DirectPlay3AImpl_DeleteGroupFromGroup, IDirectPlay4AImpl_EnumConnections,
XCAST(EnumConnections)DirectPlay3AImpl_EnumConnections, IDirectPlay4AImpl_EnumGroupsInGroup,
XCAST(EnumGroupsInGroup)DirectPlay3AImpl_EnumGroupsInGroup, IDirectPlay4AImpl_GetGroupConnectionSettings,
XCAST(GetGroupConnectionSettings)DirectPlay3AImpl_GetGroupConnectionSettings, IDirectPlay4AImpl_InitializeConnection,
XCAST(InitializeConnection)DirectPlay3AImpl_InitializeConnection, IDirectPlay4AImpl_SecureOpen,
XCAST(SecureOpen)DirectPlay3AImpl_SecureOpen, IDirectPlay4AImpl_SendChatMessage,
XCAST(SendChatMessage)DirectPlay3AImpl_SendChatMessage, IDirectPlay4AImpl_SetGroupConnectionSettings,
XCAST(SetGroupConnectionSettings)DirectPlay3AImpl_SetGroupConnectionSettings, IDirectPlay4AImpl_StartSession,
XCAST(StartSession)DirectPlay3AImpl_StartSession, IDirectPlay4AImpl_GetGroupFlags,
XCAST(GetGroupFlags)DirectPlay3AImpl_GetGroupFlags, IDirectPlay4AImpl_GetGroupParent,
XCAST(GetGroupParent)DirectPlay3AImpl_GetGroupParent, IDirectPlay4AImpl_GetPlayerAccount,
XCAST(GetPlayerAccount)DirectPlay3AImpl_GetPlayerAccount, IDirectPlay4AImpl_GetPlayerFlags,
XCAST(GetPlayerFlags)DirectPlay3AImpl_GetPlayerFlags,
DirectPlay4AImpl_GetGroupOwner, DirectPlay4AImpl_GetGroupOwner,
DirectPlay4AImpl_SetGroupOwner, DirectPlay4AImpl_SetGroupOwner,