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

dplayx: Merge the IDirectPlay4_EnumSessions helper.

This commit is contained in:
Michael Stefaniuc 2013-03-29 17:04:20 +01:00 committed by Alexandre Julliard
parent 5dc2b8f69c
commit 31065c62d4
1 changed files with 112 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
dlls/dplayx/dplay.c
View File

@ -130,10 +130,6 @@ static HRESULT DP_SP_SendEx
static HRESULT DP_IF_CancelMessage static HRESULT DP_IF_CancelMessage
( IDirectPlay4Impl* This, DWORD dwMsgID, DWORD dwFlags, ( IDirectPlay4Impl* This, DWORD dwMsgID, DWORD dwFlags,
DWORD dwMinPriority, DWORD dwMaxPriority, BOOL bAnsi ); DWORD dwMinPriority, DWORD dwMaxPriority, BOOL bAnsi );
static HRESULT DP_IF_EnumSessions
( IDirectPlay2Impl* This, LPDPSESSIONDESC2 lpsd, DWORD dwTimeout,
LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2,
LPVOID lpContext, DWORD dwFlags, BOOL bAnsi );
static BOOL CALLBACK cbDPCreateEnumConnections( LPCGUID lpguidSP, static BOOL CALLBACK cbDPCreateEnumConnections( LPCGUID lpguidSP,
LPVOID lpConnection, DWORD dwConnectionSize, LPCDPNAME lpName, LPVOID lpConnection, DWORD dwConnectionSize, LPCDPNAME lpName,
DWORD dwFlags, LPVOID lpContext ); DWORD dwFlags, LPVOID lpContext );
@ -1826,28 +1822,32 @@ static void DP_KillEnumSessionThread( IDirectPlay2Impl* This )
} }
} }
static HRESULT DP_IF_EnumSessions static HRESULT WINAPI IDirectPlay4AImpl_EnumSessions( IDirectPlay4A *iface, DPSESSIONDESC2 *sdesc,
( IDirectPlay2Impl* This, LPDPSESSIONDESC2 lpsd, DWORD dwTimeout, DWORD timeout, LPDPENUMSESSIONSCALLBACK2 enumsessioncb, void *context, DWORD flags )
LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2,
LPVOID lpContext, DWORD dwFlags, BOOL bAnsi )
{ {
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
return IDirectPlayX_EnumSessions( &This->IDirectPlay4_iface, sdesc, timeout, enumsessioncb,
context, flags );
}
static HRESULT WINAPI IDirectPlay4Impl_EnumSessions( IDirectPlay4 *iface, DPSESSIONDESC2 *sdesc,
DWORD timeout, LPDPENUMSESSIONSCALLBACK2 enumsessioncb, void *context, DWORD flags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
void *connection;
DWORD size;
HRESULT hr = DP_OK; HRESULT hr = DP_OK;
TRACE( "(%p)->(%p,0x%08x,%p,%p,0x%08x,%u)\n", TRACE( "(%p)->(%p,0x%08x,%p,%p,0x%08x)\n", This, sdesc, timeout, enumsessioncb,
This, lpsd, dwTimeout, lpEnumSessionsCallback2, lpContext, dwFlags, context, flags );
bAnsi );
if ( This->dp2->connectionInitialized == NO_PROVIDER ) if ( This->dp2->connectionInitialized == NO_PROVIDER )
{
return DPERR_UNINITIALIZED; return DPERR_UNINITIALIZED;
}
/* Can't enumerate if the interface is already open */ /* Can't enumerate if the interface is already open */
if ( This->dp2->bConnectionOpen ) if ( This->dp2->bConnectionOpen )
{
return DPERR_GENERIC; return DPERR_GENERIC;
}
#if 1
/* The loading of a lobby provider _seems_ to require a backdoor loading /* The loading of a lobby provider _seems_ to require a backdoor loading
* of the service provider to also associate with this DP object. This is * of the service provider to also associate with this DP object. This is
* because the app doesn't seem to have to call EnumConnections and * because the app doesn't seem to have to call EnumConnections and
@ -1861,109 +1861,81 @@ static HRESULT DP_IF_EnumSessions
*/ */
if ( This->dp2->bDPLSPInitialized && !This->dp2->bSPInitialized ) if ( This->dp2->bDPLSPInitialized && !This->dp2->bSPInitialized )
{ {
LPVOID lpConnection;
DWORD dwSize;
WARN( "Hack providing TCP/IP SP for lobby provider activated\n" ); WARN( "Hack providing TCP/IP SP for lobby provider activated\n" );
if( !DP_BuildSPCompoundAddr( (LPGUID)&DPSPGUID_TCPIP, &lpConnection, &dwSize ) ) if ( !DP_BuildSPCompoundAddr( (GUID*)&DPSPGUID_TCPIP, &connection, &size ) )
{ {
ERR( "Can't build compound addr\n" ); ERR( "Can't build compound addr\n" );
return DPERR_GENERIC; return DPERR_GENERIC;
} }
hr = IDirectPlayX_InitializeConnection( &This->IDirectPlay4_iface, lpConnection, 0 ); hr = IDirectPlayX_InitializeConnection( &This->IDirectPlay4_iface, connection, 0 );
if ( FAILED(hr) ) if ( FAILED(hr) )
{
return hr; return hr;
}
/* Free up the address buffer */ HeapFree( GetProcessHeap(), 0, connection );
HeapFree( GetProcessHeap(), 0, lpConnection );
/* The SP is now initialized */
This->dp2->bSPInitialized = TRUE; This->dp2->bSPInitialized = TRUE;
} }
#endif
/* Use the service provider default? */ /* Use the service provider default? */
if( dwTimeout == 0 ) if ( !timeout )
{ {
DPCAPS spCaps; DPCAPS caps;
spCaps.dwSize = sizeof( spCaps ); caps.dwSize = sizeof( caps );
IDirectPlayX_GetCaps( &This->IDirectPlay4_iface, &spCaps, 0 ); IDirectPlayX_GetCaps( &This->IDirectPlay4_iface, &caps, 0 );
dwTimeout = spCaps.dwTimeout; timeout = caps.dwTimeout;
if ( !timeout )
/* The service provider doesn't provide one either! */ timeout = DPMSG_WAIT_5_SECS; /* Provide the TCP/IP default */
if( dwTimeout == 0 )
{
/* Provide the TCP/IP default */
dwTimeout = DPMSG_WAIT_5_SECS;
}
} }
if( dwFlags & DPENUMSESSIONS_STOPASYNC ) if ( flags & DPENUMSESSIONS_STOPASYNC )
{ {
DP_KillEnumSessionThread( This ); DP_KillEnumSessionThread( This );
return hr; return hr;
} }
if( ( dwFlags & DPENUMSESSIONS_ASYNC ) ) if ( flags & DPENUMSESSIONS_ASYNC )
{ {
/* Enumerate everything presently in the local session cache */ /* Enumerate everything presently in the local session cache */
DP_InvokeEnumSessionCallbacks( lpEnumSessionsCallback2, DP_InvokeEnumSessionCallbacks( enumsessioncb, This->dp2->lpNameServerData, timeout,
This->dp2->lpNameServerData, dwTimeout, context );
lpContext );
if( This->dp2->dwEnumSessionLock != 0 ) if ( This->dp2->dwEnumSessionLock )
return DPERR_CONNECTING; return DPERR_CONNECTING;
/* See if we've already created a thread to service this interface */ /* See if we've already created a thread to service this interface */
if ( This->dp2->hEnumSessionThread == INVALID_HANDLE_VALUE ) if ( This->dp2->hEnumSessionThread == INVALID_HANDLE_VALUE )
{ {
DWORD dwThreadId; DWORD tid;
This->dp2->dwEnumSessionLock++; This->dp2->dwEnumSessionLock++;
/* Send the first enum request inline since the user may cancel a dialog /* Send the first enum request inline since the user may cancel a dialog
* if one is presented. Also, may also have a connecting return code. * if one is presented. Also, may also have a connecting return code.
*/ */
hr = NS_SendSessionRequestBroadcast( &lpsd->guidApplication, hr = NS_SendSessionRequestBroadcast( &sdesc->guidApplication, flags,
dwFlags, &This->dp2->spData ); &This->dp2->spData );
if ( SUCCEEDED(hr) ) if ( SUCCEEDED(hr) )
{ {
EnumSessionAsyncCallbackData* lpData EnumSessionAsyncCallbackData* data = HeapAlloc( GetProcessHeap(),
= HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *lpData ) ); HEAP_ZERO_MEMORY, sizeof( *data ) );
/* FIXME: need to kill the thread on object deletion */ /* FIXME: need to kill the thread on object deletion */
lpData->lpSpData = &This->dp2->spData; data->lpSpData = &This->dp2->spData;
data->requestGuid = sdesc->guidApplication;
data->dwEnumSessionFlags = flags;
data->dwTimeout = timeout;
lpData->requestGuid = lpsd->guidApplication; This->dp2->hKillEnumSessionThreadEvent = CreateEventW( NULL, TRUE, FALSE, NULL );
lpData->dwEnumSessionFlags = dwFlags; if ( !DuplicateHandle( GetCurrentProcess(), This->dp2->hKillEnumSessionThreadEvent,
lpData->dwTimeout = dwTimeout; GetCurrentProcess(), &data->hSuicideRequest, 0, FALSE,
DUPLICATE_SAME_ACCESS ) )
This->dp2->hKillEnumSessionThreadEvent =
CreateEventW( NULL, TRUE, FALSE, NULL );
if( !DuplicateHandle( GetCurrentProcess(),
This->dp2->hKillEnumSessionThreadEvent,
GetCurrentProcess(),
&lpData->hSuicideRequest,
0, FALSE, DUPLICATE_SAME_ACCESS )
)
{
ERR( "Can't duplicate thread killing handle\n" ); ERR( "Can't duplicate thread killing handle\n" );
}
TRACE( ": creating EnumSessionsRequest thread\n" ); TRACE( ": creating EnumSessionsRequest thread\n" );
This->dp2->hEnumSessionThread = CreateThread( NULL, 0,
This->dp2->hEnumSessionThread = CreateThread( NULL, DP_EnumSessionsSendAsyncRequestThread, data, 0, &tid );
0,
DP_EnumSessionsSendAsyncRequestThread,
lpData,
0,
&dwThreadId );
} }
This->dp2->dwEnumSessionLock--; This->dp2->dwEnumSessionLock--;
} }
@ -1972,42 +1944,16 @@ static HRESULT DP_IF_EnumSessions
{ {
/* Invalidate the session cache for the interface */ /* Invalidate the session cache for the interface */
NS_InvalidateSessionCache( This->dp2->lpNameServerData ); NS_InvalidateSessionCache( This->dp2->lpNameServerData );
/* Send the broadcast for session enumeration */ /* Send the broadcast for session enumeration */
hr = NS_SendSessionRequestBroadcast( &lpsd->guidApplication, hr = NS_SendSessionRequestBroadcast( &sdesc->guidApplication, flags, &This->dp2->spData );
dwFlags, SleepEx( timeout, FALSE );
&This->dp2->spData ); DP_InvokeEnumSessionCallbacks( enumsessioncb, This->dp2->lpNameServerData, timeout,
context );
SleepEx( dwTimeout, FALSE );
DP_InvokeEnumSessionCallbacks( lpEnumSessionsCallback2,
This->dp2->lpNameServerData, dwTimeout,
lpContext );
} }
return hr; return hr;
} }
static HRESULT WINAPI IDirectPlay4AImpl_EnumSessions( IDirectPlay4A *iface, DPSESSIONDESC2 *lpsd,
DWORD dwTimeout, LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2, void *lpContext,
DWORD dwFlags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
return DP_IF_EnumSessions( This, lpsd, dwTimeout, lpEnumSessionsCallback2,
lpContext, dwFlags, TRUE );
}
static HRESULT WINAPI DirectPlay2WImpl_EnumSessions
( LPDIRECTPLAY2 iface, LPDPSESSIONDESC2 lpsd, DWORD dwTimeout,
LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2,
LPVOID lpContext, DWORD dwFlags )
{
IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface;
return DP_IF_EnumSessions( This, lpsd, dwTimeout, lpEnumSessionsCallback2,
lpContext, dwFlags, FALSE );
}
static HRESULT WINAPI IDirectPlay4AImpl_GetCaps( IDirectPlay4A *iface, DPCAPS *caps, DWORD flags ) static HRESULT WINAPI IDirectPlay4AImpl_GetCaps( IDirectPlay4A *iface, DPCAPS *caps, DWORD flags )
{ {
return IDirectPlayX_GetPlayerCaps( iface, DPID_ALLPLAYERS, caps, flags ); return IDirectPlayX_GetPlayerCaps( iface, DPID_ALLPLAYERS, caps, flags );
@ -4275,7 +4221,7 @@ static const IDirectPlay4Vtbl dp4_vt =
IDirectPlay4Impl_EnumGroupPlayers, IDirectPlay4Impl_EnumGroupPlayers,
IDirectPlay4Impl_EnumGroups, IDirectPlay4Impl_EnumGroups,
IDirectPlay4Impl_EnumPlayers, IDirectPlay4Impl_EnumPlayers,
XCAST(EnumSessions)DirectPlay2WImpl_EnumSessions, IDirectPlay4Impl_EnumSessions,
IDirectPlay4Impl_GetCaps, IDirectPlay4Impl_GetCaps,
IDirectPlay4Impl_GetGroupData, IDirectPlay4Impl_GetGroupData,
XCAST(GetGroupName)DirectPlay2WImpl_GetGroupName, XCAST(GetGroupName)DirectPlay2WImpl_GetGroupName,