Author: akhaldi
Date: Sat Sep 16 20:44:50 2017
New Revision: 75856
URL:
http://svn.reactos.org/svn/reactos?rev=75856&view=rev
Log:
[DPLAYX] Sync with Wine Staging 2.16. CORE-13762
6a6f336 dplayx: Implement IDirectPlayLobby3 EnumAddressTypes.
2ef274b dplayx: Implement IDirectPlay4 EnumConnections.
4f4b3be dplayx: First name server address may be null.
Modified:
trunk/reactos/dll/directx/wine/dplayx/dplay.c
trunk/reactos/dll/directx/wine/dplayx/dplobby.c
trunk/reactos/dll/directx/wine/dplayx/name_server.c
Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] Sat Sep 16 20:44:50 2017
@@ -4466,8 +4466,8 @@
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,
Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] Sat Sep 16 20:44:50 2017
@@ -815,8 +815,9 @@
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 );
}
/********************************************************************
Modified: trunk/reactos/dll/directx/wine/dplayx/name_server.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/na…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplayx/name_server.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplayx/name_server.c [iso-8859-1] Sat Sep 16 20:44:50
2017
@@ -147,7 +147,10 @@
* 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