Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DPLAYX] Sync with Wine Staging 2.16. CORE-13762

Browse source 
6a6f336 dplayx: Implement IDirectPlayLobby3 EnumAddressTypes.
2ef274b dplayx: Implement IDirectPlay4 EnumConnections.
4f4b3be dplayx: First name server address may be null.

svn path=/trunk/; revision=75856
This commit is contained in:
Amine Khaldi 2017-09-16 20:44:50 +00:00
parent 48e74aa082
commit abbe72e76a
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/directx/wine/dplayx/dplay.c
View file

@ -4466,8 +4466,8 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumConnections( IDirectPlay4 *iface,
const GUID *application, LPDPENUMCONNECTIONSCALLBACK enumcb, void *context, DWORD flags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
FIXME( "(%p)->(%p,%p,%p,0x%08x): stub\n", This, application, enumcb, context, flags );
return DP_OK;
return IDirectPlayX_EnumConnections( &This->IDirectPlay4A_iface, application, enumcb, context,
flags );
}
static HRESULT WINAPI IDirectPlay3AImpl_EnumGroupsInGroup( IDirectPlay3A *iface, DPID group,

5
reactos/dll/directx/wine/dplayx/dplobby.c
View file

@ -815,8 +815,9 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3
static HRESULT WINAPI IDirectPlayLobby3Impl_EnumAddressTypes( IDirectPlayLobby3 *iface,
LPDPLENUMADDRESSTYPESCALLBACK enumaddrtypecb, REFGUID sp, void *context, DWORD flags )
{
FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
return IDirectPlayLobby_EnumAddressTypes( &This->IDirectPlayLobby3A_iface, enumaddrtypecb, sp,
context, flags );
}
/********************************************************************

5
reactos/dll/directx/wine/dplayx/name_server.c
View file

@ -147,7 +147,10 @@ LPVOID NS_GetNSAddr( LPVOID lpNSInfo )
* in place.
*/
#if 1
return lpCache->first.lpQHFirst->lpNSAddrHdr;
if ( lpCache->first.lpQHFirst )
return lpCache->first.lpQHFirst->lpNSAddrHdr;
return NULL;
#else
/* FIXME: Should convert over to this */
return lpCache->bNsIsLocal ? lpCache->lpLocalAddrHdr